Commit 6bb9b924 authored by Francis Dupont's avatar Francis Dupont

[master] spelling (including in some messages)

parent 6d4f6565
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -130,7 +130,7 @@ operator<<(std::ostream& os, const D2Params& config) { ...@@ -130,7 +130,7 @@ operator<<(std::ostream& os, const D2Params& config) {
} }
// *********************** TSIGKeyInfo ************************* // *********************** TSIGKeyInfo *************************
// Note these values match correpsonding values for Bind9's // Note these values match corresponding values for Bind9's
// dnssec-keygen // dnssec-keygen
const char* TSIGKeyInfo::HMAC_MD5_STR = "HMAC-MD5"; const char* TSIGKeyInfo::HMAC_MD5_STR = "HMAC-MD5";
const char* TSIGKeyInfo::HMAC_SHA1_STR = "HMAC-SHA1"; const char* TSIGKeyInfo::HMAC_SHA1_STR = "HMAC-SHA1";
......
...@@ -538,7 +538,7 @@ public: ...@@ -538,7 +538,7 @@ public:
/// ///
/// @param name is the domain name of the domain. /// @param name is the domain name of the domain.
/// @param servers is the list of server(s) supporting this domain. /// @param servers is the list of server(s) supporting this domain.
/// @param tsig_key_info pointer to the TSIGKeyInfo for the dommain's key /// @param tsig_key_info pointer to the TSIGKeyInfo for the domain's key
/// It defaults to an empty pointer, signifying the domain has no key. /// It defaults to an empty pointer, signifying the domain has no key.
DdnsDomain(const std::string& name, DdnsDomain(const std::string& name,
DnsServerInfoStoragePtr servers, DnsServerInfoStoragePtr servers,
......
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -243,7 +243,7 @@ D2Process::checkQueueStatus() { ...@@ -243,7 +243,7 @@ D2Process::checkQueueStatus() {
: "shutdown"); : "shutdown");
queue_mgr_->stopListening(); queue_mgr_->stopListening();
} catch (const isc::Exception& ex) { } catch (const isc::Exception& ex) {
// It is very unlikey that we would experience an error // It is very unlikely that we would experience an error
// here, but theoretically possible. // here, but theoretically possible.
LOG_ERROR(d2_logger, DHCP_DDNS_QUEUE_MGR_STOP_ERROR) LOG_ERROR(d2_logger, DHCP_DDNS_QUEUE_MGR_STOP_ERROR)
.arg(ex.what()); .arg(ex.what());
......
...@@ -66,7 +66,7 @@ public: ...@@ -66,7 +66,7 @@ public:
/// This is invoked by the controller after command line arguments but /// This is invoked by the controller after command line arguments but
/// PRIOR to configuration reception. The base class provides this method /// PRIOR to configuration reception. The base class provides this method
/// as a place to perform any derivation-specific initialization steps /// as a place to perform any derivation-specific initialization steps
/// that are inapppropriate for the constructor but necessary prior to /// that are inappropriate for the constructor but necessary prior to
/// launch. So far, no such steps have been identified for D2, so its /// launch. So far, no such steps have been identified for D2, so its
/// implementation is empty but required. /// implementation is empty but required.
/// ///
......
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -153,7 +153,7 @@ D2QueueMgr::stopListening(const State target_stop_state) { ...@@ -153,7 +153,7 @@ D2QueueMgr::stopListening(const State target_stop_state) {
<< target_stop_state); << target_stop_state);
} }
// Remember the state we want to acheive. // Remember the state we want to achieve.
target_stop_state_ = target_stop_state; target_stop_state_ = target_stop_state;
// Instruct the listener to stop. If the listener reports that it // Instruct the listener to stop. If the listener reports that it
......
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2013-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -128,7 +128,7 @@ D2UpdateMessage::fromWire(const void* received_data, size_t bytes_received, ...@@ -128,7 +128,7 @@ D2UpdateMessage::fromWire(const void* received_data, size_t bytes_received,
isc::util::InputBuffer received_data_buffer(received_data, bytes_received); isc::util::InputBuffer received_data_buffer(received_data, bytes_received);
message_.fromWire(received_data_buffer); message_.fromWire(received_data_buffer);
// If tsig_contex is not NULL, then we need to verify the message. // If tsig_context is not NULL, then we need to verify the message.
if (tsig_context) { if (tsig_context) {
TSIGError error = tsig_context->verify(message_.getTSIGRecord(), TSIGError error = tsig_context->verify(message_.getTSIGRecord(),
received_data, bytes_received); received_data, bytes_received);
......
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2013-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -46,7 +46,7 @@ public: ...@@ -46,7 +46,7 @@ public:
// received. This allows a single DNSClientImpl instance to be used for // received. This allows a single DNSClientImpl instance to be used for
// multiple, sequential IOFetch calls. (@todo Trac# 3286 has been opened // multiple, sequential IOFetch calls. (@todo Trac# 3286 has been opened
// against dns::Message::fromWire. Should the behavior of fromWire change // against dns::Message::fromWire. Should the behavior of fromWire change
// the behavior here with could be rexamined). // the behavior here with could be reexamined).
D2UpdateMessagePtr& response_; D2UpdateMessagePtr& response_;
// A caller-supplied external callback which is invoked when DNS message // A caller-supplied external callback which is invoked when DNS message
// exchange is complete or interrupted. // exchange is complete or interrupted.
......
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2013-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -85,7 +85,7 @@ public: ...@@ -85,7 +85,7 @@ public:
/// @brief Constructor. /// @brief Constructor.
/// ///
/// @param response_placeholder Messge object pointer which will be updated /// @param response_placeholder Message object pointer which will be updated
/// with dynamically allocated object holding the DNS server's response. /// with dynamically allocated object holding the DNS server's response.
/// @param callback Pointer to an object implementing @c DNSClient::Callback /// @param callback Pointer to an object implementing @c DNSClient::Callback
/// class. This object will be called when DNS message exchange completes or /// class. This object will be called when DNS message exchange completes or
......
...@@ -144,7 +144,7 @@ public: ...@@ -144,7 +144,7 @@ public:
static const int NCT_DERIVED_EVENT_MIN = SM_DERIVED_EVENT_MIN + 101; static const int NCT_DERIVED_EVENT_MIN = SM_DERIVED_EVENT_MIN + 101;
//@} //@}
/// @brief Default time to assign to a single DNS udpate. /// @brief Default time to assign to a single DNS update.
/// @todo This value will be made configurable in the very near future /// @todo This value will be made configurable in the very near future
/// under trac3268. For now we will define it to 100 milliseconds /// under trac3268. For now we will define it to 100 milliseconds
/// so unit tests will run within a reasonable amount of time. /// so unit tests will run within a reasonable amount of time.
...@@ -289,7 +289,7 @@ protected: ...@@ -289,7 +289,7 @@ protected:
void setDnsUpdateRequest(D2UpdateMessagePtr& request); void setDnsUpdateRequest(D2UpdateMessagePtr& request);
/// @brief Destroys the current update request packet and resets /// @brief Destroys the current update request packet and resets
/// udpate attempts count. /// update attempts count.
void clearDnsUpdateRequest(); void clearDnsUpdateRequest();
/// @brief Sets the update status to the given status value. /// @brief Sets the update status to the given status value.
......
#!/bin/sh #!/bin/sh
# Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2014-2015,2017 Internet Systems Consortium, Inc. ("ISC")
# #
# This Source Code Form is subject to the terms of the Mozilla Public # This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -57,7 +57,7 @@ usage() { ...@@ -57,7 +57,7 @@ usage() {
} }
### Functions managing Kea processes ### ### Functions managing Kea processes ###
# Contructs a server's PID file based on its binary name, the config file, # Constructs a server's PID file based on its binary name, the config file,
# and the --localstatedir and returns the contents as $_pid. If the file # and the --localstatedir and returns the contents as $_pid. If the file
# does not exist, the value of $_pid is 0. If the file exists but cannot # does not exist, the value of $_pid is 0. If the file exists but cannot
# be read the function exists with a error message. Note the PID file name # be read the function exists with a error message. Note the PID file name
......
...@@ -311,7 +311,7 @@ LFCController::usage(const std::string& text) { ...@@ -311,7 +311,7 @@ LFCController::usage(const std::string& text) {
<< " -f <file>: finish file" << std::endl << " -f <file>: finish file" << std::endl
<< " -c <file>: configuration file" << std::endl << " -c <file>: configuration file" << std::endl
<< " -v: print version number and exit" << std::endl << " -v: print version number and exit" << std::endl
<< " -V: print extended version inforamtion and exit" << std::endl << " -V: print extended version information and exit" << std::endl
<< " -d: optional, verbose output " << std::endl << " -d: optional, verbose output " << std::endl
<< " -h: print this message " << std::endl << " -h: print this message " << std::endl
<< std::endl; << std::endl;
......
// Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -154,7 +154,7 @@ public: ...@@ -154,7 +154,7 @@ public:
private: private:
/// Version of the DHCP protocol used, i.e. 4 or 6. /// Version of the DHCP protocol used, i.e. 4 or 6.
int protocol_version_; int protocol_version_;
/// When true output the result of parsing the comamnd line /// When true output the result of parsing the command line
bool verbose_; bool verbose_;
std::string config_file_; ///< The path to the config file std::string config_file_; ///< The path to the config file
std::string previous_file_; ///< The path to the previous LFC file (if any) std::string previous_file_; ///< The path to the previous LFC file (if any)
......
// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -230,7 +230,7 @@ CommandOptions::initialize(int argc, char** argv, bool print_cmd_line) { ...@@ -230,7 +230,7 @@ CommandOptions::initialize(int argc, char** argv, bool print_cmd_line) {
// agent. In the future we should extend it to up to 32. // agent. In the future we should extend it to up to 32.
// See comment in https://github.com/isc-projects/kea/pull/22#issuecomment-243405600 // See comment in https://github.com/isc-projects/kea/pull/22#issuecomment-243405600
v6_relay_encapsulation_level_ = v6_relay_encapsulation_level_ =
static_cast<uint8_t>(positiveInteger("-A<encapusulation-level> must" static_cast<uint8_t>(positiveInteger("-A<encapsulation-level> must"
" be a positive integer")); " be a positive integer"));
if (v6_relay_encapsulation_level_ != 1) { if (v6_relay_encapsulation_level_ != 1) {
isc_throw(isc::InvalidParameter, "-A only supports 1 at the moment."); isc_throw(isc::InvalidParameter, "-A only supports 1 at the moment.");
...@@ -972,7 +972,7 @@ CommandOptions::printCommandLine() const { ...@@ -972,7 +972,7 @@ CommandOptions::printCommandLine() const {
void void
CommandOptions::usage() const { CommandOptions::usage() const {
std::cout << std::cout <<
"perfdhcp [-hv] [-4|-6] [-A<encapusulation-level>] [-e<lease-type>]" "perfdhcp [-hv] [-4|-6] [-A<encapsulation-level>] [-e<lease-type>]"
" [-r<rate>] [-f<renew-rate>]\n" " [-r<rate>] [-f<renew-rate>]\n"
" [-F<release-rate>] [-t<report>] [-R<range>] [-b<base>]\n" " [-F<release-rate>] [-t<report>] [-R<range>] [-b<base>]\n"
" [-n<num-request>] [-p<test-period>] [-d<drop-time>]\n" " [-n<num-request>] [-p<test-period>] [-d<drop-time>]\n"
...@@ -1086,7 +1086,7 @@ CommandOptions::usage() const { ...@@ -1086,7 +1086,7 @@ CommandOptions::usage() const {
" the exchange rate (given by -r<rate>). Furthermore the sum of\n" " the exchange rate (given by -r<rate>). Furthermore the sum of\n"
" this value and the renew-rate (given by -f<rate) must be equal\n" " this value and the renew-rate (given by -f<rate) must be equal\n"
" to or less than the exchange rate.\n" " to or less than the exchange rate.\n"
"-A<encapusulation-level>: Specifies that relayed traffic must be\n" "-A<encapsulation-level>: Specifies that relayed traffic must be\n"
" generated. The argument specifies the level of encapsulation, i.e.\n" " generated. The argument specifies the level of encapsulation, i.e.\n"
" how many relay agents are simulated. Currently the only supported\n" " how many relay agents are simulated. Currently the only supported\n"
" <encapsulation-level> value is 1, which means that the generated\n" " <encapsulation-level> value is 1, which means that the generated\n"
......
// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2012-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -85,7 +85,7 @@ public: ...@@ -85,7 +85,7 @@ public:
/// \brief Handles limited binary packet parsing for packets with /// \brief Handles limited binary packet parsing for packets with
/// custom offsets of options and transaction id /// custom offsets of options and transaction id
/// ///
/// This methoid handles the parsing of packets that have custom offsets /// This method handles the parsing of packets that have custom offsets
/// of options or transaction ID. Use /// of options or transaction ID. Use
/// \ref isc::dhcp::Pkt4::addOption to specify which options to parse. /// \ref isc::dhcp::Pkt4::addOption to specify which options to parse.
/// Options should be of the \ref isc::perfdhcp::LocalizedOption /// Options should be of the \ref isc::perfdhcp::LocalizedOption
......
// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -660,7 +660,7 @@ protected: ...@@ -660,7 +660,7 @@ protected:
/// being sent to the server. It collects first packets of each /// being sent to the server. It collects first packets of each
/// type and keeps them around until test finishes. Then they /// type and keeps them around until test finishes. Then they
/// are printed to the user. If packet of specified type has /// are printed to the user. If packet of specified type has
/// been already stored this function perfroms no operation. /// been already stored this function performs no operation.
/// This function does not perform sanity check if packet /// This function does not perform sanity check if packet
/// pointer is valid. Make sure it is before calling it. /// pointer is valid. Make sure it is before calling it.
/// ///
...@@ -675,7 +675,7 @@ protected: ...@@ -675,7 +675,7 @@ protected:
/// being sent to the server. It collects first packets of each /// being sent to the server. It collects first packets of each
/// type and keeps them around until test finishes. Then they /// type and keeps them around until test finishes. Then they
/// are printed to the user. If packet of specified type has /// are printed to the user. If packet of specified type has
/// been already stored this function perfroms no operation. /// been already stored this function performs no operation.
/// This function does not perform sanity check if packet /// This function does not perform sanity check if packet
/// pointer is valid. Make sure it is before calling it. /// pointer is valid. Make sure it is before calling it.
/// ///
......
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2013-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -259,7 +259,7 @@ void add4Option(Pkt4Ptr& response, uint8_t opt_code, std::string& opt_value) { ...@@ -259,7 +259,7 @@ void add4Option(Pkt4Ptr& response, uint8_t opt_code, std::string& opt_value) {
/// - DOCSIS3_V6_CONFIG_FILE from user property "bootfile" /// - DOCSIS3_V6_CONFIG_FILE from user property "bootfile"
/// - DOCSIS3_V6_TFTP_SERVERS from user property "tftp_server" /// - DOCSIS3_V6_TFTP_SERVERS from user property "tftp_server"
/// ///
/// @param response IPv5 reponse packet /// @param response IPv5 response packet
/// @param user User from whom properties are sourced /// @param user User from whom properties are sourced
void add6Options(Pkt6Ptr& response, const UserPtr& user) { void add6Options(Pkt6Ptr& response, const UserPtr& user) {
if (!user) { if (!user) {
......
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2013-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -38,7 +38,7 @@ UserId::UserId(UserIdType id_type, const std::string & id_str) : ...@@ -38,7 +38,7 @@ UserId::UserId(UserIdType id_type, const std::string & id_str) :
// Input is expected to be 2-digits per bytes, no delimiters. // Input is expected to be 2-digits per bytes, no delimiters.
std::vector<uint8_t> addr_bytes; std::vector<uint8_t> addr_bytes;
// Strip out colon delimeters, decodeHex doesn't like them. // Strip out colon delimiters, decodeHex doesn't like them.
std::string clean_id_str = id_str; std::string clean_id_str = id_str;
std::string::iterator end_pos = std::remove(clean_id_str.begin(), std::string::iterator end_pos = std::remove(clean_id_str.begin(),
clean_id_str.end(), ':'); clean_id_str.end(), ':');
......
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2013-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -43,7 +43,7 @@ public: ...@@ -43,7 +43,7 @@ public:
/// ///
/// Each entry must have a valid entry for "type" and a valid entry or "id". /// Each entry must have a valid entry for "type" and a valid entry or "id".
/// ///
/// If an entry contains duplicate option names, that option will be assigend /// If an entry contains duplicate option names, that option will be assigned
/// the last value found. This is typical JSON behavior. /// the last value found. This is typical JSON behavior.
/// Currently, only string option values (i.e. enclosed in quotes) are /// Currently, only string option values (i.e. enclosed in quotes) are
/// supported. /// supported.
......
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2013-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -85,7 +85,7 @@ void UserRegistry::refresh() { ...@@ -85,7 +85,7 @@ void UserRegistry::refresh() {
addUser(user); addUser(user);
} }
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
// Source was compromsised so restore registry from backup. // Source was compromised so restore registry from backup.
users_ = backup; users_ = backup;
// Close the source. // Close the source.
source_->close(); source_->close();
......
// Copyright (C) 2009-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2009-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -73,7 +73,7 @@ isc::data::ConstElementPtr createAnswer(const int status_code, ...@@ -73,7 +73,7 @@ isc::data::ConstElementPtr createAnswer(const int status_code,
/// @brief Creates a standard config/command level answer message /// @brief Creates a standard config/command level answer message
/// ///
/// @param status_code The return code (0 for success) /// @param status_code The return code (0 for success)
/// @param status textual represenation of the status (used mostly for errors) /// @param status textual representation of the status (used mostly for errors)
/// @param arg The optional argument for the answer. This can be of /// @param arg The optional argument for the answer. This can be of
/// any Element type. May be NULL. /// any Element type. May be NULL.
/// @return Standard command/config answer message /// @return Standard command/config answer message
......
...@@ -1078,7 +1078,7 @@ void Element::preprocess(std::istream& in, std::stringstream& out) { ...@@ -1078,7 +1078,7 @@ void Element::preprocess(std::istream& in, std::stringstream& out) {
line = ""; line = "";
} }
// getline() removes end line charaters. Unfortunately, we need // getline() removes end line characters. Unfortunately, we need
// it for getting the line numbers right (in case we report an // it for getting the line numbers right (in case we report an
// error. // error.
out << line; out << line;
......
// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2010-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -78,7 +78,7 @@ public: ...@@ -78,7 +78,7 @@ public:
/// \endcode /// \endcode
/// ///
/// the position of the element "bar" is: line_ = 2; pos_ = 9, because /// the position of the element "bar" is: line_ = 2; pos_ = 9, because
/// begining of the value "123" is at offset 9 from the beginning of /// beginning of the value "123" is at offset 9 from the beginning of
/// the second line, including whitespaces. /// the second line, including whitespaces.
/// ///
/// Note that the @c Position structure is used as an argument to @c Element /// Note that the @c Position structure is used as an argument to @c Element
...@@ -511,7 +511,7 @@ public: ...@@ -511,7 +511,7 @@ public:
//@{ //@{
/// Creates an Element from the wire format in the given /// Creates an Element from the wire format in the given
/// stringstream of the given length. /// stringstream of the given length.
/// Since the wire format is JSON, thise is the same as /// Since the wire format is JSON, this is the same as
/// fromJSON, and could be removed. /// fromJSON, and could be removed.
/// ///
/// \param in The input stringstream. /// \param in The input stringstream.
...@@ -520,7 +520,7 @@ public: ...@@ -520,7 +520,7 @@ public:
static ElementPtr fromWire(std::stringstream& in, int length); static ElementPtr fromWire(std::stringstream& in, int length);
/// Creates an Element from the wire format in the given string /// Creates an Element from the wire format in the given string
/// Since the wire format is JSON, thise is the same as /// Since the wire format is JSON, this is the same as
/// fromJSON, and could be removed. /// fromJSON, and could be removed.
/// ///
/// \param s The input string /// \param s The input string
......
...@@ -29,7 +29,7 @@ public: ...@@ -29,7 +29,7 @@ public:
/// @return the only existing instance of the manager /// @return the only existing instance of the manager
static CommandMgr& instance(); static CommandMgr& instance();
/// @brief Opens control socket with paramters specified in socket_info /// @brief Opens control socket with parameters specified in socket_info
/// ///
/// Currently supported types are: /// Currently supported types are:
/// - unix (required parameters: socket-type: unix, socket-name:/unix/path) /// - unix (required parameters: socket-type: unix, socket-name:/unix/path)
......
// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2012-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -19,7 +19,7 @@ namespace dns { ...@@ -19,7 +19,7 @@ namespace dns {
LabelSequence::LabelSequence(const void* buf) { LabelSequence::LabelSequence(const void* buf) {
#ifdef ENABLE_DEBUG #ifdef ENABLE_DEBUG
// In non-debug mode, derefencing the NULL pointer further below // In non-debug mode, dereferencing the NULL pointer further below
// will lead to a crash, so disabling this check is not // will lead to a crash, so disabling this check is not
// unsafe. Except for a programming mistake, this case should not // unsafe. Except for a programming mistake, this case should not
// happen. // happen.
......
// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2010-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -98,7 +98,7 @@ public: ...@@ -98,7 +98,7 @@ public:
extendData(); extendData();
return (fields_); return (fields_);
} }
// We use generict write* methods, with the exception of writeName. // We use generic write* methods, with the exception of writeName.
// So new data can arrive without us knowing it, this considers all new // So new data can arrive without us knowing it, this considers all new
// data to be just data and extends the fields to take it into account. // data to be just data and extends the fields to take it into account.
size_t last_data_pos_; size_t last_data_pos_;
......
// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2012-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -108,7 +108,7 @@ protected: ...@@ -108,7 +108,7 @@ protected:
/// used by the public iterator. Derived classes of /// used by the public iterator. Derived classes of
/// \c RRsetCollectionBase are supposed to implement this class and /// \c RRsetCollectionBase are supposed to implement this class and
/// the \c getBeginning() and \c getEnd() methods, so that the /// the \c getBeginning() and \c getEnd() methods, so that the
/// public interator interface can be provided. This is a forward /// public iterator interface can be provided. This is a forward
/// iterator only. /// iterator only.
class Iter { class Iter {
public: public:
......
// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2011-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -58,7 +58,7 @@ public: ...@@ -58,7 +58,7 @@ public:
/// \brief Direct assignment from value /// \brief Direct assignment from value
/// ///
/// \param value the uint32_t value to assing /// \param value the uint32_t value to assign
void operator=(uint32_t value) { value_ = value; } void operator=(uint32_t value) { value_ = value; }
/// \brief Returns the uint32_t representation of this serial value /// \brief Returns the uint32_t representation of this serial value
......
// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2011-2015,2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -414,7 +414,7 @@ public: ...@@ -414,7 +414,7 @@ public:
protected: protected:
/// \brief Update internal HMAC state by more data. /// \brief Update internal HMAC state by more data.
/// ///
/// This is used mostly internaly, when we need to verify a message without /// This is used mostly internally, when we need to verify a message without
/// TSIG signature in the middle of signed TCP stream. However, it is also /// TSIG signature in the middle of signed TCP stream. However, it is also
/// used in tests, so it's protected instead of private, to allow tests /// used in tests, so it's protected instead of private, to allow tests
/// in. /// in.
......