Corrected typos

doc/devel/contribute.dox

@@ -37,7 +37,7 @@ that your code compiles. This may seem obvious, but there's more to
 it. You have surely checked that it compiles on your system, but Kea
 is portable software. Besides Linux, it is compiled and used on
 relatively uncommon systems like OpenBSD. Will your code
-compile and work there? What about endianess? It is likely that you used
+compile and work there? What about endianness? It is likely that you used
 a regular x86 architecture machine to write your patch, but the software
 is expected to run on many other architectures. You may take a look at
 system specific build notes (http://kea.isc.org/wiki/Install).

doc/examples/kea4/backends.json

@@ -26,7 +26,7 @@
 
 # 2. MySQL backend. Leases will be stored in MySQL database. Make sure it
 # is up, running and properly initialized. See kea-admin documentation
-# for details on how to intialize the database. The only strictly required
+# for details on how to initialize the database. The only strictly required
 # parameters are type and name. If other parameters are not specified,
 # Kea will assume the database is avaiable on localhost, that user and
 # password is not necessary to connect and that timeout is 5 seconds.
@@ -42,7 +42,7 @@
 
 # 3. PostgreSQL backend. Leases will be stored in PostgreSQL database. Make
 # sure it is up, running and properly initialized. See kea-admin documentation
-# for details on how to intialize the database. The only strictly required
+# for details on how to initialize the database. The only strictly required
 # parameters are type and name. If other parameters are not specified,
 # Kea will assume the database is avaiable on localhost, that user and
 # password is not necessary to connect and that timeout is 5 seconds.
@@ -57,7 +57,7 @@
 
 # 4. CQL (Cassandra) backend. Leases will be stored in Cassandra database. Make
 # sure it is up, running and properly initialized. See kea-admin documentation
-# for details on how to intialize the database. The only strictly required
+# for details on how to initialize the database. The only strictly required
 # parameters are type, keyspace and contact_points. At least one contact point
 # must be specified, but more than one is required for redundancy. Make sure
 # you specify the contact points without spaces. Kea must be compiled with

doc/examples/kea6/backends.json

@@ -26,7 +26,7 @@
 
 # 2. MySQL backend. Leases will be stored in MySQL database. Make sure it
 # is up, running and properly initialized. See kea-admin documentation
-# for details on how to intialize the database. The only strictly required
+# for details on how to initialize the database. The only strictly required
 # parameters are type and name. If other parameters are not specified,
 # Kea will assume the database is avaiable on localhost, that user and
 # password is not necessary to connect and that timeout is 5 seconds.
@@ -42,7 +42,7 @@
 
 # 3. PostgreSQL backend. Leases will be stored in PostgreSQL database. Make
 # sure it is up, running and properly initialized. See kea-admin documentation
-# for details on how to intialize the database. The only strictly required
+# for details on how to initialize the database. The only strictly required
 # parameters are type and name. If other parameters are not specified,
 # Kea will assume the database is avaiable on localhost, that user and
 # password is not necessary to connect and that timeout is 5 seconds.
@@ -57,7 +57,7 @@
 
 # 4. CQL (Cassandra) backend. Leases will be stored in Cassandra database. Make
 # sure it is up, running and properly initialized. See kea-admin documentation
-# for details on how to intialize the database. The only strictly required
+# for details on how to initialize the database. The only strictly required
 # parameters are type, keyspace and contact_points. At least one contact point
 # must be specified, but more than one is required for redundancy. Make sure
 # you specify the contact points without spaces. Kea must be compiled with

doc/guide/admin.xml

@@ -18,7 +18,7 @@
       For example, Kea currently only stores lease information
       and host reservations. Future versions of Kea will store
       additional data such as subnet definitions: the database
-      structure will need to be updated to accomdate the extra
+      structure will need to be updated to accommodate the extra
       information.
     </para>
 
@@ -72,7 +72,7 @@
         <listitem>
           <simpara>
             <command>lease-init</command> &mdash;
-            Initializes a new lease database. This is useful during a new 
+            Initializes a new lease database. This is useful during a new
             Kea installation. The database is initialized to the
             latest version supported by the version of the software being
             installed.
@@ -616,7 +616,7 @@ $ <userinput>kea-admin lease-upgrade pgsql -u <replaceable>database-user</replac
         <orderedlist>
           <listitem>
             <para>
-              Export CQLSH_HOST environemnt variable:
+              Export CQLSH_HOST environment variable:
 <screen>
 $ <userinput>export CQLSH_HOST=localhost</userinput>
 </screen>
@@ -715,7 +715,7 @@ $ <userinput>kea-admin lease-upgrade cql -n <replaceable>database-name</replacea
       read-only mode.
       Sections <xref linkend="read-only-database-configuration4"/> and
       <xref linkend="read-only-database-configuration6"/> describe when
-      such configuration may be reqired and how to configure Kea to
+      such configuration may be required and how to configure Kea to
       operate using a read-only host database.
       </para>
     </section>

doc/guide/classify.xml

@@ -820,7 +820,7 @@ concatenation of the strings</entry></row>
      </para>
 
      <para>
-     To enable the debug statements in the classifciaton system you will
+     To enable the debug statements in the classification system you will
      need to set the severity to "DEBUG" and the debug level to at least 55.
      The specific loggers are "kea-dhcp4.eval" and "kea-dhcp6.eval".
      </para>

doc/guide/ctrl-channel.xml

@@ -104,7 +104,7 @@ where <command>/path/to/the/kea/socket</command> is the path specified in the
 configuration file. Text passed to <command>socat</command>
 will be sent to Kea and the responses received from Kea printed to standard output.</para>
 
-    <para>It is also easy to open UNIX socket programmatically. An example of
+    <para>It is also easy to open UNIX socket programatically. An example of
     such a simplistic client written in C is available in the Kea Developer's
     Guide, chapter Control Channel Overview, section Using Control Channel.</para>
 

doc/guide/ddns.xml

@@ -716,7 +716,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
 
       </section> <!-- "d2-reverse-ddns-config" -->
 
-      <section id="d2-exmaple-config">
+      <section id="d2-example-config">
 	<title>Example DHCP-DDNS Server Configuration</title>
 	<para>
 	This section provides an example DHCP-DDNS server configuration based

doc/guide/dhcp4-srv.xml

@@ -2969,7 +2969,7 @@ It is merely echoed by the server
 
 </screen>
 
-    <para>Static class assignments, as shown above, can be used in conjuction
+    <para>Static class assignments, as shown above, can be used in conjunction
     with classification using expressions.</para>
     </section>
 

doc/guide/dhcp6-srv.xml

@@ -1203,7 +1203,7 @@ temporarily override a list of interface names and listen on all interfaces.
         S46 container options group rules and optional port parameters
         for a specified domain. There are three container options specified
         in the "dhcp6" (top level) option space: MAP-E Container option,
-        MAP-T Container option and S46 Lieghtweight 4over6 Container option.
+        MAP-T Container option and S46 Lightweight 4over6 Container option.
         These options only contain encapsulated options specified below.
         They do not include any data fields.
       </para>
@@ -2904,7 +2904,7 @@ should include options from the isc option space:
  }
 
 </screen>
-    <para>Static class assignments, as shown above, can be used in conjuction
+    <para>Static class assignments, as shown above, can be used in conjunction
     with classification using expressions.</para>
     </section>
 

doc/guide/hooks.xml

@@ -271,7 +271,7 @@
           </itemizedlist>
         </para>
         <para>
-          Once loaded, the library allows segregating incomings requests into
+          Once loaded, the library allows segregating incoming requests into
           known and unknown clients. For known clients, the packets are
           processed mostly as usual, except it is possible to override certain
           options being sent. That can be done on a per host basis. Clients
@@ -306,7 +306,7 @@
             is "HW_ADDR" for IPv4 users or "DUID" for IPv6
             users</para></listitem>
             <listitem><para><command>id</command>, whose value is
-            either the hardware address or the DUID from the equest
+            either the hardware address or the DUID from the request
             formatted as a string of hex digits, with or without
             ":" delimiters.</para></listitem>
           </itemizedlist>
@@ -344,7 +344,7 @@ and may have the zero or more of the following entries:
         <title>Forensic Logging Hooks</title>
         <para>
         This section describes the forensic log hooks library. This library
-        povides hooks that record a detailed log of lease assignments
+        provides hooks that record a detailed log of lease assignments
         and renewals into a set of log files.  Currently this library
         is only available to ISC customers with a support contract.
         </para>

doc/guide/logging.xml

@@ -61,7 +61,7 @@
         runtime) are responsible for creating the loggers used by those
         libraries. Such loggers should have unique names, different
         from the logger names used by Kea. In this way the
-        messages output by the hooks library can be distingued from
+        messages output by the hooks library can be distinguished from
         messages issued by the core Kea code. Unique names also allow
         the loggers to be configured independently of loggers used
         by Kea.  Whenever it makes sense, a hook library can use multiple
@@ -150,7 +150,7 @@
           packet drops, you must create configuration entry for the
           logger called <quote>kea-dhcp4.bad-packets</quote> and specify
           severity DEBUG for this logger. All other configuration
-          parameters may be omited for this logger if the logger should
+          parameters may be omitted for this logger if the logger should
           use the default values specified in the root logger's
           configuration.
         </para>

ext/coroutine/coroutine.h

@@ -15,22 +15,22 @@
 // \brief Coroutine object
 //
 // A coroutine object maintains the state of a re-enterable routine.  It
-// is assignable and copy-constructable, and can be used as a base class
+// is assignable and copy-constructible, and can be used as a base class
 // for a class that uses it, or as a data member.  The copy overhead is
 // a single int.
 //
-// A reenterable function contains a CORO_REENTER (coroutine)  { ... }
+// A reentrant function contains a CORO_REENTER (coroutine)  { ... }
 // block.  Whenever an asychrnonous operation is initiated within the
 // routine, the function is provided as the handler object.  (The simplest
-// way to do this is to have the reenterable function be the operator()
+// way to do this is to have the reentrant function be the operator()
 // member for the coroutine object itself.)   For example:
-// 
+//
 //     CORO_YIELD socket->async_read_some(buffer, *this);
 //
 // The CORO_YIELD keyword updates the current status of the coroutine to
 // indicate the line number currently being executed.  The
 // async_read_some() call is initiated, with a copy of the updated
-// corotutine as its handler object, and the current coroutine exits.  When
+// coroutine as its handler object, and the current coroutine exits.  When
 // the async_read_some() call finishes, the copied coroutine will be
 // called, and will resume processing exactly where the original one left
 // off--right after asynchronous call.  This allows asynchronous I/O

src/bin/admin/tests/cql_tests.sh.in

@@ -81,7 +81,7 @@ cql_lease_version_test() {
     $keaadmin lease-init cql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
     assert_eq 0 $? "kea-admin lease-init cql failed, expected exit code: %d, actual: %d"
 
-    # Verfiy that kea-admin lease-version returns the correct version.
+    # Verify that kea-admin lease-version returns the correct version.
     version=$($keaadmin lease-version cql -u $db_user -p $db_password -n $db_name)
     assert_str_eq "1.0" $version "Expected kea-admin to return %s, returned value was %s"
 

src/bin/admin/tests/mysql_tests.sh.in

@@ -38,7 +38,7 @@ mysql_lease_init_test() {
     # Let's wipe the whole database
     mysql_wipe
 
-    # Ok, now let's initalize the database
+    # Ok, now let's initialize the database
     ${keaadmin} lease-init mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
     ERRCODE=$?
 
@@ -117,7 +117,7 @@ mysql_host_reservation_init_test() {
     # Let's wipe the whole database
     mysql_wipe
 
-    # Ok, now let's initalize the database
+    # Ok, now let's initialize the database
     ${keaadmin} lease-init mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
     ERRCODE=$?
 
@@ -387,7 +387,7 @@ mysql_lease4_dump_test() {
     # Let's wipe the whole database
     mysql_wipe
 
-    # Ok, now let's initalize the database
+    # Ok, now let's initialize the database
     ${keaadmin} lease-init mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
     ERRCODE=$?
     assert_eq 0 $ERRCODE "could not create database, expected exit code %d, actual %d"
@@ -447,7 +447,7 @@ mysql_lease6_dump_test() {
     # Let's wipe the whole database
     mysql_wipe
 
-    # Ok, now let's initalize the database
+    # Ok, now let's initialize the database
     ${keaadmin} lease-init mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
     ERRCODE=$?
     assert_eq 0 $ERRCODE "could not create database, expected exit code %d, actual %d"

src/bin/admin/tests/pgsql_tests.sh.in

@@ -86,7 +86,7 @@ pgsql_lease_version_test() {
     ${keaadmin} lease-init pgsql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
     assert_eq 0 $? "cannot initialize the database, expected exit code: %d, actual: %d"
 
-    # Verfiy that kea-admin lease-version returns the correct version
+    # Verify that kea-admin lease-version returns the correct version
     version=$(${keaadmin} lease-version pgsql -u $db_user -p $db_password -n $db_name)
     assert_str_eq "3.0" ${version} "Expected kea-admin to return %s, returned value was %s"
 
@@ -280,7 +280,7 @@ pgsql_lease4_dump_test() {
     # Let's wipe the whole database
     pgsql_wipe
 
-    # Ok, now let's initalize the database
+    # Ok, now let's initialize the database
     ${keaadmin} lease-init pgsql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
     ERRCODE=$?
     assert_eq 0 $ERRCODE "could not create database, expected exit code %d, actual %d"
@@ -375,7 +375,7 @@ pgsql_lease6_dump_test() {
     # Let's wipe the whole database
     pgsql_wipe
 
-    # Ok, now let's initalize the database
+    # Ok, now let's initialize the database
     ${keaadmin} lease-init pgsql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
     ERRCODE=$?
     assert_eq 0 $ERRCODE "could not create database,  status code %d"

src/bin/d2/d2_cfg_mgr.cc

@@ -80,7 +80,7 @@ D2CfgMgr::forwardUpdatesEnabled() {
 
 bool
 D2CfgMgr::reverseUpdatesEnabled() {
-    // Reverse updates are not enabled if no revese servers are defined.
+    // Reverse updates are not enabled if no reverse servers are defined.
     return (getD2CfgContext()->getReverseMgr()->size() > 0);
 }
 

src/bin/d2/d2_config.cc

@@ -130,7 +130,7 @@ operator<<(std::ostream& os, const D2Params& config) {
 }
 
 // *********************** TSIGKeyInfo  *************************
-// Note these values match correpsonding values for Bind9's
+// Note these values match corresponding values for Bind9's
 // dnssec-keygen
 const char* TSIGKeyInfo::HMAC_MD5_STR = "HMAC-MD5";
 const char* TSIGKeyInfo::HMAC_SHA1_STR = "HMAC-SHA1";

src/bin/d2/d2_config.h

@@ -258,7 +258,7 @@ private:
 /// @brief Dumps the contents of a D2Params as text to an output stream
 ///
 /// @param os output stream to which text should be sent
-/// @param config D2Param instnace to dump
+/// @param config D2Param instance to dump
 std::ostream&
 operator<<(std::ostream& os, const D2Params& config);
 
@@ -287,7 +287,7 @@ public:
     /// @brief Constructor
     ///
     /// @param name the unique label used to identify this key
-    /// @param algorithm the id of the encryption alogirthm this key uses.
+    /// @param algorithm the id of the encryption algorithm this key uses.
     /// Currently supported values are (case insensitive):
     /// -# "HMAC-MD5"
     /// -# "HMAC-SHA1"
@@ -538,7 +538,7 @@ public:
     ///
     /// @param name is the domain name of the 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.
     DdnsDomain(const std::string& name,
                DnsServerInfoStoragePtr servers,

src/bin/d2/d2_process.cc

@@ -243,7 +243,7 @@ D2Process::checkQueueStatus() {
                                                  : "shutdown");
                 queue_mgr_->stopListening();
             } 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.
                 LOG_ERROR(d2_logger, DHCP_DDNS_QUEUE_MGR_STOP_ERROR)
                           .arg(ex.what());

src/bin/d2/d2_process.h

@@ -66,9 +66,9 @@ public:
     /// This is invoked by the controller after command line arguments but
     /// PRIOR to configuration reception.  The base class provides this method
     /// 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
-    /// implementantion is empty but required.
+    /// implementation is empty but required.
     ///
     /// @throw DProcessBaseError if the initialization fails.
     virtual void init();

src/bin/d2/d2_queue_mgr.cc

@@ -153,7 +153,7 @@ D2QueueMgr::stopListening(const 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;
 
         // Instruct the listener to stop.  If the listener reports that  it

src/bin/d2/d2_update_message.cc

@@ -128,7 +128,7 @@ D2UpdateMessage::fromWire(const void* received_data, size_t bytes_received,
     isc::util::InputBuffer received_data_buffer(received_data, bytes_received);
     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) {
         TSIGError error = tsig_context->verify(message_.getTSIGRecord(),
                                                received_data, bytes_received);

src/bin/d2/d2_update_message.h

@@ -56,7 +56,7 @@ public:
         isc::Exception(file, line, what) {}
 };
 
-/// @brief Exception indicating that a signed, inbound message failed to verfiy
+/// @brief Exception indicating that a signed, inbound message failed to verify
 ///
 /// This exception is thrown when TSIG verification of a DNS server's response
 /// fails.

src/bin/d2/dns_client.cc

@@ -46,7 +46,7 @@ public:
     // received. This allows a single DNSClientImpl instance to be used for
     // multiple, sequential IOFetch calls. (@todo Trac# 3286 has been opened
     // 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_;
     // A caller-supplied external callback which is invoked when DNS message
     // exchange is complete or interrupted.

src/bin/d2/dns_client.h

@@ -85,7 +85,7 @@ public:
 
     /// @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.
     /// @param callback Pointer to an object implementing @c DNSClient::Callback
     /// class. This object will be called when DNS message exchange completes or

src/bin/d2/nc_remove.h

@@ -212,7 +212,7 @@ protected:
     /// post a next event of IO_COMPLETED_EVT and then invoke runModel which
     /// resumes execution of the state model.
     ///
-    /// When the handler is invoked with a next event of IO_COMPELTED_EVT,
+    /// When the handler is invoked with a next event of IO_COMPLETED_EVT,
     /// the DNS update status is checked and acted upon accordingly:
     ///
     /// Transitions to:
@@ -254,7 +254,7 @@ protected:
     /// post a next event of IO_COMPLETED_EVT and then invoke runModel which
     /// resumes execution of the state model.
     ///
-    /// When the handler is invoked with a next event of IO_COMPELTED_EVT,
+    /// When the handler is invoked with a next event of IO_COMPLETED_EVT,
     /// the DNS update status is checked and acted upon accordingly:
     ///
     /// Transitions to:
@@ -306,7 +306,7 @@ protected:
     /// post a next event of IO_COMPLETED_EVT and then invoke runModel which
     /// resumes execution of the state model.
     ///
-    /// When the handler is invoked with a next event of IO_COMPELTED_EVT,
+    /// When the handler is invoked with a next event of IO_COMPLETED_EVT,
     /// the DNS update status is checked and acted upon accordingly:
     ///
     /// Transitions to:

src/bin/d2/nc_trans.h

@@ -144,7 +144,7 @@ public:
     static const int NCT_DERIVED_EVENT_MIN = SM_DERIVED_EVENT_MIN + 101;
     //@}
 
-    /// @brief Defualt 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
     /// under trac3268. For now we will define it to 100 milliseconds
     /// so unit tests will run within a reasonable amount of time.
@@ -289,7 +289,7 @@ protected:
     void setDnsUpdateRequest(D2UpdateMessagePtr& request);
 
     /// @brief Destroys the current update request packet and resets
-    /// udpate attempts count.
+    /// update attempts count.
     void clearDnsUpdateRequest();
 
     /// @brief Sets the update status to the given status value.

src/bin/d2/tests/d2_cfg_mgr_unittests.cc

@@ -65,7 +65,7 @@ public:
 
     /// @brief Build JSON configuration string for a D2Params element
     ///
-    /// Constructs a JSON string for "params" element using replacable
+    /// Constructs a JSON string for "params" element using replaceable
     /// parameters.
     ///
     /// @param ip_address string to insert as ip_address value
@@ -509,7 +509,7 @@ TEST_F(D2CfgMgrTest, unsupportedTopLevelItems) {
 /// -# ip_address cannot be "0.0.0.0"
 /// -# ip_address cannot be "::"
 /// -# port cannot be 0
-/// -# dns_server_timeout cannat be 0
+/// -# dns_server_timeout cannot be 0
 /// -# ncr_protocol must be valid
 /// -# ncr_format must be valid
 TEST_F(D2CfgMgrTest, invalidEntry) {
@@ -940,7 +940,7 @@ TEST_F(ConfigParseTest, validServerList) {
     isc::dhcp::ParserPtr parser;
     ASSERT_NO_THROW(parser.reset(new DnsServerInfoListParser("test", servers)));
 
-    // Verfiy that the list builds and commits without error.
+    // Verify that the list builds and commits without error.
     ASSERT_NO_THROW(parser->build(config_set_));
     ASSERT_NO_THROW(parser->commit());
 
@@ -1443,7 +1443,7 @@ TEST_F(D2CfgMgrTest, forwardMatch) {
     EXPECT_TRUE(cfg_mgr_->matchForward("tmark.org", match));
     EXPECT_EQ("tmark.org", match->getName());
 
-    // Verify that search is case insensisitive.
+    // Verify that search is case-insensitive.
     EXPECT_TRUE(cfg_mgr_->matchForward("TMARK.ORG", match));
     EXPECT_EQ("tmark.org", match->getName());
 

src/bin/d2/tests/d2_controller_unittests.cc

@@ -149,7 +149,7 @@ TEST_F(D2ControllerTest, launchNormalShutdown) {
     time_duration elapsed_time;
     runWithConfig(valid_d2_config, 1000, elapsed_time);
 
-    // Give a generous margin to accomodate slower test environs.
+    // Give a generous margin to accommodate slower test environs.
     EXPECT_TRUE(elapsed_time.total_milliseconds() >= 800 &&
                 elapsed_time.total_milliseconds() <= 1300);
 }
@@ -294,7 +294,7 @@ TEST_F(D2ControllerTest, sigintShutdown) {
     runWithConfig(valid_d2_config, 1000, elapsed_time);
 
     // Signaled shutdown should make our elapsed time much smaller than
-    // the maximum run time.  Give generous margin to accomodate slow
+    // the maximum run time.  Give generous margin to accommodate slow
     // test environs.
     EXPECT_TRUE(elapsed_time.total_milliseconds() < 300);
 
@@ -311,7 +311,7 @@ TEST_F(D2ControllerTest, sigtermShutdown) {
     runWithConfig(valid_d2_config, 1000, elapsed_time);
 
     // Signaled shutdown should make our elapsed time much smaller than
-    // the maximum run time.  Give generous margin to accomodate slow
+    // the maximum run time.  Give generous margin to accommodate slow
     // test environs.
     EXPECT_TRUE(elapsed_time.total_milliseconds() < 300);
 

src/bin/d2/tests/d2_queue_mgr_unittests.cc

@@ -176,11 +176,11 @@ TEST(D2QueueMgrBasicTest, basicQueue) {
     // Verify queue count is correct.
     EXPECT_EQ(VALID_MSG_CNT, queue_mgr->getQueueSize());
 
-    // Verfiy that peekAt returns the correct entry.
+    // Verify that peekAt returns the correct entry.
     EXPECT_NO_THROW(ncr = queue_mgr->peekAt(1));
     EXPECT_TRUE (*(ref_msgs[1]) == *ncr);
 
-    // Verfiy that dequeueAt removes the correct entry.
+    // Verify that dequeueAt removes the correct entry.
     // Removing it, this should shift the queued entries forward by one.
     EXPECT_NO_THROW(queue_mgr->dequeueAt(1));
     EXPECT_NO_THROW(ncr = queue_mgr->peekAt(1));

src/bin/d2/tests/d2_update_message_unittests.cc

@@ -282,7 +282,7 @@ TEST_F(D2UpdateMessageTest, fromWireInvalidOpcode) {
     };
     // The 'true' argument passed to the constructor turns the
     // message into the parse mode in which the fromWire function
-    // can be used to decode the binary mesasage data.
+    // can be used to decode the binary message data.
     D2UpdateMessage msg(D2UpdateMessage::INBOUND);
     // When using invalid Opcode, the fromWire function should
     // throw NotUpdateMessage exception.
@@ -306,7 +306,7 @@ TEST_F(D2UpdateMessageTest, fromWireInvalidQRFlag) {
     };
     // The 'true' argument passed to the constructor turns the
     // message into the parse mode in which the fromWire function
-    // can be used to decode the binary mesasage data.
+    // can be used to decode the binary message data.
     D2UpdateMessage msg(D2UpdateMessage::INBOUND);
     // When using invalid QR flag, the fromWire function should
     // throw InvalidQRFlag exception.
@@ -345,7 +345,7 @@ TEST_F(D2UpdateMessageTest, fromWireTooManyZones) {
 
     // The 'true' argument passed to the constructor turns the
     // message into the parse mode in which the fromWire function
-    // can be used to decode the binary mesasage data.
+    // can be used to decode the binary message data.
     D2UpdateMessage msg(D2UpdateMessage::INBOUND);
     // When parsing a message with more than one Zone record,
     // exception should be thrown.
@@ -366,7 +366,7 @@ TEST_F(D2UpdateMessageTest, toWire) {
     // one Zone. toWire function would fail if Zone is not set.
     msg.setZone(Name("example.com"), RRClass::IN());
 
-    // Set prerequisities.
+    // Set prerequisites.
 
     // 'Name Is Not In Use' prerequisite (RFC 2136, section 2.4.5)
     RRsetPtr prereq1(new RRset(Name("foo.example.com"), RRClass::NONE(),
@@ -433,7 +433,7 @@ TEST_F(D2UpdateMessageTest, toWire) {
     EXPECT_EQ(1, buf.readUint16());
 
     // PRCOUNT - holds the number of prerequisites. Earlier we have added
-    // two prerequisites. Thus, expect that this conter is 2.
+    // two prerequisites. Thus, expect that this counter is 2.
     EXPECT_EQ(2, buf.readUint16());
 
     // UPCOUNT - holds the number of RRs in the Update Section. We have
@@ -484,7 +484,7 @@ TEST_F(D2UpdateMessageTest, toWire) {
 
     // Check the name first. Message renderer is using compression for domain
     // names as described in RFC 1035, section 4.1.4. The name in this RR is
-    // foo.example.com. The name of the zone is example.com and it has occured
+    // foo.example.com. The name of the zone is example.com and it has occurred
     // in this message already at offset 12 (the size of the header is 12).
     // Therefore, name of this RR is encoded as 'foo', followed by a pointer
     // to offset in this message where the remainder of this name was used.
@@ -566,7 +566,7 @@ TEST_F(D2UpdateMessageTest, toWireInvalidQRFlag) {
 
     // The 'true' argument passed to the constructor turns the
     // message into the parse mode in which the fromWire function
-    // can be used to decode the binary mesasage data.
+    // can be used to decode the binary message data.
     D2UpdateMessage msg(D2UpdateMessage::INBOUND);
     ASSERT_NO_THROW(msg.fromWire(bin_msg, sizeof(bin_msg)));
 

src/bin/d2/tests/dns_client_unittests.cc

@@ -219,7 +219,7 @@ public:
         dns::Message request(Message::PARSE);
         request.fromWire(received_data_buffer);
 
-        // If contex is not NULL, then we need to verify the message.
+        // If context is not NULL, then we need to verify the message.
         if (context) {
             TSIGError error = context->verify(request.getTSIGRecord(),
                                               receive_buffer_, receive_length);
@@ -502,7 +502,7 @@ TEST_F(DNSClientTest, runTSIGTest) {
     // Neither client nor server will attempt to sign or verify.
     runTSIGTest(nokey, nokey);
 
-    // Client signs the request, server verfies but doesn't sign.
+    // Client signs the request, server verifies but doesn't sign.
     runTSIGTest(key_one, nokey, false);
 
     // Client and server use the same key to sign and verify.

src/bin/d2/tests/nc_add_unittests.cc

@@ -24,7 +24,7 @@ using namespace isc::util;
 
 namespace {
 
-/// @brief Test class derived from NameAddTransaction to provide visiblity
+/// @brief Test class derived from NameAddTransaction to provide visibility
 // to protected methods.
 class NameAddStub : public NameAddTransaction {
 public:
@@ -1030,7 +1030,7 @@ TEST_F(NameAddTransactionTest, replacingFwdAddrsHandler_OtherRcode) {
     EXPECT_FALSE(name_add->getForwardChangeCompleted());
     EXPECT_FALSE(name_add->getReverseChangeCompleted());
 
-    // We should have failed the transaction. Verifiy that we transitioned
+    // We should have failed the transaction. Verify that we transitioned
     // correctly.
     EXPECT_EQ(NameChangeTransaction::PROCESS_TRANS_FAILED_ST,
               name_add->getCurrState());

src/bin/d2/tests/nc_remove_unittests.cc

@@ -25,7 +25,7 @@ using namespace isc::util;
 
 namespace {
 
-/// @brief Test class derived from NameRemoveTransaction to provide visiblity
+/// @brief Test class derived from NameRemoveTransaction to provide visibility
 // to protected methods.
 class NameRemoveStub : public NameRemoveTransaction {
 public:
@@ -969,7 +969,7 @@ TEST_F(NameRemoveTransactionTest, removingFwdRRsHandler_FqdnNotInUse) {
     // Run removingFwdRRsHandler again to process the response.
     EXPECT_NO_THROW(name_remove->removingFwdRRsHandler());
 
-    // Forwad completion flag should be true, reverse should still be false.
+    // Forward completion flag should be true, reverse should still be false.
     EXPECT_TRUE(name_remove->getForwardChangeCompleted());
     EXPECT_FALSE(name_remove->getReverseChangeCompleted());
 
@@ -1016,7 +1016,7 @@ TEST_F(NameRemoveTransactionTest, removingFwdRRsHandler_OtherRcode) {
     EXPECT_FALSE(name_remove->getForwardChangeCompleted());
     EXPECT_FALSE(name_remove->getReverseChangeCompleted());
 
-    // We should have failed the transaction. Verifiy that we transitioned
+    // We should have failed the transaction. Verify that we transitioned
     // correctly.
     EXPECT_EQ(NameChangeTransaction::PROCESS_TRANS_FAILED_ST,
               name_remove->getCurrState());

src/bin/d2/tests/nc_test_utils.cc

@@ -107,7 +107,7 @@ FauxServer::requestHandler(const boost::system::error_code& error,
     try {
         request.fromWire(request_buf);
 
-        // If contex is not NULL, then we need to verify the message.
+        // If context is not NULL, then we need to verify the message.
         if (context) {
             dns::TSIGError error = context->verify(request.getTSIGRecord(),
                                                    receive_buffer_,

src/bin/d2/tests/nc_test_utils.h

@@ -36,7 +36,7 @@ public:
     enum  ResponseMode {
         USE_RCODE,    // Generate a response with a given RCODE
         CORRUPT_RESP, // Generate a corrupt response
-        INVALID_TSIG  // Generate a repsonse with the wrong TSIG key
+        INVALID_TSIG  // Generate a response with the wrong TSIG key
     };
 
     // Reference to IOService to use for IO processing.

src/bin/d2/tests/nc_trans_unittests.cc

@@ -66,7 +66,7 @@ public:
 
     /// @brief DNSClient callback
     /// Overrides the callback in NameChangeTranscation to allow testing
-    /// sendUpdate without incorporating exectution of the state model
+    /// sendUpdate without incorporating execution of the state model
     /// into the test.
     /// It sets the DNS status update and posts IO_COMPLETED_EVT as does
     /// the normal callback.
@@ -313,7 +313,7 @@ public:
     /// @brief Builds and then sends an update request
     ///
     /// This method is used to build and send and update request. It is used
-    /// in conjuction with FauxServer to test various message response
+    /// in conjunction with FauxServer to test various message response
     /// scenarios.
     /// @param name_change Transaction under test
     /// @param run_time Maximum time to permit IO processing to run before
@@ -824,7 +824,7 @@ TEST_F(NameChangeTransactionTest, successfulUpdateTest) {
     EXPECT_TRUE(name_change->getForwardChangeCompleted());
 }
 
-/// @brief Tests the ability to use startTransaction to initate the state
+/// @brief Tests the ability to use startTransaction to initiate the state
 /// model execution, and DNSClient callback, operator(), to resume the
 /// model with a update failure outcome.
 TEST_F(NameChangeTransactionTest, failedUpdateTest) {
@@ -1043,7 +1043,7 @@ TEST_F(NameChangeTransactionTest, tsigUnsignedResponse) {
     FauxServer server(*io_service_, *(name_change->getCurrentServer()));
     server.receive (FauxServer::USE_RCODE, dns::Rcode::NOERROR());
 
-    // Do the udpate.
+    // Do the update.
     ASSERT_NO_FATAL_FAILURE(doOneExchange(name_change));
 
     // Verify that next event is IO_COMPLETED_EVT and DNS status is
@@ -1074,7 +1074,7 @@ TEST_F(NameChangeTransactionTest, tsigInvalidResponse) {
     FauxServer server(*io_service_, *(name_change->getCurrentServer()));
     server.receive (FauxServer::INVALID_TSIG, dns::Rcode::NOERROR());
 
-    // Do the udpate.
+    // Do the update.
     ASSERT_NO_FATAL_FAILURE(doOneExchange(name_change));
 
     // Verify that next event is IO_COMPLETED_EVT and DNS status is
@@ -1124,7 +1124,7 @@ TEST_F(NameChangeTransactionTest, tsigUnexpectedSignedResponse) {
     EXPECT_EQ("response.example.com.", zone->getName().toText());
 }
 
-/// @brief Tests that a TSIG udpate succeeds when client and server both use
+/// @brief Tests that a TSIG update succeeds when client and server both use
 /// the right key.  Runs the test for all supported algorithms.
 TEST_F(NameChangeTransactionTest, tsigAllValid) {
     std::vector<std::string>algorithms;

src/bin/dhcp4/ctrl_dhcp4_srv.h

@@ -168,7 +168,7 @@ private:
     /// this method.
     ///
     /// @param max_leases Maximum number of leases to be reclaimed.
-    /// @param timeout Maximum amount of time that the reclaimation routine
+    /// @param timeout Maximum amount of time that the reclamation routine
     /// may be processing expired leases, expressed in milliseconds.
     /// @param remove_lease A boolean value indicating if the lease should
     /// be removed when it is reclaimed (if true) or it should be left in the

src/bin/dhcp4/dhcp4_srv.cc

@@ -899,7 +899,7 @@ Dhcpv4Srv::processPacket(Pkt4Ptr& query, Pkt4Ptr& rsp) {
                 .arg(query->getIface())
                 .arg(e.what());
 
-            // Increase the statistics of parse failues and dropped packets.
+            // Increase the statistics of parse failures and dropped packets.
             isc::stats::StatsMgr::instance().addValue("pkt4-parse-failed",
                                                       static_cast<int64_t>(1));
             isc::stats::StatsMgr::instance().addValue("pkt4-receive-drop",
@@ -2044,7 +2044,7 @@ Dhcpv4Srv::setFixedFields(Dhcpv4Exchange& ex) {
             getClientClassDictionary()->getClasses();
 
         // Now we need to iterate over the classes assigned to the
-        // query packet and find corresponding class defintions for it.
+        // query packet and find corresponding class definitions for it.
         for (ClientClasses::const_iterator name = classes.begin();
              name != classes.end(); ++name) {
 
@@ -2065,18 +2065,18 @@ Dhcpv4Srv::setFixedFields(Dhcpv4Exchange& ex) {
             const string& sname = cl->second->getSname();
             if (!sname.empty()) {
                 // Converting string to (const uint8_t*, size_t len) format is
-                // tricky. reineterpret_cast is not the most elegant solution,
+                // tricky. reinterpret_cast is not the most elegant solution,
                 // but it does avoid us making unnecessary copy. We will convert
                 // sname and file fields in Pkt4 to string one day and life
                 // will be easier.
                 response->setSname(reinterpret_cast<const uint8_t*>(sname.c_str()),
                                    sname.size());
             }
-            
+
             const string& filename = cl->second->getFilename();
             if (!filename.empty()) {
                 // Converting string to (const uint8_t*, size_t len) format is
-                // tricky. reineterpret_cast is not the most elegant solution,
+                // tricky. reinterpret_cast is not the most elegant solution,
                 // but it does avoid us making unnecessary copy. We will convert
                 // sname and file fields in Pkt4 to string one day and life
                 // will be easier.

src/bin/dhcp4/json_config_parser.cc

@@ -334,7 +334,7 @@ protected:
             subnet4->get4o6().enabled(true);
         }
 
-        // Try 4o6 specific paramter: 4o6-interface-id
+        // Try 4o6 specific parameter: 4o6-interface-id
         std::string ifaceid = string_values_->getOptionalParam("4o6-interface-id", "");
         if (!ifaceid.empty()) {
             OptionBuffer tmp(ifaceid.begin(), ifaceid.end());

src/bin/dhcp4/tests/classify_unittest.cc

@@ -138,7 +138,7 @@ public:
         IfaceMgr::instance().openSockets4();
     }
 
-    /// @brief Desctructor.
+    /// @brief Destructor.
     ///
     ~ClassifyTest() {
     }

src/bin/dhcp4/tests/config_parser_unittest.cc

@@ -2443,7 +2443,7 @@ TEST_F(Dhcp4ParserTest, optionDataBoolean) {
                       sizeof(expected_option_data));
 
     // Bogus values should not be accepted.
-    params["data"] = "bugus";
+    params["data"] = "bogus";
     testInvalidOptionParam(params);
 
     params["data"] = "2";
@@ -3239,7 +3239,7 @@ TEST_F(Dhcp4ParserTest, selectedInterfacesAndAddresses) {
 TEST_F(Dhcp4ParserTest, d2ClientConfig) {
     ConstElementPtr status;
 
-    // Verify that the D2 configuraiton can be fetched and is set to disabled.
+    // Verify that the D2 configuration can be fetched and is set to disabled.
     D2ClientConfigPtr d2_client_config = CfgMgr::instance().getD2ClientConfig();
     EXPECT_FALSE(d2_client_config->getEnableUpdates());
 
@@ -3343,7 +3343,7 @@ TEST_F(Dhcp4ParserTest, invalidD2ClientConfig) {
     checkResult(status, 1);
     EXPECT_TRUE(errorContainsPosition(status, "<string>"));
 
-    // Verify that the D2 configuraiton can be fetched and is set to disabled.
+    // Verify that the D2 configuration can be fetched and is set to disabled.
     D2ClientConfigPtr d2_client_config = CfgMgr::instance().getD2ClientConfig();
     EXPECT_FALSE(d2_client_config->getEnableUpdates());
 
@@ -4152,7 +4152,7 @@ TEST_F(Dhcp4ParserTest, 4o6subnetBogus) {
         "    \"4o6-subnet\": \"2001:db8:bogus/45\" } ],"
         "\"valid-lifetime\": 4000 }",
 
-        // Bogus configuration 3: incorrect prefix lenght
+        // Bogus configuration 3: incorrect prefix length
         "{ " + genIfaceConfig() + "," +
         "\"rebind-timer\": 2000, "
         "\"renew-timer\": 1000, "

src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc

@@ -394,7 +394,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, controlLeasesReclaim) {
     EXPECT_TRUE(lease1->stateExpiredReclaimed());
 }
 
-// Thist test verifies that the DHCP server immediately removed expired
+// This test verifies that the DHCP server immediately removed expired
 // leases on leases-reclaim command with remove = true
 TEST_F(CtrlChannelDhcpv4SrvTest, controlLeasesReclaimRemove) {
     createUnixChannelServer();

src/bin/dhcp4/tests/decline_unittest.cc

@@ -89,7 +89,7 @@ Dhcpv4SrvTest::acquireAndDecline(Dhcp4Client& client,
     isc::stats::StatsMgr::instance().setValue("declined-addresses",
                                               static_cast<int64_t>(0));
 
-    // Ok, do the normal lease aquisition.
+    // Ok, do the normal lease acquisition.
     CfgMgr::instance().clear();
 
     // Configure DHCP server.
@@ -149,7 +149,7 @@ Dhcpv4SrvTest::acquireAndDecline(Dhcp4Client& client,
     if (expected_result == SHOULD_PASS) {
         EXPECT_EQ(Lease::STATE_DECLINED, lease->state_);
 
-        // The decline succeded, so the declined-addresses statistic should
+        // The decline succeeded, so the declined-addresses statistic should
         // be increased by one
         EXPECT_EQ(after, before + 1);
 

src/bin/dhcp4/tests/dhcp4_client.cc

@@ -186,7 +186,7 @@ Dhcp4Client::applyConfiguration() {
     // sname
     OptionBuffer buf = resp->getSname();
     // sname is a fixed length field holding null terminated string. Use
-    // of c_str() guarantess that only a useful portion (ending with null
+    // of c_str() guarantees that only a useful portion (ending with null
     // character) is assigned.
     config_.sname_.assign(std::string(buf.begin(), buf.end()).c_str());
     // (boot)file

src/bin/dhcp4/tests/dhcp4_srv_unittest.cc

@@ -2431,7 +2431,7 @@ TEST_F(Dhcpv4SrvTest, statisticsDecline) {
 }
 
 // Test checks whether statistic is bumped up appropriately when Offer
-// message is received (this should never happen in a sane metwork).
+// message is received (this should never happen in a sane network).
 TEST_F(Dhcpv4SrvTest, statisticsOfferRcvd) {
     NakedDhcpv4Srv srv(0);
 
@@ -2439,7 +2439,7 @@ TEST_F(Dhcpv4SrvTest, statisticsOfferRcvd) {
 }
 
 // Test checks whether statistic is bumped up appropriately when Ack
-// message is received (this should never happen in a sane metwork).
+// message is received (this should never happen in a sane network).
 TEST_F(Dhcpv4SrvTest, statisticsAckRcvd) {
     NakedDhcpv4Srv srv(0);
 
@@ -2447,7 +2447,7 @@ TEST_F(Dhcpv4SrvTest, statisticsAckRcvd) {
 }
 
 // Test checks whether statistic is bumped up appropriately when Nak
-// message is received (this should never happen in a sane metwork).
+// message is received (this should never happen in a sane network).
 TEST_F(Dhcpv4SrvTest, statisticsNakRcvd) {
     NakedDhcpv4Srv srv(0);
 

src/bin/dhcp4/tests/dhcp4_test_utils.cc

@@ -662,7 +662,7 @@ Dhcpv4SrvTest::pretendReceivingPkt(NakedDhcpv4Srv& srv, const std::string& confi
     ObservationPtr pkt4_rcvd = mgr.getObservation("pkt4-received");
     ObservationPtr tested_stat = mgr.getObservation(stat_name);
 
-    // All expected statstics must be present.
+    // All expected statistics must be present.
     ASSERT_TRUE(pkt4_rcvd);
     ASSERT_TRUE(tested_stat);
 

src/bin/dhcp4/tests/dhcp4_test_utils.h

@@ -421,7 +421,7 @@ public:
     ///
     /// Instantiates fake network interfaces, configures passed Dhcpv4Srv,
     /// then creates a message of specified type and sends it to the
-    /// server and then checks whether expected statstics were set
+    /// server and then checks whether expected statistics were set
     /// appropriately.
     ///
     /// @param srv the DHCPv4 server to be used

src/bin/dhcp4/tests/dora_unittest.cc

@@ -355,7 +355,7 @@ public:
         isc::stats::StatsMgr::instance().removeAll();
     }
 
-    /// @brief Desctructor.
+    /// @brief Destructor.
     ///
     /// Cleans up statistics after the test.
     ~DORATest() {
@@ -609,7 +609,7 @@ TEST_F(DORATest, initRebootRequest) {
     EXPECT_EQ(DHCPNAK, static_cast<int>(resp->getType()));
 
     // Change client identifier. The server should treat the request
-    // as a resquest from unknown client and ignore it.
+    // as a request from unknown client and ignore it.
     client.includeClientId("12:34");
     ASSERT_NO_THROW(client.doRequest());
     ASSERT_FALSE(client.getContext().response_);
@@ -1315,7 +1315,7 @@ TEST_F(DORATest, reservationsWithConflicts) {
 
     // Client A performs 4-way exchange.
     client.setState(Dhcp4Client::SELECTING);
-    // Revert to the broadcast address for the selcting client.
+    // Revert to the broadcast address for the selecting client.
     client.setDestAddress(IOAddress::IPV4_BCAST_ADDRESS());
     // Obtain a lease from the server using the 4-way exchange.
     ASSERT_NO_THROW(client.doDORA(boost::shared_ptr<
@@ -1379,7 +1379,7 @@ TEST_F(DORATest, statisticsDORA) {
     ObservationPtr pkt4_ack_sent = mgr.getObservation("pkt4-ack-sent");
     ObservationPtr pkt4_sent = mgr.getObservation("pkt4-sent");
 
-    // All expected statstics must be present.
+    // All expected statistics must be present.
     ASSERT_TRUE(pkt4_received);
     ASSERT_TRUE(pkt4_discover_received);
     ASSERT_TRUE(pkt4_offer_sent);
@@ -1441,7 +1441,7 @@ TEST_F(DORATest, statisticsNAK) {
     ObservationPtr pkt4_nak_sent = mgr.getObservation("pkt4-nak-sent");
     ObservationPtr pkt4_sent = mgr.getObservation("pkt4-sent");
 
-    // All expected statstics must be present.
+    // All expected statistics must be present.
     ASSERT_TRUE(pkt4_received);
     ASSERT_TRUE(pkt4_request_received);
     ASSERT_FALSE(pkt4_ack_sent); // No acks were sent, no such statistic expected.

src/bin/dhcp4/tests/fqdn_unittest.cc

@@ -427,7 +427,7 @@ public:
     // in a client request correctly, according to the replace-client-name
     // mode configuration parameter.
     //
-    // @param mode - value to use client-name-replacment parameter - for
+    // @param mode - value to use client-name-replacement parameter - for
     // mode labels such as NEVER and ALWAYS must incluce enclosing quotes:
     // "\"NEVER\"".  This allows us to also pass in boolean literals which
     // are unquoted.
@@ -568,7 +568,7 @@ public:
     /// @param len - expected lease length in the NCR
     /// @param not_strict_expire_check - when true the comparison of the NCR
     /// lease expiration time is conducted as greater than or equal to rather
-    /// equal to CLTT plus lease lenght.
+    /// equal to CLTT plus lease length.
     void verifyNameChangeRequest(const isc::dhcp_ddns::NameChangeType type,
                                  const bool reverse, const bool forward,
                                  const std::string& addr,
@@ -1462,7 +1462,7 @@ TEST_F(NameDhcpv4SrvTest, hostnameReservationNoDNSQualifyingSuffix) {
 // Test verifies that the server properly generates a FQDN when the client
 // FQDN name is blank, whether or not DDNS updates are enabled.  It also
 // verifies that the lease is only in the database following a DHCPREQUEST and
-// that the lesae contains the generated FQDN.
+// that the lease contains the generated FQDN.
 TEST_F(NameDhcpv4SrvTest, emptyFqdn) {
     Dhcp4Client client(Dhcp4Client::SELECTING);
     isc::asiolink::IOAddress expected_address("10.0.0.10");

src/bin/dhcp4/tests/host_options_unittest.cc

@@ -81,9 +81,9 @@ const bool STATEFUL = false;
 ///   - Single subnet 10.0.0.0/24 with a pool of 10.0.0.10-10.0.0.100
 ///   - Single reservation within the subnet:
 ///     - HW address: aa:bb:cc:dd:ee:ff
-///     - ip-adress 10.0.0.7
+///     - ip-address 10.0.0.7
 ///     - Vendor option for Cable Labs vendor id specified for the reservation:
-///       - TFTP servers suboption overriding globally spececified suboption:
+///       - TFTP servers suboption overriding globally specified suboption:
 ///         10.1.1.202,10.1.1.203
 ///
 const char* HOST_CONFIGS[] = {
@@ -252,7 +252,7 @@ public:
     /// Overridden options are requested with Parameter Request List
     /// option.
     ///
-    /// @param stateless Boolean value indicating if statless or stateful
+    /// @param stateless Boolean value indicating if stateless or stateful
     /// configuration should be performed.
     void testOverrideRequestedOptions(const bool stateless);
 
@@ -262,21 +262,21 @@ public:
     /// Overridden options are the options which server sends regardless
     /// if they are requested with Parameter Request List option or not.
     ///
-    /// @param stateless Boolean value indicating if statless or stateful
+    /// @param stateless Boolean value indicating if stateless or stateful
     /// configuration should be performed.
     void testOverrideDefaultOptions(const bool stateless);
 
     /// @brief Verifies that client receives options when they are solely
     /// defined in the host scope (and not in the global or subnet scope).
     ///
-    /// @param stateless Boolean value indicating if statless or stateful
+    /// @param stateless Boolean value indicating if stateless or stateful
     /// configuration should be performed.
     void testHostOnlyOptions(const bool stateless);
 
     /// @brief Verifies that host specific vendor options override vendor
     /// options defined in the global scope.
     ///
-    /// @param stateless Boolean value indicating if statless or stateful
+    /// @param stateless Boolean value indicating if stateless or stateful
     /// configuration should be performed.
     void testOverrideVendorOptions(const bool stateless);
 

src/bin/dhcp4/tests/inform_unittest.cc

@@ -139,7 +139,7 @@ public:
         isc::stats::StatsMgr::instance().removeAll();
     }
 
-    /// @brief Desctructor.
+    /// @brief Destructor.
     ///
     /// Cleans up statistics after the test.
     ~InformTest() {

src/bin/dhcp4/tests/kea_controller_unittest.cc

@@ -349,7 +349,7 @@ TEST_F(JSONFileBackendTest, timers) {
         "}";
     writeFile(config);
 
-    // Create an instance of the server and intialize it.
+    // Create an instance of the server and initialize it.
     boost::scoped_ptr<ControlledDhcpv4Srv> srv;
     ASSERT_NO_THROW(srv.reset(new ControlledDhcpv4Srv(0)));
     ASSERT_NO_THROW(srv->init(TEST_FILE));
@@ -418,7 +418,7 @@ TEST_F(JSONFileBackendTest, defaultLeaseDbBackend) {
         "}";
     writeFile(config);
 
-    // Create an instance of the server and intialize it.
+    // Create an instance of the server and initialize it.
     boost::scoped_ptr<ControlledDhcpv4Srv> srv;
     ASSERT_NO_THROW(srv.reset(new ControlledDhcpv4Srv(0)));
     ASSERT_NO_THROW(srv->init(TEST_FILE));
@@ -520,7 +520,7 @@ testBackendReconfiguration(const std::string& backend_first,
                            const std::string& backend_second) {
     writeFile(createConfiguration(backend_first));
 
-    // Create an instance of the server and intialize it.
+    // Create an instance of the server and initialize it.
     boost::scoped_ptr<NakedControlledDhcpv4Srv> srv;
     ASSERT_NO_THROW(srv.reset(new NakedControlledDhcpv4Srv()));
     srv->setConfigFile(TEST_FILE);

src/bin/dhcp4/tests/marker_file.h.in

@@ -45,7 +45,7 @@ checkMarkerFile(const char* name, const char* expected);
 ///
 /// This function is used in some of the DHCP server tests.
 ///
-/// Checkes that the specified file does NOT exist.
+/// Checks that the specified file does NOT exist.
 ///
 /// @param name Name of the marker file.
 ///

src/bin/dhcp4/tests/out_of_range_unittest.cc

@@ -203,7 +203,7 @@ public:
         IfaceMgr::instance().openSockets4();
     }
 
-    /// @brief Desctructor.
+    /// @brief Destructor.
     ///
     /// Cleans up statistics after the test.
     ~OutOfRangeTest() {
@@ -224,7 +224,7 @@ public:
     /// off the queue.  Note the function expects there to be 1 and only
     /// 1 NCR queued.
     ///
-    /// @param type - NCR type exepcted, either CHG_ADD or CHG_REMOVE
+    /// @param type - NCR type expected, either CHG_ADD or CHG_REMOVE
     /// @param addr - string containing the ip address expected in the NCR
     void verifyNameChangeRequest(const isc::dhcp_ddns::NameChangeType type,
                                  const std::string& addr) {
@@ -245,7 +245,7 @@ public:
     ///
     /// Each test cycles consists of a the following two stages, the first is
     /// a set-up stage during which the server is configured with an initial,
-    /// reference, configuration and a client then verifies that it can aquire
+    /// reference, configuration and a client then verifies that it can acquire
     /// and renew a lease.  The second stage verifies that the server, having
     /// been reconfigured such that the original lease is now "out-of-range",
     /// responds correctly to the same client first attempting to renew the
@@ -301,7 +301,7 @@ OutOfRangeTest::oorRenewReleaseTest(enum CfgIndex cfg_idx,
         client.setHWAddress(hwaddress);
     }
 
-    // Aquire the lease via DORA
+    // Acquire the lease via DORA
     ASSERT_NO_THROW(client.doDORA());
 
     // Make sure that the server responded.
@@ -406,7 +406,7 @@ TEST_F(OutOfRangeTest, dynamicOutOfSubnet) {
                         DOES_NOT_RENEW);
 }
 
-// Test verifies that once-valid dynamic address host reserveration,
+// Test verifies that once-valid dynamic address host reservation,
 // whose address is no longer within the subnet's pool:
 //
 // a: Is NAKed upon a renewal attempt
@@ -419,7 +419,7 @@ TEST_F(OutOfRangeTest, dynamicHostOutOfPool) {
     oorRenewReleaseTest(DIFF_POOL, hwaddress, expected_address, DOES_NOT_RENEW);
 }
 
-// Test verifies that once-valid dynamic address host reserveration,
+// Test verifies that once-valid dynamic address host reservation,
 // whose address is no longer within any configured subnet:
 //
 // a: Is NAKed upon a renewal attempt
@@ -433,7 +433,7 @@ TEST_F(OutOfRangeTest, dynamicHostOutOfSubnet) {
                         DOES_NOT_RENEW);
 }
 
-// Test verifies that once-valid dynamic address host reserveration,
+// Test verifies that once-valid dynamic address host reservation,
 // whose address is within the configured subnet and pool, but whose
 // reservation has been removed:
 //
@@ -449,7 +449,7 @@ TEST_F(OutOfRangeTest, dynamicHostReservationRemoved) {
     oorRenewReleaseTest(NO_HR, hwaddress, expected_address, DOES_RENEW);
 }
 
-// Test verifies that once-valid dynamic address host reserveration,
+// Test verifies that once-valid dynamic address host reservation,
 // whose address is no longer within any configured subnet, and which
 // no longer has reservation defined:
 //
@@ -466,7 +466,7 @@ TEST_F(OutOfRangeTest, dynamicHostOutOfSubnetReservationRemoved) {
                         DOES_NOT_RENEW);
 }
 
-// Test verifies that once-valid in-subnet fixed-address host reserveration,
+// Test verifies that once-valid in-subnet fixed-address host reservation,
 // after the subnet pool changes:
 //
 // a: Is NAK'd upon a renewal attempt
@@ -481,7 +481,7 @@ TEST_F(OutOfRangeTest, fixedHostOutOfSubnet) {
 }
 
 
-// Test verifies that once-valid in-subnet fixed-address host reserveration,
+// Test verifies that once-valid in-subnet fixed-address host reservation,
 // after the subnet pool is changed:
 //
 // a: Is ACK'd upon a renewal attempt
@@ -494,7 +494,7 @@ TEST_F(OutOfRangeTest, fixedHostDifferentPool) {
     oorRenewReleaseTest(DIFF_POOL, hwaddress, expected_address, DOES_RENEW);
 }
 
-// Test verifies that once-valid in-subnet fixed-address host reserveration,
+// Test verifies that once-valid in-subnet fixed-address host reservation,
 // whose reservation has been removed from the configuration
 //
 // a: Is NAK'd upon a renewal attempt
@@ -507,7 +507,7 @@ TEST_F(OutOfRangeTest, fixedHostReservationRemoved) {
     oorRenewReleaseTest(NO_HR, hwaddress, expected_address, DOES_NOT_RENEW);
 }
 
-// Test verifies that once-valid fixed address host reserveration,
+// Test verifies that once-valid fixed address host reservation,
 // whose address is no longer within any configured subnet
 //
 // a: Is NAKed upon a renewal attempt

src/bin/dhcp4/tests/release_unittest.cc

@@ -171,7 +171,7 @@ ReleaseTest::acquireAndRelease(const std::string& hw_address_1,
     if (expected_result == SHOULD_PASS) {
         EXPECT_FALSE(lease);
 
-        // The removal succeded, so the assigned-addresses statistic should
+        // The removal succeeded, so the assigned-addresses statistic should
         // be decreased by one
         EXPECT_EQ(before, after + 1);
     } else {

src/bin/dhcp6/ctrl_dhcp6_srv.h

@@ -167,7 +167,7 @@ private:
     /// this method.
     ///
     /// @param max_leases Maximum number of leases to be reclaimed.
-    /// @param timeout Maximum amount of time that the reclaimation routine
+    /// @param timeout Maximum amount of time that the reclamation routine
     /// may be processing expired leases, expressed in milliseconds.
     /// @param remove_lease A boolean value indicating if the lease should
     /// be removed when it is reclaimed (if true) or it should be left in the

src/bin/dhcp6/dhcp6_srv.cc

@@ -1646,7 +1646,7 @@ Dhcpv6Srv::extendIA_NA(const Pkt6Ptr& query, const Pkt6Ptr& answer,
     ia_rsp->setT1(subnet->getT1());
     ia_rsp->setT2(subnet->getT2());
 
-    // Get DDNS udpate directions
+    // Get DDNS update directions
     bool do_fwd = false;
     bool do_rev = false;
     Option6ClientFqdnPtr fqdn = boost::dynamic_pointer_cast<
@@ -1753,7 +1753,7 @@ Dhcpv6Srv::extendIA_NA(const Pkt6Ptr& query, const Pkt6Ptr& answer,
     // All is left is to insert the status code.
     if (leases.empty()) {
 
-        // The server wasn't able allocate new lease and renew an exising
+        // The server wasn't able allocate new lease and renew an existing
         // lease. In that case, the server sends NoAddrsAvail per RFC7550.
         ia_rsp->addOption(createStatusCode(*query, *ia_rsp,
                                            STATUS_NoAddrsAvail,
@@ -1916,7 +1916,7 @@ Dhcpv6Srv::extendIA_PD(const Pkt6Ptr& query,
     // All is left is to insert the status code.
     if (leases.empty()) {
 
-        // The server wasn't able allocate new lease and renew an exising
+        // The server wasn't able allocate new lease and renew an existing
         // lease. In that case, the server sends NoPrefixAvail per RFC7550.
         ia_rsp->addOption(createStatusCode(*query, *ia_rsp,
                                            STATUS_NoPrefixAvail,
@@ -2903,7 +2903,7 @@ Dhcpv6Srv::processInfRequest(const Pkt6Ptr& inf_request) {
     // Try to assign options that were requested by the client.
     appendRequestedOptions(inf_request, reply, co_list);
 
-    // Try to assigne vendor options that were requested by the client.
+    // Try to assign vendor options that were requested by the client.
     appendRequestedVendorOptions(inf_request, reply, ctx, co_list);
 
     return (reply);

src/bin/dhcp6/dhcp6_srv.h

@@ -82,7 +82,7 @@ public:
     /// redeclaration/redefinition. @ref Daemon::getVersion()
     static std::string getVersion(bool extended);
 
-    /// @brief Returns server-indentifier option.
+    /// @brief Returns server-identifier option.
     ///
     /// @return server-id option
     OptionPtr getServerID() { return serverid_; }
@@ -692,7 +692,7 @@ protected:
     /// This method iterates over all IA_NA options and calls @ref declineIA on
     /// each of them.
     ///
-    /// @param decline Decline messege sent by a client
+    /// @param decline Decline message sent by a client
     /// @param reply Server's response (IA_NA with status will be added here)
     /// @param ctx context
     /// @return true when expected to continue, false when hooks told us to drop
@@ -722,7 +722,7 @@ protected:
     /// - cleans up DNS, if necessary
     /// - updates subnet[X].declined-addresses (per subnet stat)
     /// - updates declined-addresses (global stat)
-    /// - deassociates client information from the lease
+    /// - dissociates client information from the lease
     /// - moves the lease to DECLINED state
     /// - sets lease expiration time to decline-probation-period
     /// - adds status-code success

src/bin/dhcp6/json_config_parser.cc

@@ -832,7 +832,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) {
     // rollback informs whether error occurred and original data
     // have to be restored to global storages.
     bool rollback = false;
-    // config_pair holds ther details of the current parser when iterating over
+    // config_pair holds the details of the current parser when iterating over
     // the parsers.  It is declared outside the loop so in case of error, the
     // name of the failing parser can be retrieved within the "catch" clause.
     ConfigPair config_pair;

src/bin/dhcp6/main.cc

@@ -158,8 +158,9 @@ main(int argc, char* argv[]) {
                 log_manager.process();
                 LOG_ERROR(dhcp6_logger, DHCP6_INIT_FAIL).arg(ex.what());
             } catch (...) {
-                // The exeption thrown during the initialization could originate
-                // from logger subsystem. Therefore LOG_ERROR() may fail as well.
+                // The exception thrown during the initialization could
+                // originate from logger subsystem. Therefore LOG_ERROR() may
+                // fail as well.
                 cerr << "Failed to initialize server: " << ex.what() << endl;
             }
 

src/bin/dhcp6/tests/config_parser_unittest.cc

@@ -562,7 +562,7 @@ public:
         CfgMgr::instance().clear();
     }
 
-    /// @brief Test invalid option paramater value.
+    /// @brief Test invalid option parameter value.
     ///
     /// This test function constructs the simple configuration
     /// string and injects invalid option configuration into it.
@@ -776,7 +776,7 @@ TEST_F(Dhcp6ParserTest, emptySubnet) {
 
     ConstElementPtr status;
     EXPECT_NO_THROW(status = configureDhcp6Server(srv_, json));
-                    
+
     // returned value should be 0 (success)
     checkResult(status, 0);
 }
@@ -3785,7 +3785,7 @@ TEST_F(Dhcp6ParserTest, classifySubnets) {
 // This test checks the ability of the server to parse a configuration
 // containing a full, valid dhcp-ddns (D2ClientConfig) entry.
 TEST_F(Dhcp6ParserTest, d2ClientConfig) {
-    // Verify that the D2 configuraiton can be fetched and is set to disabled.
+    // Verify that the D2 configuration can be fetched and is set to disabled.
     D2ClientConfigPtr d2_client_config = CfgMgr::instance().getD2ClientConfig();
     EXPECT_FALSE(d2_client_config->getEnableUpdates());
 
@@ -3891,7 +3891,7 @@ TEST_F(Dhcp6ParserTest, invalidD2ClientConfig) {
     checkResult(status, 1);
     EXPECT_TRUE(errorContainsPosition(status, "<string>"));
 
-    // Verify that the D2 configuraiton can be fetched and is set to disabled.
+    // Verify that the D2 configuration can be fetched and is set to disabled.
     D2ClientConfigPtr d2_client_config = CfgMgr::instance().getD2ClientConfig();
     EXPECT_FALSE(d2_client_config->getEnableUpdates());
 

src/bin/dhcp6/tests/confirm_unittest.cc

@@ -274,7 +274,7 @@ TEST_F(ConfirmTest, relayedClientNoSubnet) {
     // Send Confirm message to the server.
     ASSERT_NO_THROW(client.doConfirm());
     // Client should have received a status code option and this option should
-    // indicate that the client is NotOnLink becuase subnet could not be
+    // indicate that the client is NotOnLink because subnet could not be
     // selected.
     ASSERT_TRUE(client.receivedStatusCode());
     ASSERT_EQ(STATUS_NotOnLink, client.getStatusCode());

src/bin/dhcp6/tests/decline_unittest.cc

@@ -166,7 +166,7 @@ Dhcpv6SrvTest::acquireAndDecline(Dhcp6Client& client,
     if (expected_result == SHOULD_PASS) {
         EXPECT_EQ(Lease::STATE_DECLINED, lease->state_);
 
-        // The decline succeded, so the declined-addresses statistic should
+        // The decline succeeded, so the declined-addresses statistic should
         // be increased by one
         EXPECT_EQ(after, before + 1);
         EXPECT_EQ(after_global, before_global + 1);

src/bin/dhcp6/tests/dhcp6_test_utils.cc

@@ -675,7 +675,7 @@ Dhcpv6SrvTest::testReceiveStats(uint8_t pkt_type, const std::string& stat_name)
     // fakeReceive()
     srv.run();
 
-    // All expected statstics must be present.
+    // All expected statistics must be present.
     pkt6_rcvd = mgr.getObservation("pkt6-received");
     tested_stat = mgr.getObservation(stat_name);
     ASSERT_TRUE(pkt6_rcvd);

src/bin/dhcp6/tests/dhcp6_test_utils.h

@@ -376,7 +376,7 @@ public:
 // dependencies, we use forward declaration here.
 class Dhcp6Client;
 
-// Provides suport for tests against a preconfigured subnet6
+// Provides support for tests against a preconfigured subnet6
 // extends upon NakedDhcp6SrvTest
 class Dhcpv6SrvTest : public NakedDhcpv6SrvTest {
 public:

src/bin/dhcp6/tests/fqdn_unittest.cc

@@ -234,7 +234,7 @@ public:
 
     /// @brief Adds IA option to the message.
     ///
-    /// Addded option holds an address.
+    /// Added option holds an address.
     ///
     /// @param iaid IAID
     /// @param pkt A DHCPv6 message to which the IA option should be added.
@@ -391,7 +391,7 @@ public:
     // in a client request correctly, according to the replace-client-name
     // mode configuration parameter.
     //
-    // @param mode - value to use client-name-replacment parameter - for
+    // @param mode - value to use client-name-replacement parameter - for
     // mode labels such as NEVER and ALWAYS must incluce enclosing quotes:
     // "\"NEVER\"".  This allows us to also pass in boolean literals which
     // are unquoted.
@@ -556,7 +556,7 @@ public:
     ///
     /// @param type An expected type of the NameChangeRequest (Add or Remove).
     /// @param reverse An expected setting of the reverse update flag.
-    /// @param forward An expected setting of the forward udpate flag.
+    /// @param forward An expected setting of the forward update flag.
     /// @param addr A string representation of the IPv6 address held in the
     /// NameChangeRequest.
     /// @param dhcid An expected DHCID value.
@@ -564,7 +564,7 @@ public:
     /// dhcp_ddns::D2Dhcid::createDigest() with the appropriate arguments. This
     /// method uses encryption tools to produce the value which cannot be
     /// easily duplicated by hand.  It is more or less necessary to generate
-    /// these values programmatically and place them here. Should the
+    /// these values programatically and place them here. Should the
     /// underlying implementation of createDigest() change these test values
     /// will likely need to be updated as well.
     /// @param expires A timestamp when the lease associated with the
@@ -793,7 +793,7 @@ TEST_F(FqdnDhcpv6SrvTest, createNameChangeRequests) {
 // Checks that NameChangeRequests to add entries are not
 // created when ddns updates are disabled.
 TEST_F(FqdnDhcpv6SrvTest, noAddRequestsWhenDisabled) {
-    // Disable DDNS udpates.
+    // Disable DDNS updates.
     disableD2();
 
     // Create Reply message with Client Id and Server id.

src/bin/dhcp6/tests/host_unittest.cc

@@ -532,7 +532,7 @@ public:
     void testLeaseForIA(const Reservation& r, size_t& address_count,
                         size_t& prefix_count);
 
-    /// @brief Checks if the client obtined lease for specified hint.
+    /// @brief Checks if the client obtained lease for specified hint.
     ///
     /// The hint belongs to a specific IA (identified by IAID) and is expected
     /// to be returned in this IA by the server.
@@ -1559,7 +1559,7 @@ TEST_F(HostTest, appendReservationDuringRenew) {
     EXPECT_TRUE(client_.hasLeaseForPrefix(IOAddress("3000:1:2::"), 64));
     EXPECT_TRUE(client_.hasLeaseForPrefix(IOAddress("3000:1:3::"), 64));
 
-    // Make sure that the replaced leases have been returned with zero liftimes.
+    // Make sure that the replaced leases have been returned with zero lifetimes.
     EXPECT_TRUE(client_.hasLeaseWithZeroLifetimeForAddress(dynamic_address_lease));
     EXPECT_TRUE(client_.hasLeaseWithZeroLifetimeForPrefix(dynamic_prefix_lease, 64));
 
@@ -1578,7 +1578,7 @@ TEST_F(HostTest, appendReservationDuringRenew) {
     // allocated once, i.e. 6 + 6 = 12.
     ASSERT_EQ(12, client_.getLeaseNum());
 
-    // All removed leases should be returned with zero liftimes.
+    // All removed leases should be returned with zero lifetimes.
     EXPECT_TRUE(client_.hasLeaseWithZeroLifetimeForAddress(IOAddress("2001:db8:1:1::1")));
     EXPECT_TRUE(client_.hasLeaseWithZeroLifetimeForAddress(IOAddress("2001:db8:1:1::2")));
     EXPECT_TRUE(client_.hasLeaseWithZeroLifetimeForAddress(IOAddress("2001:db8:1:1::3")));
@@ -1670,7 +1670,7 @@ TEST_F(HostTest, insertReservationDuringRenew) {
     EXPECT_TRUE(client_.hasLeaseForPrefix(IOAddress("3000:1:3::"), 64,
                                           IAID(6)));
 
-    // Make sure that the replaced leases have been returned with zero liftimes.
+    // Make sure that the replaced leases have been returned with zero lifetimes.
     EXPECT_TRUE(client_.hasLeaseWithZeroLifetimeForAddress(dynamic_address_lease));
     EXPECT_TRUE(client_.hasLeaseWithZeroLifetimeForPrefix(dynamic_prefix_lease, 64));
 }
@@ -1737,7 +1737,7 @@ TEST_F(HostTest, multipleIAsConflict) {
     ASSERT_TRUE(client_.hasLeaseForAddress(IOAddress("2001:db8:1::2"),
                                            IAID(1)));
     // The address "2001:db8:1::1" was hijacked by another client so it
-    // must not be assigned to thsi client.
+    // must not be assigned to this client.
     ASSERT_FALSE(client_.hasLeaseForAddress(IOAddress("2001:db8:1::1")));
     // This client should have got an address from the dynamic pool excluding
     // two addresses already assigned, i.e. excluding "2001:db8:1::1" and

src/bin/dhcp6/tests/infrequest_unittest.cc

@@ -24,7 +24,7 @@ namespace {
 ///   - one subnet used on eth0 interface
 ///     - with address and prefix pools
 ///     - dns-servers option
-/// - Configuation 1:
+/// - Configuration 1:
 ///   - one subnet used on eth0 interface
 ///     - no addresses or prefixes
 ///     - domain-search option

src/bin/dhcp6/tests/kea_controller_unittest.cc

@@ -485,7 +485,7 @@ TEST_F(JSONFileBackendTest, timers) {
         "}";
     writeFile(TEST_FILE, config);
 
-    // Create an instance of the server and intialize it.
+    // Create an instance of the server and initialize it.
     boost::scoped_ptr<ControlledDhcpv6Srv> srv;
     ASSERT_NO_THROW(srv.reset(new ControlledDhcpv6Srv(0)));
     ASSERT_NO_THROW(srv->init(TEST_FILE));
@@ -562,7 +562,7 @@ TEST_F(JSONFileBackendTest, serverId) {
         "}";
     writeFile(TEST_FILE, config);
 
-    // Create an instance of the server and intialize it.
+    // Create an instance of the server and initialize it.
     boost::scoped_ptr<ControlledDhcpv6Srv> srv;
     ASSERT_NO_THROW(srv.reset(new ControlledDhcpv6Srv(0)));
     ASSERT_NO_THROW(srv->init(TEST_FILE));
@@ -593,7 +593,7 @@ TEST_F(JSONFileBackendTest, defaultLeaseDbBackend) {
         "}";
     writeFile(TEST_FILE, config);
 
-    // Create an instance of the server and intialize it.
+    // Create an instance of the server and initialize it.
     boost::scoped_ptr<ControlledDhcpv6Srv> srv;
     ASSERT_NO_THROW(srv.reset(new ControlledDhcpv6Srv(0)));
     ASSERT_NO_THROW(srv->init(TEST_FILE));
@@ -696,7 +696,7 @@ testBackendReconfiguration(const std::string& backend_first,
                            const std::string& backend_second) {
     writeFile(TEST_FILE, createConfiguration(backend_first));
 
-    // Create an instance of the server and intialize it.
+    // Create an instance of the server and initialize it.
     boost::scoped_ptr<NakedControlledDhcpv6Srv> srv;
     ASSERT_NO_THROW(srv.reset(new NakedControlledDhcpv6Srv()));
     srv->setConfigFile(TEST_FILE);

src/bin/dhcp6/tests/marker_file.h.in

@@ -45,7 +45,7 @@ checkMarkerFile(const char* name, const char* expected);
 ///
 /// This function is used in some of the DHCP server tests.
 ///
-/// Checkes that the specified file does NOT exist.
+/// Checks that the specified file does NOT exist.
 ///
 /// @param name Name of the marker file.
 ///

src/bin/dhcp6/tests/sarr_unittest.cc

@@ -513,7 +513,7 @@ TEST_F(SARRTest, sarrStats) {
     // Server should have assigned a prefix.
     ASSERT_EQ(1, client.getLeaseNum());
 
-    // All expected statstics must be present now.
+    // All expected statistics must be present now.
     pkt6_rcvd = mgr.getObservation("pkt6-received");
     pkt6_solicit_rcvd = mgr.getObservation("pkt6-solicit-received");
     pkt6_adv_sent = mgr.getObservation("pkt6-advertise-sent");

src/bin/keactrl/keactrl.in

@@ -57,7 +57,7 @@ usage() {
 }
 
 ### 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
 # 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

src/bin/lfc/lfc_controller.cc

@@ -311,7 +311,7 @@ LFCController::usage(const std::string& text) {
               << "   -f <file>: finish file" << std::endl
               << "   -c <file>: configuration file" << 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
               << "   -h: print this message " << std::endl
               << std::endl;

src/bin/lfc/lfc_controller.h

@@ -154,7 +154,7 @@ public:
 private:
     /// Version of the DHCP protocol used, i.e. 4 or 6.
     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_;
     std::string config_file_;   ///< The path to the config file
     std::string previous_file_; ///< The path to the previous LFC file (if any)

src/bin/lfc/tests/lfc_controller_unittests.cc

@@ -219,7 +219,7 @@ TEST_F(LFCControllerTest, notEnoughData) {
 /// @brief Verify that extra arguments cause the parse to fail.
 /// Parse a full command line plus some extra arguments on the end
 /// to verify that we don't stop parsing when we find all of the
-/// required arguments.  We exepct the parse to fail with an
+/// required arguments.  We expect the parse to fail with an
 /// InvalidUsage exception.
 TEST_F(LFCControllerTest, tooMuchData) {
     LFCController lfc_controller;
@@ -297,7 +297,7 @@ TEST_F(LFCControllerTest, fileRotate) {
     int argc = 14;
     lfc_controller.parseArgs(argc, argv);
 
-    // Test 1: Start with no files - we expect an execption as there
+    // Test 1: Start with no files - we expect an exception as there
     // is no file to copy.
     EXPECT_THROW(lfc_controller.fileRotate(), RunTimeFail);
     removeTestFile();

src/bin/perfdhcp/command_options.cc

@@ -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.
             // See comment in https://github.com/isc-projects/kea/pull/22#issuecomment-243405600
             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"));
             if (v6_relay_encapsulation_level_ != 1) {
                 isc_throw(isc::InvalidParameter, "-A only supports 1 at the moment.");
@@ -972,7 +972,7 @@ CommandOptions::printCommandLine() const {
 void
 CommandOptions::usage() const {
     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"
         "         [-F<release-rate>] [-t<report>] [-R<range>] [-b<base>]\n"
         "         [-n<num-request>] [-p<test-period>] [-d<drop-time>]\n"
@@ -1086,7 +1086,7 @@ CommandOptions::usage() const {
         "    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"
         "    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"
         "    how many relay agents are simulated. Currently the only supported\n"
         "    <encapsulation-level> value is 1, which means that the generated\n"

src/bin/perfdhcp/perf_pkt6.h

@@ -85,7 +85,7 @@ public:
     /// \brief Handles limited binary packet parsing for packets with
     /// 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
     /// \ref isc::dhcp::Pkt4::addOption to specify which options to parse.
     /// Options should be of the \ref isc::perfdhcp::LocalizedOption

src/bin/perfdhcp/test_control.h

@@ -660,7 +660,7 @@ protected:
     /// being sent to the server. It collects first packets of each
     /// type and keeps them around until test finishes. Then they
     /// 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
     /// pointer is valid. Make sure it is before calling it.
     ///
@@ -675,7 +675,7 @@ protected:
     /// being sent to the server. It collects first packets of each
     /// type and keeps them around until test finishes. Then they
     /// 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
     /// pointer is valid. Make sure it is before calling it.
     ///

src/bin/perfdhcp/tests/command_options_helper.h

@@ -97,7 +97,7 @@ private:
 
     /// \brief Split string to the array of C-strings.
     ///
-    /// \param text_to_split string to be splited.
+    /// \param text_to_split string to be split.
     /// \param [out] num number of substrings returned.
     /// \param std::bad_alloc if allocation of C-strings failed.
     /// \return array of C-strings created from split.
@@ -108,7 +108,7 @@ private:
         // Iterators to be used for tokenization
         std::istream_iterator<std::string> text_iterator(text_stream);
         std::istream_iterator<std::string> text_end;
-        // Tokenize string (space is a separator) using begin and end iteratos
+        // Tokenize string (space is a separator) using begin and end iterators
         std::vector<std::string> tokens(text_iterator, text_end);
 
         if (!tokens.empty()) {

src/bin/perfdhcp/tests/perf_pkt4_unittest.cc

@@ -344,7 +344,7 @@ TEST_F(PerfPkt4Test, PackTransactionId) {
 }
 
 TEST_F(PerfPkt4Test, UnpackTransactionId) {
-    // Initialize packet data, lebgth 268, zeros only.
+    // Initialize packet data, length 268, zeros only.
     std::vector<uint8_t> in_data(268, 0);
 
     // Assume that transaction id is at offset 100.
@@ -377,7 +377,7 @@ TEST_F(PerfPkt4Test, UnpackTransactionId) {
 }
 
 TEST_F(PerfPkt4Test, Writes) {
-    // Initialize intput buffer with 260 elements set to value 1.
+    // Initialize input buffer with 260 elements set to value 1.
     dhcp::OptionBuffer in_data(260, 1);
     // Initialize buffer to be used for write: 1,2,3,4,...,9
     dhcp::OptionBuffer write_buf(10);

src/bin/perfdhcp/tests/perf_pkt6_unittest.cc

@@ -217,7 +217,7 @@ TEST_F(PerfPkt6Test, InvalidOptions) {
 
     // Create packet.
     boost::scoped_ptr<PerfPkt6> pkt2(capture());
-    // Testing offset of the option (lower than pakcet size but
+    // Testing offset of the option (lower than packet size but
     // tail of the option out of bounds).
     LocalizedOptionPtr pkt2_serverid(new LocalizedOption(Option::V6,
                                                          D6O_SERVERID,

src/bin/perfdhcp/tests/rate_control_unittest.cc

@@ -122,7 +122,7 @@ TEST(RateControl, isLateSent) {
 // depends on time.
 TEST(RateControl, getOutboundMessageCount) {
     // Test that the number of outbound messages is correctly defined by the
-    // rate.  The agressivity is set high enough so that it will not restrict
+    // rate.  The aggressivity is set high enough so that it will not restrict
     // the calculated count.
     NakedRateControl rc1(1000, 1000000);
     // Set the timestamp of the last sent message well to the past. The
@@ -135,7 +135,7 @@ TEST(RateControl, getOutboundMessageCount) {
     // The number of messages to be sent must be roughly equal to the time
     // between the last sent message and the current time multiplied by the
     // rate.  ("Roughly", as current time is advancing, so the actual interval
-    // when the calcuation is made may be different from the interval set.)  The
+    // when the measurement is made may be different from the interval set.) The
     // margin in this test is reasonably generous, allowing for a timing error
     // of around 10ms.
     uint64_t count = 0;
@@ -143,7 +143,7 @@ TEST(RateControl, getOutboundMessageCount) {
     EXPECT_TRUE((count >= 5240) && (count <= 5260)) <<
         "count is " << count << ", expected range 5240-5260";
 
-    // Check that the agressivity limits the count of messages.
+    // Check that the aggressivity limits the count of messages.
     NakedRateControl rc2(1000, 3500);
     rc2.last_sent_ =
         NakedRateControl::currentTime() - boost::posix_time::seconds(5) -

src/bin/perfdhcp/tests/test_control_unittest.cc

@@ -32,7 +32,7 @@ using namespace isc::perfdhcp;
 
 /// \brief Test Control class with protected members made public.
 ///
-/// This class makes protected TestControl class'es member public
+/// This class makes protected TestControl class's members public
 /// to allow unit testing.
 class NakedTestControl: public TestControl {
 public:

src/bin/sockcreator/tests/sockcreator_tests.cc

@@ -54,7 +54,7 @@ setAddressFamilyFields(sockaddr_in6* address) {
     address->sin6_addr = in6addr_loopback;
 }
 
-// Socket has been opened, peform a check on it.  The sole argument is the
+// Socket has been opened, perform a check on it.  The sole argument is the
 // socket descriptor.  The TCP check is the same regardless of the address
 // family.  The UDP check requires that the socket address be obtained so
 // is parameterised on the type of structure required to hold the address.
@@ -94,7 +94,7 @@ udpCheck(const int socknum) {
 // code, so provide a convenient typedef.
 typedef void (*socket_check_t)(const int);
 
-// Address-family-specific scoket checks.
+// Address-family-specific socket checks.
 //
 // The first argument is used to select the overloaded check function.
 // The other argument is the socket descriptor number.
@@ -306,7 +306,7 @@ getSockDummy(const int type, struct sockaddr* addr, const socklen_t,
 int
 send_FdDummy(const int destination, const int what) {
     // Make sure it is 1 byte so we know the length. We do not use more during
-    // the test anyway.  And even with the LS bute, we can distinguish between
+    // the test anyway.  And even with the LS byte, we can distinguish between
     // the different results.
     const char fd_data = what & 0xff;
     const bool status = write_data(destination, &fd_data, sizeof(fd_data));

src/hooks/dhcp/user_chk/pkt_send_co.cc

@@ -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_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
 void add6Options(Pkt6Ptr& response, const UserPtr& user) {
     if (!user) {

src/hooks/dhcp/user_chk/tests/user_file_unittests.cc

@@ -41,11 +41,11 @@ TEST(UserFile, construction) {
 TEST(UserFile, openFile) {
     UserFilePtr user_file;
 
-    // Construct a user file that refers to a non existant file.
+    // Construct a user file that refers to a non existing file.
     ASSERT_NO_THROW(user_file.reset(new UserFile("NoSuchFile")));
     EXPECT_FALSE(user_file->isOpen());
 
-    // Verify a non-existant file fails to open
+    // Verify a non-existing file fails to open
     ASSERT_THROW(user_file->open(), UserFileError);
     EXPECT_FALSE(user_file->isOpen());
 
@@ -62,7 +62,7 @@ TEST(UserFile, openFile) {
     // Verify that we cannot open an already open file.
     ASSERT_THROW(user_file->open(), UserFileError);
 
-    // Verifyt we can close it.
+    // Verify we can close it.
     ASSERT_NO_THROW(user_file->close());
     EXPECT_FALSE(user_file->isOpen());
 
@@ -75,7 +75,7 @@ TEST(UserFile, openFile) {
 /// @brief Tests makeUser with invalid user strings
 TEST(UserFile, makeUser) {
     const char* invalid_strs[]= {
-        // Missinge type element.
+        // Missing type element.
         "{ \"id\" : \"01AC00F03344\" }",
         // Invalid id type string value.
         "{ \"type\" : \"BOGUS\", \"id\" : \"01AC00F03344\"}",

src/hooks/dhcp/user_chk/tests/user_registry_unittests.cc

@@ -61,7 +61,7 @@ TEST(UserRegistry, userBasics) {
     EXPECT_TRUE(found_user);
     EXPECT_EQ(found_user->getUserId(), *id);
 
-    // Verify that searching for a non-existant user returns empty user pointer.
+    // Verify that searching for a non-existing user returns empty user pointer.
     UserIdPtr id2;
     ASSERT_NO_THROW(id2.reset(new UserId(UserId::HW_ADDRESS, "02020202")));
     ASSERT_NO_THROW(found_user = reg->findUser(*id2));

src/hooks/dhcp/user_chk/tests/userid_unittests.cc

@@ -50,21 +50,21 @@ TEST(UserIdTest, hwAddress_type) {
     EXPECT_EQ(id->getType(), UserId::HW_ADDRESS);
     EXPECT_TRUE(bytes == id->getId());
 
-    // Check relational oeprators when a == b.
+    // Check relational operators when a == b.
     UserIdPtr id2;
     ASSERT_NO_THROW(id2.reset(new UserId(UserId::HW_ADDRESS, id->toText())));
     EXPECT_TRUE(*id == *id2);
     EXPECT_FALSE(*id != *id2);
     EXPECT_FALSE(*id < *id2);
 
-    // Check relational oeprators when a < b.
+    // Check relational operators when a < b.
     ASSERT_NO_THROW(id2.reset(new UserId(UserId::HW_ADDRESS,
                                          "01FF02AC030B0709")));
     EXPECT_FALSE(*id == *id2);
     EXPECT_TRUE(*id != *id2);
     EXPECT_TRUE(*id < *id2);
 
-    // Check relational oeprators when a > b.
+    // Check relational operators when a > b.
     ASSERT_NO_THROW(id2.reset(new UserId(UserId::HW_ADDRESS,
                                          "01FF02AC030B0707")));
     EXPECT_FALSE(*id == *id2);
@@ -98,20 +98,20 @@ TEST(UserIdTest, duid_type) {
     EXPECT_EQ(id->getType(), UserId::DUID);
     EXPECT_TRUE(bytes == id->getId());
 
-    // Check relational oeprators when a == b.
+    // Check relational operators when a == b.
     UserIdPtr id2;
     ASSERT_NO_THROW(id2.reset(new UserId(UserId::DUID, id->toText())));
     EXPECT_TRUE(*id == *id2);
     EXPECT_FALSE(*id != *id2);
     EXPECT_FALSE(*id < *id2);
 
-    // Check relational oeprators when a < b.
+    // Check relational operators when a < b.
     ASSERT_NO_THROW(id2.reset(new UserId(UserId::DUID, "01FF02AC030B0709")));
     EXPECT_FALSE(*id == *id2);
     EXPECT_TRUE(*id != *id2);
     EXPECT_TRUE(*id < *id2);
 
-    // Check relational oeprators when a > b.
+    // Check relational operators when a > b.
     ASSERT_NO_THROW(id2.reset(new UserId(UserId::DUID, "01FF02AC030B0707")));
     EXPECT_FALSE(*id == *id2);
     EXPECT_TRUE(*id != *id2);

src/hooks/dhcp/user_chk/user.cc

@@ -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.
     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::iterator end_pos = std::remove(clean_id_str.begin(),
                                                 clean_id_str.end(), ':');

src/hooks/dhcp/user_chk/user_file.h

@@ -43,7 +43,7 @@ public:
 ///
 /// 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.
 /// Currently, only string option values (i.e. enclosed in quotes) are
 /// supported.

src/hooks/dhcp/user_chk/user_registry.cc

@@ -85,7 +85,7 @@ void UserRegistry::refresh() {
             addUser(user);
         }
     } catch (const std::exception& ex) {
-        // Source was compromsised so restore registry from backup.
+        // Source was compromised so restore registry from backup.
         users_ = backup;
         // Close the source.
         source_->close();

src/lib/asiodns/README

@@ -9,7 +9,7 @@ routines to be written in a straightfowrard step-step-step fashion rather
 than as a complex chain of separate handler functions.
 
 Coroutine objects (i.e., UDPServer, TCPServer and IOFetch) are objects
-with reenterable operator() members.  When an instance of one of these
+with reentrant operator() members.  When an instance of one of these
 classes is called as a function, it resumes at the position where it left
 off.  Thus, a UDPServer can issue an asynchronous I/O call and specify
 itself as the handler object; when the call completes, the UDPServer
@@ -89,7 +89,7 @@ fetch logic:
            |
       IOAsioSocket
            |
-     +-----+-----+                
+     +-----+-----+
      |           |
 UDPSocket    TCPSocket
 
@@ -122,7 +122,7 @@ protocol to use.  The sequence is:
     if (! synchronous) {
         YIELD;
     }
-    YIELD asyncSend(query)           // Send query 
+    YIELD asyncSend(query)           // Send query
     do {
         YIELD asyncReceive(response) // Read response
     } while (! complete(response))

src/lib/asiolink/asio_wrapper.h

@@ -34,8 +34,8 @@
 // causes two instances of error_code which should have been equal to
 // to not be equal.
 //
-// The problem disappers if either error handling code is not built header
-// only as this results in a single definiton of system_category() supplied
+// The problem disappears if either error handling code is not built header
+// only as this results in a single definition of system_category() supplied
 // by libboost_system; or the error handling code is not optimized.
 //
 // We're doing the test here, rather than in configure to guard against the

src/lib/asiolink/io_address.h

@@ -67,11 +67,11 @@ public:
 
     /// @brief Constructor for ip::address_v4 object.
     ///
-    /// This constructor is intented to be used when constructing
+    /// This constructor is intended to be used when constructing
     /// IPv4 address out of uint32_t type. Passed value must be in
     /// network byte order
     ///
-    /// @param v4address IPv4 address represnted by uint32_t
+    /// @param v4address IPv4 address represented by uint32_t
     IOAddress(uint32_t v4address);
 
     /// \brief Convert the address to a string.
@@ -183,7 +183,7 @@ public:
     ///
     /// It is useful for comparing which address is bigger.
     /// Operations within one protocol family are obvious.
-    /// Comparisons between v4 and v6 will allways return v4
+    /// Comparisons between v4 and v6 will always return v4
     /// being smaller. This follows boost::boost::asio::ip implementation
     bool lessThan(const IOAddress& other) const {
         if (this->getFamily() == other.getFamily()) {

src/lib/asiolink/tests/tcp_socket_unittest.cc

@@ -62,7 +62,7 @@ public:
         NONE = 4        ///< "Not set" state
     };
 
-    /// \brief Minimim size of buffers
+    /// \brief Minimum size of buffers
     enum {
         MIN_SIZE = (64 * 1024 + 2)          ///< 64kB + two bytes for a count
     };
@@ -149,7 +149,7 @@ public:
         return (ptr_->expected_);
     }
 
-    /// \brief Get offset intodData
+    /// \brief Get offset into data
     size_t& offset() {
         return (ptr_->offset_);
     }
@@ -418,7 +418,7 @@ TEST(TCPSocket, sequenceTest) {
     // Run the callbacks. Several options are possible depending on how ASIO
     // is implemented and whether the message gets fragmented:
     //
-    // 1) The send handler may complete immediately, regardess of whether the
+    // 1) The send handler may complete immediately, regardless of whether the
     // data has been read by the client.  (This is the most likely.)
     // 2) The send handler may only run after all the data has been read by
     // the client. (This could happen if the client's TCP buffers were too

src/lib/cc/command_interpreter.h

@@ -73,7 +73,7 @@ isc::data::ConstElementPtr createAnswer(const int status_code,
 /// @brief Creates a standard config/command level answer message
 ///
 /// @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
 ///        any Element type. May be NULL.
 /// @return Standard command/config answer message

src/lib/cc/data.cc

@@ -1066,7 +1066,7 @@ void Element::preprocess(std::istream& in, std::stringstream& out) {
             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
         // error.
         out << line;

src/lib/cc/data.h

@@ -78,7 +78,7 @@ public:
     /// \endcode
     ///
     /// 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.
     ///
     /// Note that the @c Position structure is used as an argument to @c Element
@@ -505,7 +505,7 @@ public:
     //@{
     /// Creates an Element from the wire format in the given
     /// 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.
     ///
     /// \param in The input stringstream.
@@ -514,7 +514,7 @@ public:
     static ElementPtr fromWire(std::stringstream& in, int length);
 
     /// 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.
     ///
     /// \param s The input string