From: Andrei Pavel Date: Thu, 21 Jan 2021 23:36:41 +0000 (+0200) Subject: [#1656] 1.9.4 release: spelling check X-Git-Tag: Kea-1.9.4~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96f049b111ba175c74397d79ab6aff574ece900d;p=thirdparty%2Fkea.git [#1656] 1.9.4 release: spelling check --- diff --git a/ChangeLog b/ChangeLog index 03d82dc43d..5a90f43017 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1674,7 +1674,7 @@ Kea 1.6.0-beta2 (development) released on July 24, 2019 1593. [bug] marcin Fixed a bug in the Kea Control Agent which caused a sporadic crash - after a tiemout while sending the HTTP response to the controlling + after a timeout while sending the HTTP response to the controlling client. (Gitlab #491,!363, git ff204dfe4dd80702f8bb2edf83f8486e019a7e04) diff --git a/Makefile.am b/Makefile.am index 1a047e4bcd..02dab72214 100644 --- a/Makefile.am +++ b/Makefile.am @@ -146,7 +146,7 @@ cppcheck: --template '{file}:{line}: check_fail: {message} ({severity},{id})' \ src -# this is a shortcut that builds only documentation dependecies and documentation itself +# this is a shortcut that builds only documentation dependencies and documentation itself docs: $(MAKE) -C doc/sphinx diff --git a/configure.ac b/configure.ac index 428c43cd50..64a9065ed5 100755 --- a/configure.ac +++ b/configure.ac @@ -579,7 +579,7 @@ AC_TRY_COMPILE([ AC_MSG_RESULT(no)) usable_regex= -AC_MSG_CHECKING(for usuable C++11 regex) +AC_MSG_CHECKING(for usable C++11 regex) AC_TRY_RUN([ #include #include @@ -1036,7 +1036,7 @@ LIBS=$LIBS_SAVED # Older log4cplus versions (1.2.0) don't have the initializer.h header that # would allow explicit initialization. Newer versions (2.0.4 for sure, possibly # older as well) have it and it's recommended to use it. We detect whether -# it's present or not and do explicit initalization if possible. +# it's present or not and do explicit initialization if possible. CPPFLAGS_SAVED=$CPPFLAGS CPPFLAGS="$LOG4CPLUS_INCLUDES $CPPFLAGS" LIBS_SAVED="$LIBS" diff --git a/doc/devel/congestion-handling.dox b/doc/devel/congestion-handling.dox index c964edb487..9293830514 100644 --- a/doc/devel/congestion-handling.dox +++ b/doc/devel/congestion-handling.dox @@ -346,7 +346,7 @@ public: }; @endcode -DHCPv6 Factory implemenation: +DHCPv6 Factory implementation: @code const std::string QUEUE_TYPE = "Your-Q6"; diff --git a/doc/examples/kea4/advanced.json b/doc/examples/kea4/advanced.json index 2fa0da8ce4..4cd8d4320f 100644 --- a/doc/examples/kea4/advanced.json +++ b/doc/examples/kea4/advanced.json @@ -118,7 +118,7 @@ // By default, Kea ignores requests by clients for unknown IP addresses, // because other non-cooperating DHCP servers could reside on the same // network (RFC 2131). This parameter is defined globally, but can be - // overriden on a subnet level + // overridden on a subnet level "authoritative": false, // The following list defines subnets. Each subnet consists of at diff --git a/doc/examples/kea4/all-keys-netconf.json b/doc/examples/kea4/all-keys-netconf.json index bc2d743ed7..48d38449ba 100644 --- a/doc/examples/kea4/all-keys-netconf.json +++ b/doc/examples/kea4/all-keys-netconf.json @@ -415,7 +415,7 @@ "match-client-id": false, // Global value of the next server address set in 'siaddr' field. - // The global value may be overriden in lower level configuration + // The global value may be overridden in lower level configuration // scopes. "next-server": "192.0.2.123", diff --git a/doc/examples/kea4/all-keys.json b/doc/examples/kea4/all-keys.json index 4d5ec90727..92595caab3 100644 --- a/doc/examples/kea4/all-keys.json +++ b/doc/examples/kea4/all-keys.json @@ -475,7 +475,7 @@ "match-client-id": false, // Global value of the next server address set in 'siaddr' field. - // The global value may be overriden in lower level configuration + // The global value may be overridden in lower level configuration // scopes. "next-server": "192.0.2.123", diff --git a/doc/examples/kea4/all-options.json b/doc/examples/kea4/all-options.json index 724e64f207..e0ec867b85 100644 --- a/doc/examples/kea4/all-options.json +++ b/doc/examples/kea4/all-options.json @@ -1650,7 +1650,7 @@ }, // A single encapsulating space can be used. An option containing any - // option from said space will now be unpacked succesfully by Kea. + // option from said space will now be unpacked successfully by Kea. { "array": false, "code": 232, diff --git a/doc/examples/kea4/ha-load-balancing-primary.json b/doc/examples/kea4/ha-load-balancing-primary.json index 24a9faade5..88435a22f2 100644 --- a/doc/examples/kea4/ha-load-balancing-primary.json +++ b/doc/examples/kea4/ha-load-balancing-primary.json @@ -1,6 +1,6 @@ // This is an example configuration of the Kea DHCPv4 server. It uses High // Availability hooks library and Lease Commands hooks library to enable -// High Availibility function for the DHCP server. Note that almost exactly +// High Availability function for the DHCP server. Note that almost exactly // the same configuration must be used on the second server (partner). // The only difference is that "this-server-name" must be set to "server2" // on this other server. Also, the interface configuration depends on the diff --git a/doc/examples/kea4/several-subnets.json b/doc/examples/kea4/several-subnets.json index b291c5975e..1151daff19 100644 --- a/doc/examples/kea4/several-subnets.json +++ b/doc/examples/kea4/several-subnets.json @@ -43,7 +43,7 @@ // By default, Kea ignores requests by clients for unknown IP addresses, // because other non-cooperating DHCP servers could reside on the same // network (RFC 2131). This parameter is defined globally, but can be - // overriden on a subnet level + // overridden on a subnet level "authoritative": false, // The following list defines subnets. Each subnet consists of at diff --git a/doc/examples/kea6/all-options.json b/doc/examples/kea6/all-options.json index fbaf5979d4..be2d17e8c1 100644 --- a/doc/examples/kea6/all-options.json +++ b/doc/examples/kea6/all-options.json @@ -1826,7 +1826,7 @@ }, // A single encapsulating space can be used. An option containing any - // option from said space will now be unpacked succesfully by Kea. + // option from said space will now be unpacked successfully by Kea. { "array": false, "code": 12321, diff --git a/doc/examples/kea6/ha-hot-standby.json b/doc/examples/kea6/ha-hot-standby.json index e9aff1f565..a0eb6a1677 100644 --- a/doc/examples/kea6/ha-hot-standby.json +++ b/doc/examples/kea6/ha-hot-standby.json @@ -1,6 +1,6 @@ // This is an example configuration of the Kea DHCPv6 server. It uses High // Availability hooks library and Lease Commands hooks library to enable -// High Availibility function for the DHCP server. Note that almost exactly +// High Availability function for the DHCP server. Note that almost exactly // the same configuration must be used on the second server (partner). // The only difference is that "this-server-name" must be set to "server1" // on this other server. Also, the interface configuration depends on the diff --git a/doc/sphinx/arm/admin.rst b/doc/sphinx/arm/admin.rst index f782f7d1f7..d8a0d10c9d 100644 --- a/doc/sphinx/arm/admin.rst +++ b/doc/sphinx/arm/admin.rst @@ -569,7 +569,7 @@ To create the database: :: - cqslh -k keyspace-name -f path-to-kea/share/kea/scripts/cql/dhcpdb_create.cql + cqlsh -k keyspace-name -f path-to-kea/share/kea/scripts/cql/dhcpdb_create.cql (path-to-kea is the location where Kea is installed.) diff --git a/doc/sphinx/arm/hooks-ha.rst b/doc/sphinx/arm/hooks-ha.rst index 691d51846a..7aaae223b4 100644 --- a/doc/sphinx/arm/hooks-ha.rst +++ b/doc/sphinx/arm/hooks-ha.rst @@ -205,7 +205,7 @@ The following is the list of all possible server states: - ``backup`` - normal operation of the backup server. In this state it receives lease updates from the active servers. -- ``comunication-recovery`` - an active server running in load-balancing +- ``communication-recovery`` - an active server running in load-balancing mode may transition to this state when it experiences communication issues with a partner server over the control channel. This is an intermediate state between the ``load-balancing`` and ``partner-down`` @@ -1917,7 +1917,7 @@ state to a previous state. See the :ref:`ha-maintenance` for the details. The ha-reset Command -------------------- -This command causes the server to reset its High Availibility state machine +This command causes the server to reset its High Availability state machine by transitioning it to the waiting state. A partner in the ``communication-recovery`` state may send this command to cause the server to synchronize its lease database. The database synchronization is required diff --git a/doc/sphinx/uml/packet4.svg b/doc/sphinx/uml/packet4.svg index f6710c945b..d488c704da 100644 --- a/doc/sphinx/uml/packet4.svg +++ b/doc/sphinx/uml/packet4.svg @@ -12,7 +12,7 @@ entity unpack-->Classify queryCallout pkt4_receivehookCheck DROP classAvoid same client race in multi-threade modepostpone processing or dropAvoid same client race in multi-threaded modepostpone processing or dropCallout lease4_committedhookParkCallout pkt4_sendhas requested address (hint)no requested address (hint)no conflicting reservationrevervation owned by another clientreservation owned by another clienthas a reservationrequest reserved addressno reservation addressReserved : has requested address (hint) findClientLease --> hasAddressReservation : no requested address (hint) addressReserved --> check_hint : no conflicting reservation -addressReserved --> no_lease : revervation owned by another client +addressReserved --> no_lease : reservation owned by another client hasAddressReservation -> update_hint : has a reservation update_hint --> check_hint : request reserved address hasAddressReservation --> check_done : no reservation diff --git a/doc/sphinx/uml/requestLease4.svg b/doc/sphinx/uml/requestLease4.svg index ef1a81d684..800e77d6eb 100644 --- a/doc/sphinx/uml/requestLease4.svg +++ b/doc/sphinx/uml/requestLease4.svg @@ -1,4 +1,4 @@ -requestLease4 algorithm (Kea 1.8.0)get lease for the clientreserved addressyesnorequested addressnoyesrequested address = reserved addressreturn no leaseyesrequested address is reserved for another clientnoreturn no leaseyesactive and owned by another clientnoyeslease for requested addressnoreturn no leaseyesactivenoyeslease for requested addressnoreturn no leasenorequested address in allowed poolyesnorequested address == reserved addressyesrequested addressyesnoreturn no leaseyesrequested address is reserved for another clientnoreturn no leaseyesactive and owned by another clientnoyeslease for requested addressnoreturn no leasenorequested address in allowed poolyespick candidate addresslease for candidatenoyescreate and return new leasereclaim expired leaseupdate lease informationcallout lease4_selectcallout returnSKIPCONTINUEreturn no leaseupdate leasereturn reused leaseyesexpirednonocandidate is used by another threadyesnocandidate is reserved for another clientyesiterate over pools and subnectmaximum attemptsreturn no leasenoclient lease and lease address in allowed poolyesupdate lease informationreclaim expired leaseyesold lease expirednocallout lease4_renewcallout returnSKIPCONTINUEreturn old client leaseupdate leasereturn renewed client leaseyeshas reserved address or client lease address in allowed poolnoyesno requested address or requested address == client lease addressnoyesclient leasenoget lease for requested addressrequested leaseyesnoexpirednoyesreturn no leasereclaim expired leaseupdate lease informationcallout lease4_selectcallout returnSKIPCONTINUEreturn no leaseupdate leasereturn reused leasecreate and return new leasematchcompatiblenot compatibletry the relay addreesstry the relay addresshas no relay addresshas no client addrsshas no client addressno suitable addresshas a relay addresshas a client addresshas source addess and use unicasthas source address and use unicastno interfacematchno match set_address : no match relay_network --> relay_class : match relay_class ---> found : compatible relay_class --> set_address : not compatible -set_address --> relay_address : try the relay addreess +set_address --> relay_address : try the relay address relay_address -r-> client_address : has no relay address -client_address -r-> source_address : has no client addrss +client_address -r-> source_address : has no client address source_address --> interface_subnet : no suitable address relay_address --> inRange : has a relay address client_address --> inRange : has a client address -source_address --> inRange : has source addess and use unicast +source_address --> inRange : has source address and use unicast interface_subnet ---> not_found : no interface interface_subnet --> interface_class : match interface_subnet --> interface_network : no match @@ -82,4 +82,4 @@ subnet4_select --> success : CONTINUE and subnet set subnet4_select --> no_subnet : SKIP or subnet not set subnet4_select --> drop : DROP -@endutl +@enduml diff --git a/hammer.py b/hammer.py index c5d0c43047..fc8cabdba6 100755 --- a/hammer.py +++ b/hammer.py @@ -284,7 +284,7 @@ def execute(cmd, timeout=60, cwd=None, env=None, raise_error=True, dry_run=False output = '' t0 = time.time() t1 = time.time() - # repeat until process is running or timeout not occured + # repeat until process is running or timeout not occurred while p.poll() is None and (timeout is None or t1 - t0 < timeout): line = p.stdout.readline() if line: @@ -297,7 +297,7 @@ def execute(cmd, timeout=60, cwd=None, env=None, raise_error=True, dry_run=False log_file.write(line) t1 = time.time() - # If no exitcode yet, ie. process is still running then it means that timeout occured. + # If no exitcode yet, ie. process is still running then it means that timeout occurred. # In such case terminate the process and raise an exception. if p.poll() is None: # kill using sudo to be able to kill other sudo commands diff --git a/src/bin/admin/tests/cql_tests.sh.in b/src/bin/admin/tests/cql_tests.sh.in index ffb6bfe42e..1827180cd5 100644 --- a/src/bin/admin/tests/cql_tests.sh.in +++ b/src/bin/admin/tests/cql_tests.sh.in @@ -401,7 +401,7 @@ cql_unused_subnet_id_test() { } # Verifies that you can upgrade from an earlier version and -# that all hosts and options from old host_reseravation table (version 3.0) are +# that all hosts and options from old host_reservation table (version 3.0) are # converted to new schema (version 4.0) with new key partition key and are # moved to new hosts table cql_upgrade_hosts_test() { diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in index a6444078c0..4ed0c18cb3 100644 --- a/src/bin/admin/tests/mysql_tests.sh.in +++ b/src/bin/admin/tests/mysql_tests.sh.in @@ -46,7 +46,7 @@ run_statement() { qry="$1";shift exp_value="${1-}" # Optional value. If not given, replace with empty string. - # Execute the statment + # Execute the statement run_command \ mysql_execute "${qry}" value="${OUTPUT}" @@ -396,7 +396,7 @@ mysql_upgrade_test() { count="${OUTPUT}" assert_eq 0 "${EXIT_CODE}" "select scope_id from dhcp6_options failed. (expected status code %d, returned %d)" - #table: DHCPv4 fixed field colums (upgrade 4.1 -> 5.0) + #table: DHCPv4 fixed field columns (upgrade 4.1 -> 5.0) # verify that hosts table has columns holding values for DHCPv4 fixed fields qry="select dhcp4_next_server, dhcp4_server_hostname, dhcp4_boot_file_name, auth_key from hosts"; run_command \ diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in index 090a601c9e..b5b3db1b70 100644 --- a/src/bin/admin/tests/pgsql_tests.sh.in +++ b/src/bin/admin/tests/pgsql_tests.sh.in @@ -46,7 +46,7 @@ run_statement() { qry="$1";shift exp_value="${1-}" # Optional value. If not given, replace with empty string. - # Execute the statment + # Execute the statement run_command \ pgsql_execute "${qry}" value="${OUTPUT}" diff --git a/src/bin/agent/ca_response_creator.h b/src/bin/agent/ca_response_creator.h index 189a323b42..e5106e502a 100644 --- a/src/bin/agent/ca_response_creator.h +++ b/src/bin/agent/ca_response_creator.h @@ -59,7 +59,7 @@ private: /// @brief Creates unfinalized stock HTTP response. /// - /// The unfinilized response is the response that can't be sent over the + /// The unfinalized response is the response that can't be sent over the /// wire until @c finalize() is called, which commits the contents of the /// message body. /// diff --git a/src/bin/agent/tests/ca_cfg_mgr_unittests.cc b/src/bin/agent/tests/ca_cfg_mgr_unittests.cc index 65c739825a..b83609fb82 100644 --- a/src/bin/agent/tests/ca_cfg_mgr_unittests.cc +++ b/src/bin/agent/tests/ca_cfg_mgr_unittests.cc @@ -497,7 +497,7 @@ TEST_F(AgentParserTest, configParseAuth) { // Check realm EXPECT_EQ("foobar", basic_auth->getRealm()); - // Check credentails + // Check credentials auto credentials = basic_auth->getCredentialMap(); EXPECT_EQ(2, credentials.size()); std::string user; diff --git a/src/bin/agent/tests/ca_command_mgr_unittests.cc b/src/bin/agent/tests/ca_command_mgr_unittests.cc index f8429fc9c7..4dd620d9ac 100644 --- a/src/bin/agent/tests/ca_command_mgr_unittests.cc +++ b/src/bin/agent/tests/ca_command_mgr_unittests.cc @@ -237,7 +237,7 @@ public: ConstElementPtr command = createCommand("foo", service); ConstElementPtr answer = mgr_.processCommand(command); - // Stop IO service immediatelly and let the thread die. + // Stop IO service immediately and let the thread die. getIOService()->stop(); // Wait for the thread to finish. @@ -402,7 +402,7 @@ TEST_F(CtrlAgentCommandMgrTest, forwardListCommands) { ConstElementPtr answer = mgr_.handleCommand("list-commands", ConstElementPtr(), command); - // Stop IO service immediatelly and let the thread die. + // Stop IO service immediately and let the thread die. getIOService()->stop(); // Wait for the thread to finish. diff --git a/src/bin/agent/tests/parser_unittests.cc b/src/bin/agent/tests/parser_unittests.cc index 96ee8a9f5e..efbd8c5b13 100644 --- a/src/bin/agent/tests/parser_unittests.cc +++ b/src/bin/agent/tests/parser_unittests.cc @@ -596,7 +596,7 @@ TEST(ParserTest, errors) { // unknown keyword testError("{ \"Control-agent\":{\n" - " \"topping\": \"Mozarella\" }}\n", + " \"topping\": \"Mozzarella\" }}\n", ParserContext::PARSER_AGENT, ":2.2-10: got unexpected keyword " "\"topping\" in Control-agent map."); diff --git a/src/bin/d2/d2_queue_mgr.h b/src/bin/d2/d2_queue_mgr.h index ccef976b6f..878044956d 100644 --- a/src/bin/d2/d2_queue_mgr.h +++ b/src/bin/d2/d2_queue_mgr.h @@ -241,7 +241,7 @@ public: /// to the NOT_INITTED state. This is provided to support reconfiguring /// a new listener without losing queued requests. /// - /// @throw D2QueMgrError if called when the manager state is RUNNING. + /// @throw D2QueueMgrError if called when the manager state is RUNNING. void removeListener(); /// @brief Returns the number of entries in the queue. @@ -276,7 +276,7 @@ public: /// /// @return Pointer reference to the queue entry. /// - /// @throw D2QueueMgrQueEmpty if there are no entries in the queue. + /// @throw D2QueueMgrQueueEmpty if there are no entries in the queue. const dhcp_ddns::NameChangeRequestPtr& peek() const; /// @brief Returns the entry at a given position in the queue. @@ -302,7 +302,7 @@ public: /// @brief Removes the entry at the front of the queue. /// - /// @throw D2QueueMgrQueEmpty if there are no entries in the queue. + /// @throw D2QueueMgrQueueEmpty if there are no entries in the queue. void dequeue(); /// @brief Adds a request to the end of the queue. diff --git a/src/bin/d2/tests/d2_command_unittest.cc b/src/bin/d2/tests/d2_command_unittest.cc index 8452032cd4..7fc8b3d626 100644 --- a/src/bin/d2/tests/d2_command_unittest.cc +++ b/src/bin/d2/tests/d2_command_unittest.cc @@ -98,7 +98,7 @@ private: }; -/// @brief Fixture class intended for testin control channel in D2. +/// @brief Fixture class intended for testing control channel in D2. class CtrlChannelD2Test : public ::testing::Test { public: isc::test::Sandbox sandbox; diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc index c2a3c8934f..03f4765385 100644 --- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc +++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc @@ -1061,7 +1061,7 @@ ControlledDhcpv4Srv::ControlledDhcpv4Srv(uint16_t server_port /*= DHCP4_SERVER_P // LeaseMgr uses IO service to run asynchronous timers. LeaseMgr::setIOService(getIOService()); - // HosrMgr uses IO service to run asynchronous timers. + // HostMgr uses IO service to run asynchronous timers. HostMgr::setIOService(getIOService()); // These are the commands always supported by the DHCPv4 server. @@ -1196,7 +1196,7 @@ ControlledDhcpv4Srv::~ControlledDhcpv4Srv() { // LeaseMgr uses IO service to run asynchronous timers. LeaseMgr::setIOService(IOServicePtr()); - // HosrMgr uses IO service to run asynchronous timers. + // HostMgr uses IO service to run asynchronous timers. HostMgr::setIOService(IOServicePtr()); } catch (...) { // Don't want to throw exceptions from the destructor. The server diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.h b/src/bin/dhcp4/ctrl_dhcp4_srv.h index 8e23f9d1c1..993e986afe 100644 --- a/src/bin/dhcp4/ctrl_dhcp4_srv.h +++ b/src/bin/dhcp4/ctrl_dhcp4_srv.h @@ -234,7 +234,7 @@ private: /// @brief A handler for processing 'dhcp-disable' command. /// /// @param command command name (ignored). - /// @param args aguments for the command. It must be a map and + /// @param args arguments for the command. It must be a map and /// it may include optional 'max-period' parameter. /// /// @return result of the command. diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h index 1678f7d49c..a9644d221c 100644 --- a/src/bin/dhcp4/dhcp4_srv.h +++ b/src/bin/dhcp4/dhcp4_srv.h @@ -1041,7 +1041,7 @@ protected: /// @note The only-if-required flag is related because it avoids /// double evaluation (which is not forbidden). /// - /// @param ex The exchange holding needed informations. + /// @param ex The exchange holding needed information. void requiredClassify(Dhcpv4Exchange& ex); /// @brief Perform deferred option unpacking. diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc index 633a86c230..d36025ebd7 100644 --- a/src/bin/dhcp4/json_config_parser.cc +++ b/src/bin/dhcp4/json_config_parser.cc @@ -118,8 +118,8 @@ public: /// @brief Sets global parameters before other parameters are parsed. /// /// This method sets selected global parameters before other parameters - /// are parsed. This is important when the bahavior of the parsers - /// run later depends on these global paramters. + /// are parsed. This is important when the behavior of the parsers + /// run later depends on these global parameters. /// /// Currently this method sets the following global parameters: /// - ip-reservations-unique diff --git a/src/bin/dhcp4/tests/client_handler_unittest.cc b/src/bin/dhcp4/tests/client_handler_unittest.cc index 8a578de358..8b992ff4aa 100644 --- a/src/bin/dhcp4/tests/client_handler_unittest.cc +++ b/src/bin/dhcp4/tests/client_handler_unittest.cc @@ -71,7 +71,7 @@ public: /// @brief Check statistics. /// - /// @param bumped True if pkt4-receive-drop shoud have been bumped by one, + /// @param bumped True if pkt4-receive-drop should have been bumped by one, /// false otherwise. void checkStat(bool bumped) { ObservationPtr obs = StatsMgr::instance().getObservation("pkt4-receive-drop"); diff --git a/src/bin/dhcp4/tests/config_backend_unittest.cc b/src/bin/dhcp4/tests/config_backend_unittest.cc index af0ed0db29..ee19a5f19e 100644 --- a/src/bin/dhcp4/tests/config_backend_unittest.cc +++ b/src/bin/dhcp4/tests/config_backend_unittest.cc @@ -74,7 +74,7 @@ protected: } } - // Apparently we're looking for one that does not prexist. + // Apparently we're looking for a new one. return (TestConfigBackendDHCPv4Ptr(new TestConfigBackendDHCPv4(params))); }); } diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc index 88f14a0757..c697a35803 100644 --- a/src/bin/dhcp4/tests/config_parser_unittest.cc +++ b/src/bin/dhcp4/tests/config_parser_unittest.cc @@ -7229,7 +7229,7 @@ TEST_F(Dhcp4ParserTest, dhcpQueueControlInvalid) { } } -// Checks inheritence of calculate-tee-times, t1-perecent, t2-percent +// Checks inheritence of calculate-tee-times, t1-percent, t2-percent TEST_F(Dhcp4ParserTest, calculateTeeTimesInheritence) { // Configure the server. This should succeed. string config = diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc index bd8cccd2a4..176dff5ed9 100644 --- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc +++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc @@ -583,7 +583,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, controlChannelNegative) { response); } -// Tests that the server properly responds to shtudown command sent +// Tests that the server properly responds to shutdown command sent // via ControlChannel TEST_F(CtrlChannelDhcpv4SrvTest, controlChannelShutdown) { createUnixChannelServer(); @@ -1290,7 +1290,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, controlLeasesReclaimRemove) { ASSERT_FALSE(lease1); } -// Tests that the server properly responds to shtudown command sent +// Tests that the server properly responds to shutdown command sent // via ControlChannel TEST_F(CtrlChannelDhcpv4SrvTest, listCommands) { createUnixChannelServer(); diff --git a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc index e8cb29565b..ad3bf498dd 100644 --- a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc +++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc @@ -294,7 +294,7 @@ TEST_F(Dhcpv4SrvTest, adjustIfaceDataUseRouting) { IfaceMgr::instance().openSockets4(); // Create configuration for interfaces. It includes the outbound-interface - // setting which indicates that the responses aren't neccessarily sent + // setting which indicates that the responses aren't necessarily sent // over the same interface via which a request has been received, but routing // information is used to determine this interface. CfgMgr::instance().clear(); @@ -1412,7 +1412,7 @@ TEST_F(Dhcpv4SrvTest, DiscoverTimers) { for (auto test = tests.begin(); test != tests.end(); ++test) { { SCOPED_TRACE((*test).description_); - // Configure sunbet's timer values + // Configure subnet's timer values subnet_->setT1((*test).cfg_t1_); subnet_->setT2((*test).cfg_t2_); @@ -1465,9 +1465,9 @@ TEST_F(Dhcpv4SrvTest, calculateTeeTimers) { Triplet cfg_t1_; // configured value for subnet's T1 Triplet cfg_t2_; - // configured value for sunbet's t1_percent. + // configured value for subnet's t1_percent. double t1_percent_; - // configured value for sunbet's t2_percent. + // configured value for subnet's t2_percent. double t2_percent_; // expected value for T1 in server response. // A value of 0 means server should not have sent T1. @@ -1529,7 +1529,7 @@ TEST_F(Dhcpv4SrvTest, calculateTeeTimers) { for (auto test = tests.begin(); test != tests.end(); ++test) { { SCOPED_TRACE((*test).description_); - // Configure sunbet's timer values + // Configure subnet's timer values subnet_->setT1((*test).cfg_t1_); subnet_->setT2((*test).cfg_t2_); @@ -3558,7 +3558,7 @@ TEST_F(Dhcpv4SrvTest, clientPoolClassifyUnknown) { OptionPtr clientid = generateClientId(); dis->addOption(clientid); - // Set harware address / identifier + // Set hardware address / identifier const HWAddr& hw = HWAddr::fromText("00:00:00:11:22:33"); HWAddrPtr hw_addr(new HWAddr(hw)); dis->setHWAddr(hw_addr); diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.cc b/src/bin/dhcp4/tests/dhcp4_test_utils.cc index 10d8a3bcd7..228876dfd5 100644 --- a/src/bin/dhcp4/tests/dhcp4_test_utils.cc +++ b/src/bin/dhcp4/tests/dhcp4_test_utils.cc @@ -685,7 +685,7 @@ Dhcpv4SrvTest::configureWithStatus(const std::string& config, NakedDhcpv4Srv& sr try { json = parseJSON(config); } catch (const std::exception& ex){ - // Fatal falure on parsing error + // Fatal failure on parsing error std::stringstream tmp; tmp << "parsing failure:" @@ -704,7 +704,7 @@ Dhcpv4SrvTest::configureWithStatus(const std::string& config, NakedDhcpv4Srv& sr EXPECT_NO_THROW(status = configureDhcp4Server(srv, json)); EXPECT_TRUE(status); if (!status) { - return (make_pair(-1, "configureDhcp4Server didn't return anythin")); + return (make_pair(-1, "configureDhcp4Server didn't return anything")); } int rcode; diff --git a/src/bin/dhcp4/tests/kea_controller_unittest.cc b/src/bin/dhcp4/tests/kea_controller_unittest.cc index ea3fcd479b..d7c7153e6e 100644 --- a/src/bin/dhcp4/tests/kea_controller_unittest.cc +++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc @@ -114,7 +114,7 @@ public: } if (enable_throw_) { - isc_throw(Unexpected, "testing if exceptions are corectly handled"); + isc_throw(Unexpected, "testing if exceptions are correctly handled"); } } @@ -321,7 +321,7 @@ public: if (throw_during_fetch) { expected = "{ \"result\": 1, \"text\": "; expected += "\"On demand configuration update failed: "; - expected += "testing if exceptions are corectly handled\" }"; + expected += "testing if exceptions are correctly handled\" }"; } else { expected = "{ \"result\": 0, \"text\": "; expected += "\"On demand configuration update successful.\" }"; diff --git a/src/bin/dhcp4/tests/shared_network_unittest.cc b/src/bin/dhcp4/tests/shared_network_unittest.cc index 1a791407df..90b2a67ff3 100644 --- a/src/bin/dhcp4/tests/shared_network_unittest.cc +++ b/src/bin/dhcp4/tests/shared_network_unittest.cc @@ -1034,7 +1034,7 @@ public: typedef enum AuthoritativeFlag { AUTH_DEFAULT, // explicit value not specified (use default) AUTH_YES, // defined explicitly as yes - AUTH_NO // defined explciitly as no + AUTH_NO // defined explicitly as no } AuthoritativeFlag; /// @brief Returns subnet having specified address in range. @@ -1272,9 +1272,9 @@ public: /// - first subnet: authoritative (subnet1 flag here) /// - second subnet: authoritative (subnet2 flag here) /// - /// @param global coverns presence/value of global authoritative flag - /// @param subnet1 coverns presence/value of authoritative flag in subnet1 - /// @param subnet2 coverns presence/value of authoritative flag in subnet2 + /// @param global governs presence/value of global authoritative flag + /// @param subnet1 governs presence/value of authoritative flag in subnet1 + /// @param subnet2 governs presence/value of authoritative flag in subnet2 string generateAuthConfig(AuthoritativeFlag global, AuthoritativeFlag subnet1, AuthoritativeFlag subnet2) { string cfg = "{" @@ -2010,7 +2010,7 @@ TEST_F(Dhcpv4SharedNetworkTest, matchClientId) { ASSERT_TRUE(resp2); ASSERT_EQ(DHCPACK, resp2->getType()); - // The lease should get rewnewed. + // The lease should get renewed. EXPECT_EQ(resp2->getYiaddr().toText(), resp1->getYiaddr().toText()); } diff --git a/src/bin/dhcp4/tests/vendor_opts_unittest.cc b/src/bin/dhcp4/tests/vendor_opts_unittest.cc index 10c09e8882..c57f97d9a2 100644 --- a/src/bin/dhcp4/tests/vendor_opts_unittest.cc +++ b/src/bin/dhcp4/tests/vendor_opts_unittest.cc @@ -13,7 +13,7 @@ // Unfortunately, its definition is blurry, so there are many // similar, but not exact implementations that do things in // different ways. -// vivco (124) - vendor indepdent vendor class option. +// vivco (124) - vendor independent vendor class option. // class identifier (60) - not exactly vendor specific. It's a string, but the // content of that string identifies what kind of vendor device // this is. diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc index 715f5aa70a..7fed6c5c57 100644 --- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc +++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc @@ -1080,7 +1080,7 @@ ControlledDhcpv6Srv::ControlledDhcpv6Srv(uint16_t server_port, // LeaseMgr uses IO service to run asynchronous timers. LeaseMgr::setIOService(getIOService()); - // HosrMgr uses IO service to run asynchronous timers. + // HostMgr uses IO service to run asynchronous timers. HostMgr::setIOService(getIOService()); // These are the commands always supported by the DHCPv6 server. @@ -1215,7 +1215,7 @@ ControlledDhcpv6Srv::~ControlledDhcpv6Srv() { // LeaseMgr uses IO service to run asynchronous timers. LeaseMgr::setIOService(IOServicePtr()); - // HosrMgr uses IO service to run asynchronous timers. + // HostMgr uses IO service to run asynchronous timers. HostMgr::setIOService(IOServicePtr()); } catch (...) { // Don't want to throw exceptions from the destructor. The server diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.h b/src/bin/dhcp6/ctrl_dhcp6_srv.h index 85ab579263..d8ab7bd349 100644 --- a/src/bin/dhcp6/ctrl_dhcp6_srv.h +++ b/src/bin/dhcp6/ctrl_dhcp6_srv.h @@ -234,7 +234,7 @@ private: /// @brief A handler for processing 'dhcp-disable' command. /// /// @param command command name (ignored). - /// @param args aguments for the command. It must be a map and + /// @param args arguments for the command. It must be a map and /// it may include optional 'max-period' parameter. /// /// @return result of the command. diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h index d72ef8b948..a89d0504e0 100644 --- a/src/bin/dhcp6/dhcp6_srv.h +++ b/src/bin/dhcp6/dhcp6_srv.h @@ -859,7 +859,7 @@ protected: /// double evaluation (which is not forbidden). /// /// @param pkt packet to be classified - /// @param ctx allocation context where to get informations + /// @param ctx allocation context where to get information void requiredClassify(const Pkt6Ptr& pkt, AllocEngine::ClientContext6& ctx); /// @brief Attempts to get a MAC/hardware address using configured sources diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc index 943042ca37..8faa100a24 100644 --- a/src/bin/dhcp6/json_config_parser.cc +++ b/src/bin/dhcp6/json_config_parser.cc @@ -206,8 +206,8 @@ public: /// @brief Sets global parameters before other parameters are parsed. /// /// This method sets selected global parameters before other parameters - /// are parsed. This is important when the bahavior of the parsers - /// run later depends on these global paramters. + /// are parsed. This is important when the behavior of the parsers + /// run later depends on these global parameters. /// /// Currently this method sets the following global parameters: /// - ip-reservations-unique diff --git a/src/bin/dhcp6/tests/client_handler_unittest.cc b/src/bin/dhcp6/tests/client_handler_unittest.cc index aeae1a632d..7d92055c91 100644 --- a/src/bin/dhcp6/tests/client_handler_unittest.cc +++ b/src/bin/dhcp6/tests/client_handler_unittest.cc @@ -56,7 +56,7 @@ public: /// @brief Check statistics. /// - /// @param bumped True if pkt6-receive-drop shoud have been bumped by one, + /// @param bumped True if pkt6-receive-drop should have been bumped by one, /// false otherwise. void checkStat(bool bumped) { ObservationPtr obs = StatsMgr::instance().getObservation("pkt6-receive-drop"); diff --git a/src/bin/dhcp6/tests/config_backend_unittest.cc b/src/bin/dhcp6/tests/config_backend_unittest.cc index 687a9f4e74..c46521bbf4 100644 --- a/src/bin/dhcp6/tests/config_backend_unittest.cc +++ b/src/bin/dhcp6/tests/config_backend_unittest.cc @@ -76,7 +76,7 @@ protected: } } - // Apparently we're looking for one that does not prexist. + // Apparently we're looking for a new one. return (TestConfigBackendDHCPv6Ptr(new TestConfigBackendDHCPv6(params))); }); } diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc index 208b6687e5..e5ceccb78c 100644 --- a/src/bin/dhcp6/tests/config_parser_unittest.cc +++ b/src/bin/dhcp6/tests/config_parser_unittest.cc @@ -1509,7 +1509,7 @@ TEST_F(Dhcp6ParserTest, multipleSubnetsExplicitIDs) { } while (++cnt < 3); } -// CHeck that the configuration with two subnets having the same id is rejected. +// Check that the configuration with two subnets having the same ID is rejected. TEST_F(Dhcp6ParserTest, multipleSubnetsOverlappingIDs) { ConstElementPtr x; // Four subnets, two of them have the same id. @@ -6949,7 +6949,7 @@ TEST_F(Dhcp6ParserTest, sharedNetworksDerive) { CfgSharedNetworks6Ptr cfg_net = CfgMgr::instance().getStagingCfg() ->getCfgSharedNetworks6(); - // Two shared networks are expeced. + // Two shared networks are expected. ASSERT_TRUE(cfg_net); const SharedNetwork6Collection* nets = cfg_net->getAll(); ASSERT_TRUE(nets); @@ -7059,7 +7059,7 @@ TEST_F(Dhcp6ParserTest, sharedNetworksDeriveInterfaces) { CfgSharedNetworks6Ptr cfg_net = CfgMgr::instance().getStagingCfg() ->getCfgSharedNetworks6(); - // Two shared networks are expeced. + // Two shared networks are expected. ASSERT_TRUE(cfg_net); const SharedNetwork6Collection* nets = cfg_net->getAll(); ASSERT_TRUE(nets); @@ -7247,7 +7247,7 @@ TEST_F(Dhcp6ParserTest, sharedNetworksRapidCommit) { CfgSharedNetworks6Ptr cfg_net = CfgMgr::instance().getStagingCfg() ->getCfgSharedNetworks6(); - // Two shared networks are expeced. + // Two shared networks are expected. ASSERT_TRUE(cfg_net); const SharedNetwork6Collection* nets = cfg_net->getAll(); ASSERT_TRUE(nets); diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc index 2efa23bdb4..ca9f4c981a 100644 --- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc +++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc @@ -600,7 +600,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, controlChannelNegative) { response); } -// Tests that the server properly responds to shtudown command sent +// Tests that the server properly responds to shutdown command sent // via ControlChannel TEST_F(CtrlChannelDhcpv6SrvTest, controlChannelShutdown) { createUnixChannelServer(); @@ -1319,7 +1319,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, controlChannelStats) { response); } -// Tests that the server properly responds to shtudown command sent +// Tests that the server properly responds to shutdown command sent // via ControlChannel TEST_F(CtrlChannelDhcpv6SrvTest, listCommands) { createUnixChannelServer(); diff --git a/src/bin/dhcp6/tests/dhcp6_message_test.h b/src/bin/dhcp6/tests/dhcp6_message_test.h index 9053d70121..01757f6de7 100644 --- a/src/bin/dhcp6/tests/dhcp6_message_test.h +++ b/src/bin/dhcp6/tests/dhcp6_message_test.h @@ -16,7 +16,7 @@ namespace isc { namespace dhcp { namespace test { -/// @brief Base class for test fixure classes used to validate the DHCPv6 +/// @brief Base class for test fixture classes used to validate the DHCPv6 /// message processing by the server. class Dhcpv6MessageTest : public Dhcpv6SrvTest { public: diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc index 5284cfcf93..f9881a34d4 100644 --- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc +++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc @@ -3304,9 +3304,9 @@ TEST_F(Dhcpv6SrvTest, calculateTeeTimers) { Triplet cfg_t2_; // whether or not calculation is enabled bool calculate_tee_times; - // configured value for sunbet's t1_percent. + // configured value for subnet's t1_percent. double t1_percent_; - // configured value for sunbet's t2_percent. + // configured value for subnet's t2_percent. double t2_percent_; // expected value for T1 in server response. // A value of 0 means server should not have sent T1. @@ -3423,7 +3423,7 @@ TEST_F(Dhcpv6SrvTest, calculateTeeTimers) { for (auto test = tests.begin(); test != tests.end(); ++test) { { SCOPED_TRACE((*test).description_); - // Configure sunbet for the scenario + // Configure subnet for the scenario subnet_->setT1((*test).cfg_t1_); subnet_->setT2((*test).cfg_t2_); subnet_->setCalculateTeeTimes((*test).calculate_tee_times); diff --git a/src/bin/dhcp6/tests/hooks_unittest.cc b/src/bin/dhcp6/tests/hooks_unittest.cc index a3e0a291fc..dc353ba8bd 100644 --- a/src/bin/dhcp6/tests/hooks_unittest.cc +++ b/src/bin/dhcp6/tests/hooks_unittest.cc @@ -1713,7 +1713,7 @@ TEST_F(HooksDhcpv6SrvTest, subnet6Select) { // This test checks if callout installed on subnet6_select hook point can pick // a different subnet. -TEST_F(HooksDhcpv6SrvTest, subnet6SselectChange) { +TEST_F(HooksDhcpv6SrvTest, subnet6SelectChange) { // Configure 2 subnets, both directly reachable over local interface // (let's not complicate the matter with relays) diff --git a/src/bin/dhcp6/tests/kea_controller_unittest.cc b/src/bin/dhcp6/tests/kea_controller_unittest.cc index 696635b9f2..5a24578991 100644 --- a/src/bin/dhcp6/tests/kea_controller_unittest.cc +++ b/src/bin/dhcp6/tests/kea_controller_unittest.cc @@ -111,7 +111,7 @@ public: } if (enable_throw_) { - isc_throw(Unexpected, "testing if exceptions are corectly handled"); + isc_throw(Unexpected, "testing if exceptions are correctly handled"); } } @@ -308,7 +308,7 @@ public: if (throw_during_fetch) { expected = "{ \"result\": 1, \"text\": "; expected += "\"On demand configuration update failed: "; - expected += "testing if exceptions are corectly handled\" }"; + expected += "testing if exceptions are correctly handled\" }"; } else { expected = "{ \"result\": 0, \"text\": "; expected += "\"On demand configuration update successful.\" }"; diff --git a/src/bin/dhcp6/tests/shared_network_unittest.cc b/src/bin/dhcp6/tests/shared_network_unittest.cc index 8bd0d26f64..a23aab36cf 100644 --- a/src/bin/dhcp6/tests/shared_network_unittest.cc +++ b/src/bin/dhcp6/tests/shared_network_unittest.cc @@ -1366,9 +1366,9 @@ public: /// /// @param config - text version of the configuration to be tested /// @param enabled - true = rapid-commit is expected to work - /// @param exp_addr1 - an eddress the first client is expected to get (if + /// @param exp_addr1 - an address the first client is expected to get (if /// rapid-commit is enabled). - /// @param exp_addr2 - an eddress the second client is expected to get (if + /// @param exp_addr2 - an address the second client is expected to get (if /// rapid-commit is enabled). void testRapidCommit(const std::string& config, bool enabled, const std::string& exp_addr1, @@ -1552,7 +1552,7 @@ TEST_F(Dhcpv6SharedNetworkTest, addressPoolInSharedNetworkShortage) { }); ASSERT_TRUE(hasLeaseForAddress(client2, IOAddress("2001:db8:2::20"))); - // Cient #3. It sends Solicit which should result in NoAddrsAvail status + // Client #3. It sends Solicit which should result in NoAddrsAvail status // code because all addresses available for this link have been assigned. Dhcp6Client client3(client1.getServer()); client3.setInterface("eth1"); @@ -2290,7 +2290,7 @@ TEST_F(Dhcpv6SharedNetworkTest, relaySpecifiedForEachSubnet) { // Shared network is selected based on interface id. TEST_F(Dhcpv6SharedNetworkTest, sharedNetworkSelectedByInterfaceId) { // Create client #1. This is a relayed client for which interface id - // has been spefified and this interface id is matching the one specified + // has been specified and this interface id is matching the one specified // for the shared network. Dhcp6Client client1; client1.useRelay(true, IOAddress("3001::1")); @@ -2323,7 +2323,7 @@ TEST_F(Dhcpv6SharedNetworkTest, sharedNetworkSelectedByInterfaceId) { // belonging to a shared network. TEST_F(Dhcpv6SharedNetworkTest, sharedNetworkSelectedByInterfaceIdInSubnet) { // Create client #1. This is a relayed client for which interface id - // has been spefified and this interface id is matching the one specified + // has been specified and this interface id is matching the one specified // for the shared network. Dhcp6Client client1; client1.useRelay(true, IOAddress("3001::1")); diff --git a/src/bin/dhcp6/tests/tee_times_unittest.cc b/src/bin/dhcp6/tests/tee_times_unittest.cc index 367433d2d6..c3cb969296 100644 --- a/src/bin/dhcp6/tests/tee_times_unittest.cc +++ b/src/bin/dhcp6/tests/tee_times_unittest.cc @@ -102,7 +102,7 @@ public: // Do the actual 4-way exchange. ASSERT_NO_THROW(client.doSARR()); - // Make sure that we go the expectec number of leases. + // Make sure that we go the expected number of leases. ASSERT_EQ(exp_leases, client.getLeaseNum()); // Simulate aging of leases, by moving their cltt_ back by 1000s. @@ -195,7 +195,7 @@ TEST_F(TeeTest, defaultTimers) { EXPECT_EQ(2400, actual_t2); } -// This test verifies that custom percentags for T1 and T2 +// This test verifies that custom percentages for T1 and T2 // can be used for calculation. TEST_F(TeeTest, calculateTimers) { Dhcp6Client client; diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in index 3c3b93fa8f..ea1fecfcba 100644 --- a/src/bin/keactrl/keactrl.in +++ b/src/bin/keactrl/keactrl.in @@ -238,7 +238,7 @@ to process ${proc_name}, PID ${_pid}." fi } -# Print Kea daemon verison +# Print Kea daemon version print_version() { name=${1} binary_path=${2} diff --git a/src/bin/keactrl/tests/keactrl_tests.sh.in b/src/bin/keactrl/tests/keactrl_tests.sh.in index aa0fac8ad5..33ff119ad7 100644 --- a/src/bin/keactrl/tests/keactrl_tests.sh.in +++ b/src/bin/keactrl/tests/keactrl_tests.sh.in @@ -50,7 +50,7 @@ CA_CFG_FILE="@abs_top_builddir@/src/bin/keactrl/tests/${CA_CFG_FILE_NAME}.json" # Names for Netconf NC_CFG_FILE_NAME="nc_test_config.conf" NC_CFG_FILE="@abs_top_builddir@/src/bin/keactrl/tests/${NC_CFG_FILE_NAME}.json" -# Configuration files for all deamons. +# Configuration files for all daemons. CFG_FILES="kea_dhcp4_config_file=${DHCP4_CFG_FILE}\n\ kea_dhcp6_config_file=${DHCP6_CFG_FILE}\n\ kea_dhcp_ddns_config_file=${D2_CFG_FILE}\n\ diff --git a/src/bin/netconf/netconf_config.h b/src/bin/netconf/netconf_config.h index 34620c6368..6f8ab0f31a 100644 --- a/src/bin/netconf/netconf_config.h +++ b/src/bin/netconf/netconf_config.h @@ -228,19 +228,19 @@ private: /// @brief The boot-update flag. /// - /// If true (the defaul) Kea server configuration is updated at (netconf + /// If true (the default) Kea server configuration is updated at (netconf /// agent) boot time. bool boot_update_; /// @brief The subscribe-changes flag. /// - /// If true (the deault) the netconf agent subscribes module changes + /// If true (the default) the netconf agent subscribes module changes /// so will be notified when the YANG running configuration is changed. bool subscribe_changes_; /// @brief The validate-changes flag. /// - /// If true (the deault) the netconf agent validates module changes + /// If true (the default) the netconf agent validates module changes /// and can reject bad configurations. bool validate_changes_; diff --git a/src/bin/netconf/tests/parser_unittests.cc b/src/bin/netconf/tests/parser_unittests.cc index 7e387f07d6..b6b81f6faf 100644 --- a/src/bin/netconf/tests/parser_unittests.cc +++ b/src/bin/netconf/tests/parser_unittests.cc @@ -655,7 +655,7 @@ TEST(ParserTest, errors) { // unknown keyword testError("{ \"Netconf\":{\n" - " \"topping\": \"Mozarella\" }}\n", + " \"topping\": \"Mozzarella\" }}\n", ParserContext::PARSER_NETCONF, ":2.2-10: got unexpected keyword " "\"topping\" in Netconf map."); diff --git a/src/bin/perfdhcp/abstract_scen.h b/src/bin/perfdhcp/abstract_scen.h index 1088976831..a8ace144b3 100644 --- a/src/bin/perfdhcp/abstract_scen.h +++ b/src/bin/perfdhcp/abstract_scen.h @@ -49,7 +49,7 @@ public: protected: CommandOptions& options_; ///< Reference to commandline options. - TestControl tc_; ///< Object for controling sending and receiving packets. + TestControl tc_; ///< Object for controlling sending and receiving packets. // Helper fields to avoid checking IP version each time an exchange type // is needed. diff --git a/src/bin/perfdhcp/avalanche_scen.cc b/src/bin/perfdhcp/avalanche_scen.cc index df394c50f2..3e80b01e4e 100644 --- a/src/bin/perfdhcp/avalanche_scen.cc +++ b/src/bin/perfdhcp/avalanche_scen.cc @@ -97,13 +97,13 @@ AvalancheScen::run() { // First indicated number of DISCOVER packets eg. 4000 are sent. // Then in a loop responses to received packets (this is // consumeReceivedPackets()) are sent and then for every 200ms it is checked - // if reponses to sent packets were received. If not packets are resent. + // if responses to sent packets were received. If not packets are resent. // This happens in resendPackets() method. For each packet it is checked // how many times it was already resent and then back off time is calculated: // 1, 2, 4, 8, 16, 64 (max) seconds. If estimated time has elapsed // from previous sending then the packet is resent. Some stats are collected - // and printed during runtime. The whole procedure is stopeed when - // all packets got reponses. + // and printed during runtime. The whole procedure is stoped when + // all packets got responses. uint32_t clients_num = options_.getClientsNum() == 0 ? 1 : options_.getClientsNum(); diff --git a/src/bin/perfdhcp/avalanche_scen.h b/src/bin/perfdhcp/avalanche_scen.h index 932b26d7b6..766453d2e0 100644 --- a/src/bin/perfdhcp/avalanche_scen.h +++ b/src/bin/perfdhcp/avalanche_scen.h @@ -30,7 +30,7 @@ struct EnumClassHash /// \brief Avalanche Scenario class. /// /// This class is used to run the performance test where DHCP server -/// is first loaded with indicated bumer of Discover or Solicit messages +/// is first loaded with indicated buffer of Discover or Solicit messages /// and then the class is waiting till receiving all required responses. /// Full DORA and SARR message sequences are expected. class AvalancheScen : public AbstractScen { diff --git a/src/bin/perfdhcp/command_options.h b/src/bin/perfdhcp/command_options.h index 1523426270..5bb9767af4 100644 --- a/src/bin/perfdhcp/command_options.h +++ b/src/bin/perfdhcp/command_options.h @@ -220,7 +220,7 @@ public: /// \brief Returns time to wait for elapsed time increase. /// - /// \return how long perfdhp will wait before start sending + /// \return how long perfdhcp will wait before start sending /// messages with increased elapsed time. int getWaitForElapsedTime() const { return wait_for_elapsed_time_; } @@ -629,7 +629,7 @@ private: /// Test period in seconds. int period_; - // for how long perfdhcp will wait before start senging + // for how long perfdhcp will wait before start sending // messages with increased elapsed time. int wait_for_elapsed_time_; diff --git a/src/bin/perfdhcp/receiver.cc b/src/bin/perfdhcp/receiver.cc index 59549ef2db..b6a42a3f1d 100644 --- a/src/bin/perfdhcp/receiver.cc +++ b/src/bin/perfdhcp/receiver.cc @@ -102,12 +102,12 @@ Receiver::readPktFromSocket() { PktPtr pkt; uint32_t timeout; if (single_threaded_) { - // In case of single thread just check socket and if empty exit immediatelly + // In case of single thread just check socket and if empty exit immediately // to not slow down sending part. timeout = 0; } else { // In case of multi thread wait for packets a little bit (1ms) as it is run - // in separate thread and do not interefere with sending thread. + // in separate thread and do not interfere with sending thread. timeout = 1000; } try { diff --git a/src/bin/perfdhcp/receiver.h b/src/bin/perfdhcp/receiver.h index 82bc759d16..bfb6e0d070 100644 --- a/src/bin/perfdhcp/receiver.h +++ b/src/bin/perfdhcp/receiver.h @@ -20,14 +20,14 @@ namespace isc { namespace perfdhcp { -/// \brief A receviving DHCP packets class. +/// \brief A receiving DHCP packets class. /// /// Receiver can be used in two modes: single-thread and multi-thread. /// /// In single-thread mode the class directly reads packets from socket /// and returns them to consumer using getPkt method. /// -/// In case of multi-thread mode the class starts a thread in backgroud. +/// In case of multi-thread mode the class starts a thread in the background. /// The thread reads the packets and pushes them to pkt_queue_. Then /// in main thread packets can be consumed from the queue using getPkt /// method. diff --git a/src/bin/perfdhcp/tests/avalanche_scen_unittest.cc b/src/bin/perfdhcp/tests/avalanche_scen_unittest.cc index 7fcd4e67c6..08e8b0ea7b 100644 --- a/src/bin/perfdhcp/tests/avalanche_scen_unittest.cc +++ b/src/bin/perfdhcp/tests/avalanche_scen_unittest.cc @@ -228,7 +228,7 @@ TEST_F(AvalancheScenTest, Packet4Exchange) { as.run(); - // Check if basic exchange of packets happend. No retransmissions expected. + // Check if basic exchange of packets happened. No retransmissions expected. EXPECT_EQ(as.total_resent_, 0); EXPECT_EQ(as.fake_sock_.sent_cnt_, 20); // Discovery + Request EXPECT_EQ(as.tc_.getStatsMgr().getSentPacketsNum(ExchangeType::DO), 10); @@ -245,7 +245,7 @@ TEST_F(AvalancheScenTest, Packet4ExchangeOnlyDO) { as.run(); - // Check if DO exchange of packets happend only. No retransmissions expected. + // Check if DO exchange of packets happened only. No retransmissions expected. EXPECT_EQ(as.total_resent_, 0); EXPECT_EQ(as.fake_sock_.sent_cnt_, 10); // Discovery + Request EXPECT_EQ(as.tc_.getStatsMgr().getSentPacketsNum(ExchangeType::DO), 10); @@ -262,7 +262,7 @@ TEST_F(AvalancheScenTest, Packet4ExchangeWithRetransmissions) { as.fake_sock_.initial_drops_cnt_ = 2; as.run(); - // Check if basic exchange of packets happend. No retransmissions expected. + // Check if basic exchange of packets happened. No retransmissions expected. EXPECT_EQ(as.total_resent_, 2); EXPECT_EQ(as.fake_sock_.sent_cnt_, 22); // Discovery + Request EXPECT_EQ(as.tc_.getStatsMgr().getSentPacketsNum(ExchangeType::DO), 10); @@ -279,7 +279,7 @@ TEST_F(AvalancheScenTest, Packet6Exchange) { as.run(); - // Check if basic exchange of packets happend. No retransmissions expected. + // Check if basic exchange of packets happened. No retransmissions expected. EXPECT_EQ(as.total_resent_, 0); EXPECT_GE(as.fake_sock_.sent_cnt_, 20); // Solicit + Request EXPECT_GE(as.tc_.getStatsMgr().getSentPacketsNum(ExchangeType::SA), 10); @@ -296,7 +296,7 @@ TEST_F(AvalancheScenTest, Packet6ExchangeOnlySA) { as.run(); - // Check if SA exchange of packets happend only. No retransmissions expected. + // Check if SA exchange of packets happened only. No retransmissions expected. EXPECT_EQ(as.total_resent_, 0); EXPECT_GE(as.fake_sock_.sent_cnt_, 10); // Solicit + Request EXPECT_GE(as.tc_.getStatsMgr().getSentPacketsNum(ExchangeType::SA), 10); @@ -313,7 +313,7 @@ TEST_F(AvalancheScenTest, Packet6ExchangeWithRetransmissions) { as.fake_sock_.initial_drops_cnt_ = 2; as.run(); - // Check if basic exchange of packets happend. No retransmissions expected. + // Check if basic exchange of packets happened. No retransmissions expected. EXPECT_EQ(as.total_resent_, 2); EXPECT_EQ(as.fake_sock_.sent_cnt_, 22); // Discovery + Request EXPECT_EQ(as.tc_.getStatsMgr().getSentPacketsNum(ExchangeType::SA), 10); diff --git a/src/bin/perfdhcp/tests/test_control_unittest.cc b/src/bin/perfdhcp/tests/test_control_unittest.cc index 7805b9c441..695ff7d78e 100644 --- a/src/bin/perfdhcp/tests/test_control_unittest.cc +++ b/src/bin/perfdhcp/tests/test_control_unittest.cc @@ -509,7 +509,7 @@ public: tc.setTransidGenerator(generator); for (int i = 0; i < iterations_num; ++i) { // Get next transaction id, without actually using it. The same - // id wll be used by the TestControl class for DHCPDISCOVER. + // id will be used by the TestControl class for DHCPDISCOVER. uint32_t transid = generator->getNext(); if (use_templates) { tc.sendDiscover4(tc.getTemplateBuffer(0)); @@ -1736,7 +1736,7 @@ TEST_F(TestControlTest, createRelease) { // Test checks if sendDiscover really includes custom options TEST_F(TestControlTest, sendDiscoverExtraOpts) { - // Important paramters here: + // Important parameters here: // -xT - save first packet of each type for templates (useful for packet inspection) // -o 200,abcdef1234 - send option 200 with hex content: ab:cd:ef:12:34 // -o 201,00 - send option 201 with hex content: 00 @@ -1763,7 +1763,7 @@ TEST_F(TestControlTest, sendDiscoverExtraOpts) { // Test checks if regular packet exchange inserts the extra v4 options // specified on command line. TEST_F(TestControlTest, Packet4ExchangeExtraOpts) { - // Important paramters here: + // Important parameters here: // -xT - save first packet of each type for templates (useful for packet inspection) // -o 200,abcdef1234 - send option 200 with hex content: ab:cd:ef:12:34 // -o 201,00 - send option 201 with hex content: 00 @@ -1798,7 +1798,7 @@ TEST_F(TestControlTest, Packet4ExchangeExtraOpts) { // Test checks if regular packet exchange inserts the extra v6 options // specified on command line. TEST_F(TestControlTest, Packet6ExchangeExtraOpts) { - // Important paramters here: + // Important parameters here: // -xT - save first packet of each type for templates (useful for packet inspection) // -o 200,abcdef1234 - send option 200 with hex content: ab:cd:ef:12:34 // -o 201,00 - send option 201 with hex content: 00 @@ -1837,7 +1837,7 @@ TEST_F(TestControlTest, Packet6ExchangeExtraOpts) { // Test checks if multiple v4 PRL options can be sent. They should be merged // into a single PRL option by perfdhcp. TEST_F(TestControlTest, sendDiscoverMultiplePRLs) { - // Important paramters here: + // Important parameters here: // -o 55,1234 - send option 55 with hex content '1234' // -o 55,abcd - send option 55 with hex content 'abcd' CommandOptions opt; diff --git a/src/bin/shell/kea-shell.in b/src/bin/shell/kea-shell.in index f229040857..d55fc6181d 100644 --- a/src/bin/shell/kea-shell.in +++ b/src/bin/shell/kea-shell.in @@ -71,7 +71,7 @@ def shell_body(): help='Timeout (in seconds) when attempting to ' 'connect to CA (default: 10)') parser.add_argument('--service', nargs="?", action="append", - help='target spcified service. If not specified,' + help='target specified service. If not specified,' 'control agent will receive command.') parser.add_argument('--auth-user', type=auth8, default='', help='Basic HTTP authentication user') diff --git a/src/hooks/dhcp/flex_option/flex_option.h b/src/hooks/dhcp/flex_option/flex_option.h index f92e7ae7eb..a7a68689b9 100644 --- a/src/hooks/dhcp/flex_option/flex_option.h +++ b/src/hooks/dhcp/flex_option/flex_option.h @@ -273,7 +273,7 @@ private: /// @brief Parse an option config. /// /// @param option The element with option config. - /// @throw BadValue and similar exceptionson error. + /// @throw BadValue and similar exceptions on error. void parseOptionConfig(isc::data::ConstElementPtr option); }; diff --git a/src/hooks/dhcp/high_availability/communication_state.h b/src/hooks/dhcp/high_availability/communication_state.h index 7f686f4274..6343f22fe6 100644 --- a/src/hooks/dhcp/high_availability/communication_state.h +++ b/src/hooks/dhcp/high_availability/communication_state.h @@ -56,7 +56,7 @@ namespace ha { /// It must also run @c poke when the lease update is successful. /// /// The @c poke method sets the "last poke time" to current time, thus -/// indicating that the connection is healty. The @c getDurationInMillisecs +/// indicating that the connection is healthy. The @c getDurationInMillisecs /// method is used to check for how long the server hasn't been able /// to communicate with the partner. This duration is simply a time /// elapsed since last successful poke time. If this duration becomes @@ -172,7 +172,7 @@ public: /// /// This method checks if the communication with the partner appears /// to be interrupted. This is the case when the time since last - /// successful communication is longer than the confgured + /// successful communication is longer than the configured /// max-response-delay value. /// /// @return true if communication is interrupted, false otherwise. @@ -227,7 +227,7 @@ public: /// Returning true in that case simplifies the code of the /// @c HAService which doesn't need to check if the failure detection /// is enabled or not. It simply calls this method in the - /// 'communications interrupted' situtation to check if the + /// 'communications interrupted' situation to check if the /// server should be transitioned to the 'partner-down' state. /// /// @return true if the partner failure has been detected, false @@ -293,7 +293,7 @@ public: /// will reset the gating counter. /// /// @return true if the warning message should be logged because of the clock - /// skew exceeding a warning thresdhold. + /// skew exceeding a warning threshold. bool clockSkewShouldWarn(); /// @brief Indicates whether the HA service should enter "terminated" diff --git a/src/hooks/dhcp/high_availability/ha.dox b/src/hooks/dhcp/high_availability/ha.dox index 56d9c800c8..801a8abd74 100644 --- a/src/hooks/dhcp/high_availability/ha.dox +++ b/src/hooks/dhcp/high_availability/ha.dox @@ -334,7 +334,7 @@ i.e.: - Monitoring the clocks skew between the active servers, which is calculated by substracting the current time (on the local server) from the time returned by the partner in response to the - heartbeat comand. + heartbeat command. The large part of this class is common for the DHCPv4 and DHCPv6 servers. However, there are differences in how the DHCPv4 and the DHCPv6 messages diff --git a/src/hooks/dhcp/high_availability/ha_callouts.cc b/src/hooks/dhcp/high_availability/ha_callouts.cc index 81d204ee5a..13b91f67c2 100644 --- a/src/hooks/dhcp/high_availability/ha_callouts.cc +++ b/src/hooks/dhcp/high_availability/ha_callouts.cc @@ -162,7 +162,7 @@ int leases6_committed(CalloutHandle& handle) { return (0); } -/// @brief comand_processed callout implementation. +/// @brief command_processed callout implementation. /// /// @param handle callout handle. int command_processed(CalloutHandle& handle) { diff --git a/src/hooks/dhcp/high_availability/ha_config.cc b/src/hooks/dhcp/high_availability/ha_config.cc index c0b67e2b0c..83e0599ed3 100644 --- a/src/hooks/dhcp/high_availability/ha_config.cc +++ b/src/hooks/dhcp/high_availability/ha_config.cc @@ -160,7 +160,7 @@ HAConfig::HAConfig() HAConfig::PeerConfigPtr HAConfig::selectNextPeerConfig(const std::string& name) { - // Check if there is a configuration for this server name alrady. We can't + // Check if there is a configuration for this server name already. We can't // have two servers with the same name. if (peers_.count(name) > 0) { isc_throw(BadValue, "peer with name '" << name << "' already specified"); diff --git a/src/hooks/dhcp/high_availability/ha_config.h b/src/hooks/dhcp/high_availability/ha_config.h index 04f9765ca1..61f805f51d 100644 --- a/src/hooks/dhcp/high_availability/ha_config.h +++ b/src/hooks/dhcp/high_availability/ha_config.h @@ -199,7 +199,7 @@ public: return (pausing_); } - /// @brief Sets pausing mode for the gievn state. + /// @brief Sets pausing mode for the given state. /// /// @param pausing new pausing mode in the textual form. Supported /// values are: always, never, once. @@ -361,7 +361,7 @@ public: /// @brief Sets new lease database syncing timeout in milliseconds. /// - /// @param sync_timeout new timeout for lease database synchornization. + /// @param sync_timeout new timeout for lease database synchronization. void setSyncTimeout(const uint32_t sync_timeout) { sync_timeout_ = sync_timeout; } diff --git a/src/hooks/dhcp/high_availability/ha_impl.h b/src/hooks/dhcp/high_availability/ha_impl.h index 114590fb72..3f04517999 100644 --- a/src/hooks/dhcp/high_availability/ha_impl.h +++ b/src/hooks/dhcp/high_availability/ha_impl.h @@ -34,7 +34,7 @@ public: /// @brief Constructor. HAImpl(); - /// @brief Parases configuration. + /// @brief Parses configuration. /// /// @param input_config Configuration specified for the hooks library. /// @throw ConfigError when configuration fails. diff --git a/src/hooks/dhcp/high_availability/ha_messages.mes b/src/hooks/dhcp/high_availability/ha_messages.mes index 484c431542..1b51a9414a 100644 --- a/src/hooks/dhcp/high_availability/ha_messages.mes +++ b/src/hooks/dhcp/high_availability/ha_messages.mes @@ -278,7 +278,7 @@ connection. The second argument contains a reason for the error. % HA_LEASES_BACKLOG_FAILED failed to send lease updates backlog to %1: %2 This error message is issued to indicate that sending lease updates backlog to a partner server failed. The lease updates backlog is sent to the partner -after resuming tremporarily broken communication with the partner. If this +after resuming temporarily broken communication with the partner. If this operation fails the server will transition to the waiting state to initiate full lease database synchronization. diff --git a/src/hooks/dhcp/high_availability/ha_service.cc b/src/hooks/dhcp/high_availability/ha_service.cc index 6f64a4cf09..6960fd28d0 100644 --- a/src/hooks/dhcp/high_availability/ha_service.cc +++ b/src/hooks/dhcp/high_availability/ha_service.cc @@ -1558,7 +1558,7 @@ HAService::asyncSendHeartbeat() { const HttpResponsePtr& response, const std::string& error_str) { - // There are three possible groups of errors during the heartneat. + // There are three possible groups of errors during the heartbeat. // One is the IO error causing issues in communication with the peer. // Another one is an HTTP parsing error. The last type of error is // when non-success error code is returned in the response carried @@ -1698,7 +1698,7 @@ HAService::asyncDisableDHCPService(HttpClient& http_client, const HttpResponsePtr& response, const std::string& error_str) { - // There are three possible groups of errors during the heartneat. + // There are three possible groups of errors during the heartbeat. // One is the IO error causing issues in communication with the peer. // Another one is an HTTP parsing error. The last type of error is // when non-success error code is returned in the response carried @@ -1771,7 +1771,7 @@ HAService::asyncEnableDHCPService(HttpClient& http_client, const HttpResponsePtr& response, const std::string& error_str) { - // There are three possible groups of errors during the heartneat. + // There are three possible groups of errors during the heartbeat. // One is the IO error causing issues in communication with the peer. // Another one is an HTTP parsing error. The last type of error is // when non-success error code is returned in the response carried @@ -1917,7 +1917,7 @@ HAService::asyncSyncLeasesInternal(http::HttpClient& http_client, // page was hit, this value remains null. LeasePtr last_lease; - // There are three possible groups of errors during the heartneat. + // There are three possible groups of errors during the heartbeat. // One is the IO error causing issues in communication with the peer. // Another one is an HTTP parsing error. The last type of error is // when non-success error code is returned in the response carried @@ -2516,7 +2516,7 @@ HAService::processMaintenanceStart() { return (createAnswer(CONTROL_RESULT_ERROR, "Unable to transition to the" " partner-in-maintenance state. The partner server responded" " with the following message to the ha-maintenance-notify" - " commmand: " + captured_error_message + ".")); + " command: " + captured_error_message + ".")); } @@ -2606,7 +2606,7 @@ HAService::processMaintenanceCancel() { return (createAnswer(CONTROL_RESULT_ERROR, "Unable to cancel maintenance. The partner server responded" " with the following message to the ha-maintenance-notify" - " commmand: " + error_message + ".")); + " command: " + error_message + ".")); } // Successfully reverted partner's state. Let's also revert our state to the @@ -2681,7 +2681,7 @@ bool HAService::clientConnectHandler(const boost::system::error_code& ec, int tcp_native_fd) { // If things look ok register the socket with Interface Manager. Note - // we don't register if the FD is < 0 to avoid an expection throw. + // we don't register if the FD is < 0 to avoid an exception throw. // It is unlikely that this will occur but we want to be liberal // and avoid issues. if ((!ec || (ec.value() == boost::asio::error::in_progress)) diff --git a/src/hooks/dhcp/high_availability/ha_service.h b/src/hooks/dhcp/high_availability/ha_service.h index 2740bc8271..e122af0332 100644 --- a/src/hooks/dhcp/high_availability/ha_service.h +++ b/src/hooks/dhcp/high_availability/ha_service.h @@ -49,7 +49,7 @@ public: /// Lease database synchronization failed. static const int HA_SYNCING_FAILED_EVT = SM_DERIVED_EVENT_MIN + 3; - /// Lease database synchroniation succeeded. + /// Lease database synchronization succeeded. static const int HA_SYNCING_SUCCEEDED_EVT = SM_DERIVED_EVENT_MIN + 4; /// ha-maintenance-notify command received. @@ -292,7 +292,7 @@ public: /// This indicates that the HA service is disabled, typically as a result /// of an unrecoverable error such as detecting that clocks skew between /// the active HA servers being too large. This situation requires - /// manual intervation of an administrator. When the problem is corrected, + /// manual intervention of an administrator. When the problem is corrected, /// the HA service needs to be restarted. /// /// @note Currently, restarting the HA service requires restarting the @@ -861,7 +861,7 @@ protected: /// @brief Sends lease updates from backlog to partner asynchronously. /// - /// This method checks if there are any outstanding DHCPv4 or DHCOPv6 leases + /// This method checks if there are any outstanding DHCPv4 or DHCPv6 leases /// in the backlog and schedules asynchronous sends of these leases. In /// DHCPv6 case it sends a single lease6-bulk-apply command with all /// outstanding leases. In DHCPv4 case, it sends lease4-update or lease4-delete @@ -939,7 +939,7 @@ public: /// This command attempts to tramsition the server to the in-maintenance state /// if the cancel flag is set to false. Such transition is not allowed if /// the server is currently in one of the following states: - /// - backup: becase maintenance is not supported for backup servers, + /// - backup: because maintenance is not supported for backup servers, /// - partner-in-maintenance: because only one server is in maintenance while /// the partner must be in parter-in-maintenance state, /// - terminated: because the only way to resume HA service is by shutting @@ -953,7 +953,7 @@ public: /// canceled with this operation. If it is set to false the maintenance /// is being started. /// - /// @return Pointer to the reponse to the ha-maintenance-notify. + /// @return Pointer to the response to the ha-maintenance-notify. data::ConstElementPtr processMaintenanceNotify(const bool cancel); /// @brief Processes ha-maintenance-start command and returns a response. @@ -982,7 +982,7 @@ public: /// previous state. It effectively means canceling the request for /// maintenance signaled with the ha-maintenance-start command. /// - /// In some cases canceling the maintenace is no longer possible, e.g. + /// In some cases canceling the maintenance is no longer possible, e.g. /// if the server has already got into the partner-down state. Generally, /// canceling the maintenance is only possible if this server is in the /// partner-in-maintenance state and the partner is in the in-maintenance @@ -1027,8 +1027,8 @@ protected: /// /// We do this in case the other peer closed the socket (e.g. idle timeout), /// as this will cause the socket to appear ready to read to the - /// IfaceMgr::select(). If this happens while no transcations are - /// in progess, we won't have anything to deal with the socket event. + /// IfaceMgr::select(). If this happens while no transactions are + /// in progress, we won't have anything to deal with the socket event. /// This causes IfaceMgr::select() to endlessly interrupt on the socket. /// /// @param tcp_native_fd socket descriptor of the ready socket diff --git a/src/hooks/dhcp/high_availability/lease_update_backlog.h b/src/hooks/dhcp/high_availability/lease_update_backlog.h index cf888912e1..2acd5e16b3 100644 --- a/src/hooks/dhcp/high_availability/lease_update_backlog.h +++ b/src/hooks/dhcp/high_availability/lease_update_backlog.h @@ -115,7 +115,7 @@ private: /// @brief Holds the queue size limit. size_t limit_; - /// @brief Remebers whether the queue was overflown. + /// @brief Remembers whether the queue was overflown. bool overflown_; /// @brief Actual queue of lease updates and their types. diff --git a/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc b/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc index e2f0d1c549..e692037ce6 100644 --- a/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc +++ b/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc @@ -953,7 +953,7 @@ public: return (service_->pendingRequestSize() == 0); })); - // Only if we wait for lease updates to complete it makes senst to test + // Only if we wait for lease updates to complete it makes sense to test // that the packet was either dropped or unparked. if (num_updates > 0) { // Try to drop the packet. We expect that the packet has been already @@ -2600,7 +2600,7 @@ TEST_F(HAServiceTest, recurringHeartbeatServerOffline) { }); // The servers are configured to return success but the server 2 is offline - // so the heartbeat should be unsuccessul. + // so the heartbeat should be unsuccessful. ASSERT_NO_FATAL_FAILURE(testRecurringHeartbeat(CONTROL_RESULT_SUCCESS, false)); // Server 2 is offline so it would be very weird if it received any command. @@ -2672,7 +2672,7 @@ TEST_F(HAServiceTest, asyncSyncLeases) { } // Modify cltt of the first lease. This lease should be updated as a result - // of synchrnonization process because cltt is checked and the lease is + // of synchronization process because cltt is checked and the lease is // updated if the cltt of the fetched lease is later than the cltt of the // existing lease. ++leases4_[0]->cltt_; @@ -2683,7 +2683,7 @@ TEST_F(HAServiceTest, asyncSyncLeases) { ++leases4_[1]->subnet_id_ = 0; // Modify the partner's lease cltt so it is earlier than the local lease. - // Therfore, this lease update should be rejected. + // Therefore, this lease update should be rejected. --leases4_[2]->cltt_; // Create HA configuration. @@ -2801,7 +2801,7 @@ TEST_F(HAServiceTest, asyncSyncLeasesAuthorized) { } // Modify cltt of the first lease. This lease should be updated as a result - // of synchrnonization process because cltt is checked and the lease is + // of synchronization process because cltt is checked and the lease is // updated if the cltt of the fetched lease is later than the cltt of the // existing lease. ++leases4_[0]->cltt_; @@ -2812,7 +2812,7 @@ TEST_F(HAServiceTest, asyncSyncLeasesAuthorized) { ++leases4_[1]->subnet_id_ = 0; // Modify the partner's lease cltt so it is earlier than the local lease. - // Therfore, this lease update should be rejected. + // Therefore, this lease update should be rejected. --leases4_[2]->cltt_; // Create HA configuration. @@ -3013,7 +3013,7 @@ TEST_F(HAServiceTest, asyncSyncLeases6) { } // Modify cltt of the first lease. This lease should be updated as a result - // of synchrnonization process because cltt is checked and the lease is + // of synchronization process because cltt is checked and the lease is // updated if the cltt of the fetched lease is later than the cltt of the // existing lease. ++leases6_[0]->cltt_; @@ -3024,7 +3024,7 @@ TEST_F(HAServiceTest, asyncSyncLeases6) { ++leases6_[1]->subnet_id_ = 0; // Modify the partner's lease cltt so it is earlier than the local lease. - // Therfore, this lease update should be rejected. + // Therefore, this lease update should be rejected. --leases6_[2]->cltt_; // Create HA configuration. @@ -3143,7 +3143,7 @@ TEST_F(HAServiceTest, asyncSyncLeases6Authorized) { } // Modify cltt of the first lease. This lease should be updated as a result - // of synchrnonization process because cltt is checked and the lease is + // of synchronization process because cltt is checked and the lease is // updated if the cltt of the fetched lease is later than the cltt of the // existing lease. ++leases6_[0]->cltt_; @@ -3154,7 +3154,7 @@ TEST_F(HAServiceTest, asyncSyncLeases6Authorized) { ++leases6_[1]->subnet_id_ = 0; // Modify the partner's lease cltt so it is earlier than the local lease. - // Therfore, this lease update should be rejected. + // Therefore, this lease update should be rejected. --leases6_[2]->cltt_; // Create HA configuration. @@ -4381,7 +4381,7 @@ TEST_F(HAServiceTest, processMaintenanceStartNotAllowed) { checkAnswer(rsp, CONTROL_RESULT_ERROR, "Unable to transition to the partner-in-maintenance state." " The partner server responded with the following message" - " to the ha-maintenance-notify commmand: response returned," + " to the ha-maintenance-notify command: response returned," " error code 1001."); // The partner's state precludes entering the in-maintenance state. Thus, this @@ -4520,7 +4520,7 @@ TEST_F(HAServiceTest, processMaintenanceCancelPartnerError) { checkAnswer(rsp, CONTROL_RESULT_ERROR, "Unable to cancel maintenance. The partner server responded" " with the following message to the ha-maintenance-notify" - " commmand: response returned, error code 1."); + " command: response returned, error code 1."); // The state of this server should not change. EXPECT_EQ(HA_PARTNER_IN_MAINTENANCE_ST, service.getCurrState()); @@ -4566,7 +4566,7 @@ TEST_F(HAServiceTest, processMaintenanceCancelPartnerUnauthorized) { checkAnswer(rsp, CONTROL_RESULT_ERROR, "Unable to cancel maintenance. The partner server responded" " with the following message to the ha-maintenance-notify" - " commmand: Unauthorized, error code 1."); + " command: Unauthorized, error code 1."); // The state of this server should not change. EXPECT_EQ(HA_PARTNER_IN_MAINTENANCE_ST, service.getCurrState()); @@ -4577,7 +4577,7 @@ TEST_F(HAServiceTest, processHAReset) { HAConfigPtr config_storage = createValidConfiguration(); TestHAService service(io_service_, network_state_, config_storage); - // Transion the server to the load-balancing state. + // Transition the server to the load-balancing state. EXPECT_NO_THROW(service.transition(HA_LOAD_BALANCING_ST, HAService::NOP_EVT)); // Process ha-reset command that should cause the server to transition @@ -4602,7 +4602,7 @@ TEST_F(HAServiceTest, processHAResetWaiting) { HAConfigPtr config_storage = createValidConfiguration(); TestHAService service(io_service_, network_state_, config_storage); - // Transion the server to the load-balancing state. + // Transition the server to the load-balancing state. EXPECT_NO_THROW(service.transition(HA_WAITING_ST, HAService::NOP_EVT)); // Process ha-reset command that should not change the state of the @@ -5283,7 +5283,7 @@ TEST_F(HAServiceStateMachineTest, waitingParterDownLoadBalancingPartnerDown) { // 4. Partner shows up and eventually transitions to the ready state. // 5. I can communicate with the partner so I transition to the hot-standby // state as a standby server. -// 6. Patrtner stops responding again. +// 6. Partner stops responding again. // 7. I monitor communication with the partner and eventually consider the // communication to be interrupted. // 8. I start monitoring the DHCP traffic directed to the partner and observe @@ -5305,7 +5305,7 @@ TEST_F(HAServiceStateMachineTest, waitingParterDownHotStandbyPartnerDown) { EXPECT_EQ(HA_WAITING_ST, service_->getCurrState()); - // WAITING state: no heartbeat reponse for a long period of time. + // WAITING state: no heartbeat response for a long period of time. ASSERT_NO_FATAL_FAILURE(waitForEvent(HAService::HA_HEARTBEAT_COMPLETE_EVT)); simulateNoCommunication(); ASSERT_TRUE(isDoingHeartbeat()); @@ -5526,7 +5526,7 @@ TEST_F(HAServiceStateMachineTest, waitingSyncingReadyLoadBalancingPrimary) { }); // READY state: our partner sees that we're ready so it will start to - // synchronize. We reamain the READY state as long as the partner is not + // synchronize. We remain in the READY state as long as the partner is not // ready. partner.transition("syncing"); ASSERT_NO_FATAL_FAILURE(waitForEvent(HAService::HA_HEARTBEAT_COMPLETE_EVT)); diff --git a/src/hooks/dhcp/high_availability/tests/ha_test.h b/src/hooks/dhcp/high_availability/tests/ha_test.h index 60a2314cda..81195afd5b 100644 --- a/src/hooks/dhcp/high_availability/tests/ha_test.h +++ b/src/hooks/dhcp/high_availability/tests/ha_test.h @@ -142,7 +142,7 @@ public: HAConfig::LOAD_BALANCING) const; /// @brief Return HA configuration with one primary and two backup - /// serveers in the JSON format. + /// servers in the JSON format. /// /// @return Pointer to the unparsed configuration. data::ConstElementPtr diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc index ac2bb32b30..964c61df86 100644 --- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc +++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc @@ -1248,7 +1248,7 @@ LeaseCmdsImpl::leaseGetByHwAddressHandler(CalloutHandle& handle) { // The 'hw-address' argument is a string. if (hw_address->getType() != Element::string) { - isc_throw(BadValue, "'hw-address'parameter must be a string"); + isc_throw(BadValue, "'hw-address' parameter must be a string"); } HWAddr hwaddr = HWAddr::fromText(hw_address->stringValue()); @@ -1298,7 +1298,7 @@ LeaseCmdsImpl::leaseGetByClientIdHandler(CalloutHandle& handle) { // The 'client-id' argument is a string. if (client_id->getType() != Element::string) { - isc_throw(BadValue, "'client-id'parameter must be a string"); + isc_throw(BadValue, "'client-id' parameter must be a string"); } ClientIdPtr clientid = ClientId::fromText(client_id->stringValue()); @@ -1348,7 +1348,7 @@ LeaseCmdsImpl::leaseGetByDuidHandler(CalloutHandle& handle) { // The 'duid' argument is a string. if (duid->getType() != Element::string) { - isc_throw(BadValue, "'duid'parameter must be a string"); + isc_throw(BadValue, "'duid' parameter must be a string"); } DUID duid_ = DUID::fromText(duid->stringValue()); @@ -1400,7 +1400,7 @@ LeaseCmdsImpl::leaseGetByHostnameHandler(CalloutHandle& handle) { // The 'hostname' argument is a string. if (hostname->getType() != Element::string) { - isc_throw(BadValue, "'hostname'parameter must be a string"); + isc_throw(BadValue, "'hostname' parameter must be a string"); } std::string hostname_ = hostname->stringValue(); diff --git a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc index 1f66b12570..90efb894fb 100644 --- a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc +++ b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc @@ -298,7 +298,7 @@ public: /// /// Creates a lease manager (memfile, trimmed down to keep everything in memory /// only) and optionally can create a lease, which is useful for leaseX-get and - /// leasex-del type of tests. For lease details, see @ref createLease4 and + /// leaseX-del type of tests. For lease details, see @ref createLease4 and /// @ref createLease6. /// /// @param v6 true = v6, false = v4 @@ -3627,7 +3627,7 @@ void LeaseCmdsTest::testLease4GetPaged() { " }" "}"; - // For the first two pages we shuould get success. For the last + // For the first two pages we should get success. For the last // one an empty status code. ConstElementPtr rsp; if (i < 2) { @@ -4144,7 +4144,7 @@ void LeaseCmdsTest::testLease6GetPaged() { " }" "}"; - // For the first two pages we shuould get success. For the last + // For the first two pages we should get success. For the last // one an empty status code. ConstElementPtr rsp; if (i < 2) { @@ -4409,7 +4409,7 @@ void LeaseCmdsTest::testLeaseGetByHwAddressParams() { " \"hw-address\": 1234\n" " }\n" "}"; - exp_rsp = "'hw-address'parameter must be a string"; + exp_rsp = "'hw-address' parameter must be a string"; testCommand(cmd, CONTROL_RESULT_ERROR, exp_rsp); // Simply bad value. @@ -4524,7 +4524,7 @@ void LeaseCmdsTest::testLeaseGetByClientIdParams() { " \"client-id\": 1234\n" " }\n" "}"; - exp_rsp = "'client-id'parameter must be a string"; + exp_rsp = "'client-id' parameter must be a string"; testCommand(cmd, CONTROL_RESULT_ERROR, exp_rsp); // Simply bad value. @@ -4639,7 +4639,7 @@ void LeaseCmdsTest::testLeaseGetByDuidParams() { " \"duid\": 1234\n" " }\n" "}"; - exp_rsp = "'duid'parameter must be a string"; + exp_rsp = "'duid' parameter must be a string"; testCommand(cmd, CONTROL_RESULT_ERROR, exp_rsp); // Simply bad value. @@ -4754,7 +4754,7 @@ void LeaseCmdsTest::testLease4GetByHostnameParams() { " \"hostname\": 1234\n" " }\n" "}"; - exp_rsp = "'hostname'parameter must be a string"; + exp_rsp = "'hostname' parameter must be a string"; testCommand(cmd, CONTROL_RESULT_ERROR, exp_rsp); // hostname must be not empty. @@ -4868,7 +4868,7 @@ void LeaseCmdsTest::testLease6GetByHostnameParams() { " \"hostname\": 1234\n" " }\n" "}"; - exp_rsp = "'hostname'parameter must be a string"; + exp_rsp = "'hostname' parameter must be a string"; testCommand(cmd, CONTROL_RESULT_ERROR, exp_rsp); // hostname must be not empty. diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc index 4a0bfaa4db..a6e0afd23c 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc @@ -1849,7 +1849,7 @@ public: /// @param subnet_id Identifier of the subnet the option belongs to. /// @param option Pointer to the option descriptor encapsulating the option. /// @param cascade_update Boolean value indicating whether the update is - /// performed as part of the ownining element, e.g. subnet. + /// performed as part of the owning element, e.g. subnet. void createUpdateOption4(const ServerSelector& server_selector, const SubnetID& subnet_id, const OptionDescriptorPtr& option, @@ -1935,7 +1935,7 @@ public: /// @param pool_id Identifier of the pool the option belongs to. /// @param option Pointer to the option descriptor encapsulating the option. /// @param cascade_update Boolean value indicating whether the update is - /// performed as part of the ownining element, e.g. subnet. + /// performed as part of the owning element, e.g. subnet. void createUpdateOption4(const ServerSelector& server_selector, const uint64_t pool_id, const OptionDescriptorPtr& option, @@ -1991,7 +1991,7 @@ public: /// belongs to. /// @param option Pointer to the option descriptor encapsulating the option. /// @param cascade_update Boolean value indicating whether the update is - /// performed as part of the ownining element, e.g. shared network. + /// performed as part of the owning element, e.g. shared network. void createUpdateOption4(const ServerSelector& server_selector, const std::string& shared_network_name, const OptionDescriptorPtr& option, diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc index f87a2018f1..758b69d10b 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc @@ -2187,7 +2187,7 @@ public: /// @param subnet_id Identifier of the subnet the option belongs to. /// @param option Pointer to the option descriptor encapsulating the option. /// @param cascade_update Boolean value indicating whether the update is - /// performed as part of the ownining element, e.g. subnet. + /// performed as part of the owning element, e.g. subnet. void createUpdateOption6(const ServerSelector& server_selector, const SubnetID& subnet_id, const OptionDescriptorPtr& option, @@ -2304,7 +2304,7 @@ public: /// the option belongs to. /// @param option Pointer to the option descriptor encapsulating the option. /// @param cascade_update Boolean value indicating whether the update is - /// performed as part of the ownining element, e.g. subnet. + /// performed as part of the owning element, e.g. subnet. void createUpdateOption6(const ServerSelector& server_selector, const Lease::Type& pool_type, const uint64_t pool_id, @@ -2404,7 +2404,7 @@ public: /// belongs to. /// @param option Pointer to the option descriptor encapsulating the option. /// @param cascade_update Boolean value indicating whether the update is - /// performed as part of the ownining element, e.g. shared network. + /// performed as part of the owning element, e.g. shared network. void createUpdateOption6(const ServerSelector& server_selector, const std::string& shared_network_name, const OptionDescriptorPtr& option, diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_impl.h b/src/hooks/dhcp/mysql_cb/mysql_cb_impl.h index c43af4fcdd..7aa14bf26a 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_impl.h +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_impl.h @@ -235,7 +235,7 @@ public: /// revision. /// @param log_message log message to be used for the audit revision. /// @param cascade_transaction Boolean value indicating whether the - /// configuration modification is performed as part of the ownining + /// configuration modification is performed as part of the owning /// element modification, e.g. subnet is modified resulting in /// modification of the DHCP options it owns. In that case only the /// audit entry for the owning element should be created. diff --git a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc index 3fcd0274be..b52f5a0591 100644 --- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc +++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc @@ -1443,7 +1443,7 @@ TEST_F(MySqlConfigBackendDHCPv4Test, getSubnet4ByPrefix) { EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str()); // Fetching the subnet for an explicitly specified server tag should - // succeeed too. + // succeed too. returned_subnet = cbptr_->getSubnet4(ServerSelector::ONE("server1"), "192.0.2.0/24"); EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str()); @@ -2250,7 +2250,7 @@ TEST_F(MySqlConfigBackendDHCPv4Test, getSharedNetwork4Selectors) { TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateSharedNetwork4) { auto shared_network = test_networks_[0]; - // An attempto insert the shared network for non-existing server should fail. + // An attempt to insert the shared network for non-existing server should fail. EXPECT_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server1"), shared_network), NullKeyError); @@ -2958,7 +2958,7 @@ TEST_F(MySqlConfigBackendDHCPv4Test, sharedNetworkOptions) { EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), test_networks_[0])); EXPECT_EQ(4, countRows("dhcp4_options")); - // Delete this shared netwiork. This should not affect the option associated + // Delete this shared network. This should not affect the option associated // with the remaining shared network. EXPECT_NO_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::ALL(), test_networks_[0]->getName())); @@ -3227,7 +3227,7 @@ TEST_F(MySqlConfigBackendDHCPv4Test, getAllOptionDefs4) { ++updates_num; } else { - SCOPED_TRACE("CREATE audit entry for the option defnition " + name); + SCOPED_TRACE("CREATE audit entry for the option definition " + name); testNewAuditEntry("dhcp4_option_def", AuditEntry::ModificationType::CREATE, "option definition set"); diff --git a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc index d069b8eb6b..d795ad793f 100644 --- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc +++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc @@ -1472,7 +1472,7 @@ TEST_F(MySqlConfigBackendDHCPv6Test, getSubnet6ByPrefix) { EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str()); // Fetching the subnet for an explicitly specified server tag should - // succeeed too. + // succeed too. returned_subnet = cbptr_->getSubnet6(ServerSelector::ONE("server1"), "2001:db8::/64"); EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str()); @@ -2285,7 +2285,7 @@ TEST_F(MySqlConfigBackendDHCPv6Test, getSharedNetwork6Selectors) { TEST_F(MySqlConfigBackendDHCPv6Test, createUpdateSharedNetwork6) { auto shared_network = test_networks_[0]; - // An attempto insert the shared network for non-existing server should fail. + // An attempt to insert the shared network for non-existing server should fail. EXPECT_THROW(cbptr_->createUpdateSharedNetwork6(ServerSelector::ONE("server1"), shared_network), NullKeyError); @@ -2335,7 +2335,7 @@ TEST_F(MySqlConfigBackendDHCPv6Test, createUpdateSharedNetwork6) { EXPECT_FALSE(network->hasServerTag(ServerTag())); } -// Test that craeteUpdateSharedNetwork6 throws appropriate exceptions for various +// Test that createUpdateSharedNetwork6 throws appropriate exceptions for various // server selectors. TEST_F(MySqlConfigBackendDHCPv6Test, createUpdateSharedNetwork6Selectors) { ASSERT_NO_THROW(cbptr_->createUpdateServer6(test_servers_[0])); @@ -2995,7 +2995,7 @@ TEST_F(MySqlConfigBackendDHCPv6Test, sharedNetworkOptions) { EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork6(ServerSelector::ALL(), test_networks_[0])); EXPECT_EQ(4, countRows("dhcp6_options")); - // Delete this shared netwiork. This should not affect the option associated + // Delete this shared network. This should not affect the option associated // with the remaining shared network. EXPECT_NO_THROW(cbptr_->deleteSharedNetwork6(ServerSelector::ALL(), test_networks_[0]->getName())); diff --git a/src/hooks/dhcp/stat_cmds/stat_cmds.cc b/src/hooks/dhcp/stat_cmds/stat_cmds.cc index b1aa18d15a..956ecc3755 100644 --- a/src/hooks/dhcp/stat_cmds/stat_cmds.cc +++ b/src/hooks/dhcp/stat_cmds/stat_cmds.cc @@ -89,7 +89,7 @@ public: /// @ref isc::stat_cmds::StatCmds::statLease4GetHandler /// /// It parses the command arguments, and then invokes makeResult4() - /// to fulfull the lease4 statistics fetch. It then constructs the outbound + /// to fulfil the lease4 statistics fetch. It then constructs the outbound /// response based on those results. If a NotFound exception is caught, /// a CONTROL_RESULT_EMTPY response is generated. /// @@ -103,7 +103,7 @@ public: /// @ref isc::stat_cmds::StatCmds::statLease6GetHandler /// /// It parses the command arguments, and then invokes makeResult6() - /// to fulfull the lease6 statistics fetch. It then constructs the outbound + /// to fulfil the lease6 statistics fetch. It then constructs the outbound /// response based on those results. If a NotFound exception is caught, /// a CONTROL_RESULT_EMTPY response is generated. /// diff --git a/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc b/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc index adc791e954..44ec9bbfd3 100644 --- a/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc +++ b/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc @@ -134,7 +134,7 @@ public: // If we expect nothing and nothing is what we got, we're done. if (exp_args->size() == 0) { ASSERT_TRUE(actual_args->size() == 0) - << "Acutal args should be empty:" << toJSON(actual_args); + << "Actual args should be empty:" << toJSON(actual_args); return; } @@ -1245,7 +1245,7 @@ TEST_F(StatCmdsTest, statLease6GetValid) { "}\n" }, { - "ALL-Subnets6 arugments omitted", + "ALL-Subnets6 arguments omitted", "{\n" " \"command\": \"stat-lease6-get\"\n" "}", diff --git a/src/lib/asiolink/addr_utilities.cc b/src/lib/asiolink/addr_utilities.cc index 5c308d8625..ec2b69e8c3 100644 --- a/src/lib/asiolink/addr_utilities.cc +++ b/src/lib/asiolink/addr_utilities.cc @@ -379,7 +379,7 @@ IOAddress offsetAddress(const IOAddress& addr, uint64_t offset) { return (addr); } - // If this is IPv4 addrss we utilize the conversion to uint32_t. + // If this is an IPv4 address, then we utilize the conversion to uint32_t. if (addr.isV4()) { auto addr_uint32 = static_cast(addr.toUint32()); // If the result would exceed the maximum possible IPv4 address, let's return diff --git a/src/lib/asiolink/tests/addr_utilities_unittest.cc b/src/lib/asiolink/tests/addr_utilities_unittest.cc index 69aca84f2c..cbcc1e7020 100644 --- a/src/lib/asiolink/tests/addr_utilities_unittest.cc +++ b/src/lib/asiolink/tests/addr_utilities_unittest.cc @@ -96,7 +96,7 @@ TEST(AddrUtilitiesTest, lastAddrInPrefix6) { IOAddress addr2("2001::"); - // These are tricker, though, as they are done in 1 bit increments + // These are trickier, though, as they are done in 1 bit increments // the last address in 2001::/127 pool should be 2001::1 EXPECT_EQ("2001::1", lastAddrInPrefix(addr2, 127).toText()); @@ -134,7 +134,7 @@ TEST(AddrUtilitiesTest, firstAddrInPrefix6) { IOAddress addr2("2001::ffff"); - // These are tricker, though, as they are done in 1 bit increments + // These are trickier, though, as they are done in 1 bit increments // the first address in 2001::/127 pool should be 2001::1 EXPECT_EQ("2001::fffe", firstAddrInPrefix(addr2, 127).toText()); diff --git a/src/lib/asiolink/udp_socket.h b/src/lib/asiolink/udp_socket.h index afb742608b..4329a8d973 100644 --- a/src/lib/asiolink/udp_socket.h +++ b/src/lib/asiolink/udp_socket.h @@ -87,7 +87,7 @@ public: /// Opens the UDP socket. This is a synchronous operation. /// /// \param endpoint Endpoint to which the socket will send data. This is - /// used to determine the address family trhat should be used for the + /// used to determine the address family that should be used for the /// underlying socket. /// \param callback Unused as the operation is synchronous. virtual void open(const IOEndpoint* endpoint, C& callback); diff --git a/src/lib/cc/base_stamped_element.h b/src/lib/cc/base_stamped_element.h index e98bd32226..b2b78ad8b3 100644 --- a/src/lib/cc/base_stamped_element.h +++ b/src/lib/cc/base_stamped_element.h @@ -54,7 +54,7 @@ public: timestamp_ = timestamp; } - /// @brief Sets timestmp to the current time. + /// @brief Sets timestamp to the current time. void updateModificationTime(); /// @brief Returns timestamp. diff --git a/src/lib/config/cmds_impl.h b/src/lib/config/cmds_impl.h index cb470dc2fb..23bf67a8fb 100644 --- a/src/lib/config/cmds_impl.h +++ b/src/lib/config/cmds_impl.h @@ -60,7 +60,7 @@ protected: /// @brief Set the callout argument "response" to the given response /// /// @param handle Callout context handle in which to set the "response" argument - /// @param response ElementPtr to a the result to use as the reponse + /// @param response ElementPtr to a the result to use as the response void setResponse(hooks::CalloutHandle& handle, data::ConstElementPtr& response) { handle.setArgument ("response", response); } diff --git a/src/lib/config/timeouts.h b/src/lib/config/timeouts.h index dc945a83fb..bf5a58dacb 100644 --- a/src/lib/config/timeouts.h +++ b/src/lib/config/timeouts.h @@ -27,14 +27,14 @@ constexpr long TIMEOUT_AGENT_IDLE_CONNECTION_TIMEOUT = 30000; /// Kea server, e.g. DHCP server. /// /// This value is high to ensure that the server have enough time -/// to generate large responses, e.g. dump whole lease databse. +/// to generate large responses, e.g. dump whole lease database. constexpr long TIMEOUT_AGENT_FORWARD_COMMAND = 60000; /// @brief Timeout for the HTTP clients awaiting a response to a request. /// /// This value is high to ensure that the client waits long enough /// for the fulfilling server to generate a response. Specified -/// milliseconds. +/// milliseconds. constexpr long TIMEOUT_DEFAULT_HTTP_CLIENT_REQUEST = 10000; diff --git a/src/lib/cql/cql_connection.cc b/src/lib/cql/cql_connection.cc index e694861fca..54eaddf549 100644 --- a/src/lib/cql/cql_connection.cc +++ b/src/lib/cql/cql_connection.cc @@ -55,7 +55,7 @@ CqlConnection::~CqlConnection() { CassFuture* close_future = cass_session_close(session_); cass_future_wait(close_future); error = checkFutureError( - "CqlConnection::~CqlConnection(): cass_sesssion_close() != CASS_OK", + "CqlConnection::~CqlConnection(): cass_session_close() != CASS_OK", close_future); rc = cass_future_error_code(close_future); cass_future_free(close_future); @@ -457,7 +457,7 @@ CqlConnection::checkFutureError(const std::string& what, stream << "Session action "; } if (cass_error == CASS_OK) { - stream << " executed succesfully."; + stream << " executed successfully."; } else { stream << " failed, Kea error: " << what << ", Cassandra error code: " << cass_error_desc(cass_error) diff --git a/src/lib/cql/cql_exchange.h b/src/lib/cql/cql_exchange.h index f30413e6c8..5076c1136e 100644 --- a/src/lib/cql/cql_exchange.h +++ b/src/lib/cql/cql_exchange.h @@ -91,7 +91,7 @@ typedef AnyArray AnyCollection; /// @brief Binds a C++ object to a Cassandra statement's parameter. Used in all /// statements. -/// @param value the value to be set or retreived +/// @param value the value to be set or retrieved /// @param index offset of the value being processed /// @param statement pointer to the parent statement being used typedef CassError (*CqlBindFunction)(const boost::any& value, @@ -99,7 +99,7 @@ typedef CassError (*CqlBindFunction)(const boost::any& value, CassStatement* statement); /// @brief Sets a member in a UDT. Used in INSERT & UPDATE statements. -/// @param value the value to be set or retreived +/// @param value the value to be set or retrieved /// @param index offset of the value being processed /// @param cass_user_type pointer to the user type that uses this member typedef CassError (*CqlUdtSetFunction)(const boost::any& value, @@ -216,9 +216,9 @@ public: /// @param column_count number of columns queried /// /// On insert, a false [applied] means there is a duplicate entry with the - /// same priumary key. + /// same primary key. /// - /// @return true if statement has been succesfully applied, false otherwise + /// @return true if statement has been successfully applied, false otherwise bool statementApplied(CassFuture* future, size_t* row_count = NULL, size_t* column_count = NULL); diff --git a/src/lib/cql/testutils/cql_schema.cc b/src/lib/cql/testutils/cql_schema.cc index 2d763e5847..113600f2e3 100644 --- a/src/lib/cql/testutils/cql_schema.cc +++ b/src/lib/cql/testutils/cql_schema.cc @@ -33,7 +33,7 @@ validCqlConnectionString() { void destroyCqlSchema(bool show_err, bool force) { - // If force is true or wipeCqlData() fails, destory the schema. + // If force is true or wipeCqlData() fails, destroy the schema. if (force || (!softWipeEnabled()) || wipeCqlData(show_err)) { runCqlScript(DATABASE_SCRIPTS_DIR, "cql/dhcpdb_drop.cql", show_err); } diff --git a/src/lib/database/db_exceptions.h b/src/lib/database/db_exceptions.h index 1dd1c164f8..03736ce7b6 100644 --- a/src/lib/database/db_exceptions.h +++ b/src/lib/database/db_exceptions.h @@ -16,7 +16,7 @@ namespace db { /// /// Cassandra have a concept of mutation (any statement that does change the /// data, like INSERT, UPDATE or DELETE). Under certain conditions it may be -/// possible that those statesments may fail to apply. +/// possible that those statements may fail to apply. class StatementNotApplied : public Exception { public: StatementNotApplied(const char* file, size_t line, const char* what) diff --git a/src/lib/database/db_messages.mes b/src/lib/database/db_messages.mes index c6206532c2..efc6885ea0 100644 --- a/src/lib/database/db_messages.mes +++ b/src/lib/database/db_messages.mes @@ -36,7 +36,7 @@ the committal may not include a write to disk. % DATABASE_MYSQL_FATAL_ERROR Unrecoverable MySQL error occurred: %1 for <%2>, reason: %3 (error code: %4). An error message indicating that communication with the MySQL database server has been lost. If automatic recovery has been enabled, then the server will -attempt to recover connectivity. If not the server wil exit with a +attempt to recover connectivity. If not, then the server will exit with a non-zero exit code. The cause of such an error is most likely a network issue or the MySQL server has gone down. @@ -68,7 +68,7 @@ unlikely to occur or negatively impact server operation. % DATABASE_PGSQL_FATAL_ERROR Unrecoverable PostgreSQL error occurred: Statement: <%1>, reason: %2 (error code: %3). An error message indicating that communication with the PostgreSQL database server has been lost. If automatic recovery has been enabled, then the server will -attempt to recover the connectivity. If not the server wil exit with a +attempt to recover the connectivity. If not, then the server will exit with a non-zero exit code. The cause of such an error is most likely a network issue or the PostgreSQL server has gone down. diff --git a/src/lib/database/server_selector.h b/src/lib/database/server_selector.h index 99a5d10971..ccd23c3968 100644 --- a/src/lib/database/server_selector.h +++ b/src/lib/database/server_selector.h @@ -24,9 +24,9 @@ namespace db { /// In the latter case, a subnet may be associated with a subset of /// servers or all servers. An administrator may also add the /// configuration data into the database and do not associate this data -/// with any patrticular server. +/// with any particular server. /// -/// When fetching the configuration data from a databse or when storing +/// When fetching the configuration data from a database or when storing /// data in the database there is a need to specify which servers this /// data is associated with. The @c ServerSelector class represents /// such associations. diff --git a/src/lib/dhcp/classify.h b/src/lib/dhcp/classify.h index 727e0cc402..83e7fce918 100644 --- a/src/lib/dhcp/classify.h +++ b/src/lib/dhcp/classify.h @@ -21,7 +21,7 @@ /// exposure of the DHCP library to server side concepts such as client /// classification the classes herein provide a mechanism to maintain lists /// of class names, rather than the classes they represent. It is the -/// upper layers' perogative to use these names as they see fit. +/// upper layers' prerogative to use these names as they see fit. /// /// @todo This file should be moved to dhcpsrv eventually as the classification /// is server side concept. Client has no notion of classifying incoming server diff --git a/src/lib/dhcp/duid_factory.cc b/src/lib/dhcp/duid_factory.cc index 6bc7b2293b..b01120502c 100644 --- a/src/lib/dhcp/duid_factory.cc +++ b/src/lib/dhcp/duid_factory.cc @@ -123,7 +123,7 @@ DUIDFactory::createEN(const uint32_t enterprise_id, // We'll need DUID stored in the file to compare it against the // new configuration. If the new configuration indicates that some // bits of the DUID should be generated we'll first try to use the - // values stored in the file to prvent DUID from changing if possible. + // values stored in the file to prevent DUID from changing if possible. readFromFile(); uint32_t enterprise_id_current = 0; @@ -190,7 +190,7 @@ DUIDFactory::createLL(const uint16_t htype, // We'll need DUID stored in the file to compare it against the // new configuration. If the new configuration indicates that some // bits of the DUID should be generated we'll first try to use the - // values stored in the file to prvent DUID from changing if possible. + // values stored in the file to prevent DUID from changing if possible. readFromFile(); uint16_t htype_current = 0; diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc index 99f4370398..d031aa82d2 100644 --- a/src/lib/dhcp/iface_mgr.cc +++ b/src/lib/dhcp/iface_mgr.cc @@ -532,7 +532,7 @@ IfaceMgr::openSockets4(const uint16_t port, const bool use_bcast, // that the interface configuration is valid and that the interface // is not a loopback interface. In both cases, we want to report // that the socket will not be opened. - // Relax the check when the loopback interface was explicitely + // Relax the check when the loopback interface was explicitly // allowed if (iface->flag_loopback_ && !allow_loopback_) { IFACEMGR_ERROR(SocketConfigError, error_handler, @@ -661,7 +661,7 @@ IfaceMgr::openSockets6(const uint16_t port, // that the interface configuration is valid and that the interface // is not a loopback interface. In both cases, we want to report // that the socket will not be opened. - // Relax the check when the loopback interface was explicitely + // Relax the check when the loopback interface was explicitly // allowed if (iface->flag_loopback_ && !allow_loopback_) { IFACEMGR_ERROR(SocketConfigError, error_handler, @@ -743,7 +743,7 @@ IfaceMgr::startDHCPReceiver(const uint16_t family) { switch (family) { case AF_INET: // If the queue doesn't exist, packet queing has been configured - // as disabled. If there is no queue, we do not create a reciever. + // as disabled. If there is no queue, we do not create a receiver. if(!getPacketQueue4()) { return; } @@ -753,7 +753,7 @@ IfaceMgr::startDHCPReceiver(const uint16_t family) { break; case AF_INET6: // If the queue doesn't exist, packet queing has been configured - // as disabled. If there is no queue, we do not create a reciever. + // as disabled. If there is no queue, we do not create a receiver. if(!getPacketQueue6()) { return; } @@ -1676,7 +1676,7 @@ IfaceMgr::receiveDHCP4Packets() { // zero out the errno to be safe. errno = 0; - // Select with null timeouts to wait indefinetly an event + // Select with null timeouts to wait indefinitely an event int result = select(maxfd + 1, &rd_set, 0, 0, 0); // Re-check the watch socket. diff --git a/src/lib/dhcp/iface_mgr.h b/src/lib/dhcp/iface_mgr.h index 4e72f47463..9d0ba3d089 100644 --- a/src/lib/dhcp/iface_mgr.h +++ b/src/lib/dhcp/iface_mgr.h @@ -1000,7 +1000,7 @@ public: /// This method opens sockets only on interfaces which have the /// @c inactive4_ field set to false (are active). If the interface is active /// but it is not running, it is down, or is a loopback interface when - /// oopback is not allowed, an error is reported. + /// loopback is not allowed, an error is reported. /// /// The type of the socket being open depends on the selected Packet Filter /// represented by a class derived from @c isc::dhcp::PktFilter abstract diff --git a/src/lib/dhcp/iface_mgr_linux.cc b/src/lib/dhcp/iface_mgr_linux.cc index 03347a58dd..4c6794a475 100644 --- a/src/lib/dhcp/iface_mgr_linux.cc +++ b/src/lib/dhcp/iface_mgr_linux.cc @@ -402,7 +402,7 @@ void Netlink::release_list(NetlinkMessages& messages) { delete[] (*msg); } - // ang get rid of the message pointers as well + // and get rid of the message pointers as well messages.clear(); } diff --git a/src/lib/dhcp/libdhcp++.h b/src/lib/dhcp/libdhcp++.h index f30232f6ed..eb57d66ad7 100644 --- a/src/lib/dhcp/libdhcp++.h +++ b/src/lib/dhcp/libdhcp++.h @@ -183,7 +183,7 @@ public: /// @ref Pkt4::pack(). That call leads to it being called recursively in /// @ref Option::packOptions(). Thus the logic used to output the /// message type should only be executed by the top-most. This is governed - /// by the paramater top, below. + /// by the parameter top, below. /// /// @param buf output buffer (assembled options will be stored here) /// @param options collection of options to store to diff --git a/src/lib/dhcp/option.h b/src/lib/dhcp/option.h index e79a651698..c7d02a17e3 100644 --- a/src/lib/dhcp/option.h +++ b/src/lib/dhcp/option.h @@ -47,7 +47,7 @@ typedef boost::shared_ptr OptionCollectionPtr; /// unpacking efforts and allow the server to attempt to process /// the packet as it stands. In other words, the option that failed /// is perhaps optional, and rather than drop the packet as unusable -/// we wish to attempt to proces it. +/// we wish to attempt to process it. class SkipRemainingOptionsError : public Exception { public: SkipRemainingOptionsError (const char* file, size_t line, const char* what) : diff --git a/src/lib/dhcp/option6_auth.cc b/src/lib/dhcp/option6_auth.cc index 04b8b5f930..1f14aaae4a 100644 --- a/src/lib/dhcp/option6_auth.cc +++ b/src/lib/dhcp/option6_auth.cc @@ -49,7 +49,7 @@ Option6Auth::pack(isc::util::OutputBuffer& buf) const { buf.writeUint16(11 + uint16_t(auth_info_.size())); // protocol 1 byte buf.writeUint8(protocol_); - // algoritm 1 byte + // algorithm 1 byte buf.writeUint8(algorithm_); // replay detection method buf.writeUint8(rdm_method_); @@ -76,7 +76,7 @@ Option6Auth::packHashInput(isc::util::OutputBuffer& buf) const { buf.writeUint16(OPTION6_AUTH_MIN_LEN + OPTION6_HASH_MSG_LEN); // protocol 1 byte buf.writeUint8(protocol_); - // algoritm 1 byte + // algorithm 1 byte buf.writeUint8(algorithm_); // replay detection method buf.writeUint8(rdm_method_); diff --git a/src/lib/dhcp/option6_auth.h b/src/lib/dhcp/option6_auth.h index 1a442a7147..83292249a5 100644 --- a/src/lib/dhcp/option6_auth.h +++ b/src/lib/dhcp/option6_auth.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace isc { namespace dhcp { @@ -29,7 +29,7 @@ class Option6Auth: public Option { public: static const uint8_t OPTION6_AUTH_MIN_LEN = 11; static const uint8_t OPTION6_HASH_MSG_LEN = 16; - static const uint8_t OPTION6_HDR = 4; + static const uint8_t OPTION6_HDR = 4; /// @brief Constructor, used for auth options while transmitting /// /// @param proto protocol type @@ -49,7 +49,7 @@ public: /// @param buf buffer (option will be stored here) void pack(isc::util::OutputBuffer& buf) const; - /// Writes option in wire-format to buf, for computing hash + /// Writes option in wire-format to buf, for computing hash /// auth info filled with 0 for a length of 128 bits /// returns with pointer to first unused /// byte after stored option. @@ -78,9 +78,9 @@ public: /// @param proto protocol type to be set void setProtocol(uint8_t proto) { protocol_ = proto; } - /// Set hash alogrithm type + /// Set hash algorithm type /// - /// @param algo hash alogrithm type to be set + /// @param algo hash algorithm type to be set void setHashAlgo(uint8_t algo) { algorithm_ = algo; } /// Set replay detection method type @@ -93,7 +93,7 @@ public: /// @param value replay detection method value to be set void setReplyDetectionValue(uint64_t value) { rdm_value_ = value; } - /// Set authentication information + /// Set authentication information /// /// @param auth_info authentication information to be set void setAuthInfo(const std::vector& auth_info) { auth_info_ = auth_info; } @@ -113,31 +113,31 @@ public: /// @return replay detection method type value uint8_t getReplyDetectionMethod() const { return rdm_method_; } - /// Return replay detection mechanism + /// Return replay detection mechanism /// /// @return replay detection method value uint64_t getReplyDetectionValue() const { return rdm_value_; } - - /// Return authentication information + + /// Return authentication information /// /// @return authentication information value std::vector getAuthInfo() const { return auth_info_; } protected: - /// keeps protocol type + /// keeps protocol type uint8_t protocol_; - + /// keeps hash algorithm value uint8_t algorithm_; - + /// keeps replay detection method type uint8_t rdm_method_; - + /// keeps replay detection method value uint64_t rdm_value_; - + /// keeps authentication information - std::vector auth_info_; + std::vector auth_info_; }; } // isc::dhcp namespace diff --git a/src/lib/dhcp/packet_queue_mgr.h b/src/lib/dhcp/packet_queue_mgr.h index 4acac274bb..4b7fe99441 100644 --- a/src/lib/dhcp/packet_queue_mgr.h +++ b/src/lib/dhcp/packet_queue_mgr.h @@ -30,7 +30,7 @@ public: /// @brief Packet Queue Managers (PQM). /// -/// Base class to manage the registry of packet queue implemenations +/// Base class to manage the registry of packet queue implementations /// and the creation of and access to the current packet queue. /// /// @tparam PacktQueueTypePtr Base type of packet queues managed by @@ -41,7 +41,7 @@ public: /// @brief Defines the type of the packet queue factory function. /// /// Factory function returns a pointer to the instance of the packet - /// queue created. + /// queue created. typedef std::function Factory; /// @brief Constructor. diff --git a/src/lib/dhcp/packet_queue_ring.h b/src/lib/dhcp/packet_queue_ring.h index fd9f82f3fd..a839137512 100644 --- a/src/lib/dhcp/packet_queue_ring.h +++ b/src/lib/dhcp/packet_queue_ring.h @@ -90,7 +90,7 @@ public: /// provides an opportunity to examine and discard packets from /// the queue prior to dequeuing the next packet to be /// processed. Derivations are expected to provide implementations - /// based on their own requirements. The default implemenation is to + /// based on their own requirements. The default implementation is to /// to simply return without skipping any packets. /// /// @return The number of packets discarded. diff --git a/src/lib/dhcp/pkt_filter6.h b/src/lib/dhcp/pkt_filter6.h index 0474c888c1..68b85f227c 100644 --- a/src/lib/dhcp/pkt_filter6.h +++ b/src/lib/dhcp/pkt_filter6.h @@ -59,7 +59,7 @@ class Iface; /// on sockets must be simulated. /// /// @note This class is named after @c PktFilter abstract class which exposes -/// similar interface for DHVPv4. However, the PktFilter class is devoted to +/// similar interface for DHCPv4. However, the PktFilter class is devoted to /// solve the problem of sending DHCPv4 messages to the hosts which don't have /// an IP address yet (a.k.a. direct DHCPv4 traffic). Where required, the /// custom implementations of @c PktFilter are provided to send and receive diff --git a/src/lib/dhcp/std_option_defs.h b/src/lib/dhcp/std_option_defs.h index 05c2f4810f..4e9e7d5472 100644 --- a/src/lib/dhcp/std_option_defs.h +++ b/src/lib/dhcp/std_option_defs.h @@ -277,7 +277,7 @@ const OptionDefParams STANDARD_V4_OPTION_DEFINITIONS[] = { OPT_FQDN_TYPE, true, NO_RECORD_DEF, "" }, { "bcms-controller-address", DHO_BCMCS_IPV4_ADDR, DHCP4_OPTION_SPACE, OPT_IPV4_ADDRESS_TYPE, true, NO_RECORD_DEF, "" }, - // Unfortunatelly the AUTHENTICATE option contains a 64-bit + // Unfortunately the AUTHENTICATE option contains a 64-bit // data field called 'replay-detection' that can't be added // as a record field to a custom option. Also, there is no // dedicated option class to handle it so we simply return diff --git a/src/lib/dhcp/tests/iface_mgr_unittest.cc b/src/lib/dhcp/tests/iface_mgr_unittest.cc index 062f994217..daa5970f13 100644 --- a/src/lib/dhcp/tests/iface_mgr_unittest.cc +++ b/src/lib/dhcp/tests/iface_mgr_unittest.cc @@ -46,7 +46,7 @@ namespace { // "eth0" or "eth1". // Name of loopback interface detection. const size_t BUF_SIZE = 32; -// Can be overwriten to "lo0" for instance on BSD systems. +// Can be overwritten to "lo0" for instance on BSD systems. char LOOPBACK_NAME[BUF_SIZE] = "lo"; // In fact is never 0, 1 is by far the most likely. uint32_t LOOPBACK_INDEX = 0; @@ -453,7 +453,7 @@ public: /// @param errmsg An error string indicating the reason for failure. void ifaceMgrErrorHandler(const std::string&) { // Increase the counter of invocations to this function. By checking - // this number, a test amy check if the expected number of errors + // this number, a test may check if the expected number of errors // has occurred. ++errors_count_; } @@ -749,7 +749,7 @@ public: // Now check whether the second callback is still functional EXPECT_EQ(38, write(secondpipe[1], "Hi, this is a message sent over a pipe", 38)); - // Call recevie4 again, this should work. + // Call receive4 again, this should work. ASSERT_NO_THROW(pkt4 = ifacemgr->receive4(RECEIVE_WAIT_MS(10))); // Should have callback2 data only. @@ -836,7 +836,7 @@ public: // Now check whether the second callback is still functional EXPECT_EQ(38, write(secondpipe[1], "Hi, this is a message sent over a pipe", 38)); - // Call recevie6 again, this should work. + // Call receive6 again, this should work. ASSERT_NO_THROW(pkt6 = ifacemgr->receive6(RECEIVE_WAIT_MS(10))); // Should have callback2 data only. diff --git a/src/lib/dhcp/tests/libdhcp++_unittest.cc b/src/lib/dhcp/tests/libdhcp++_unittest.cc index 51f5ea20ea..3e63cd7b38 100644 --- a/src/lib/dhcp/tests/libdhcp++_unittest.cc +++ b/src/lib/dhcp/tests/libdhcp++_unittest.cc @@ -1116,7 +1116,7 @@ TEST_F(LibDhcpTest, unpackPadEnd) { EXPECT_EQ("foo", sub->getValue()); } -// Verfies that option 0 (PAD) is handled as PAD in option 43 (so when +// Verifies that option 0 (PAD) is handled as PAD in option 43 (so when // flexible pad end flag is true) only when option 0 (PAD) is not defined. TEST_F(LibDhcpTest, option43Pad) { string space = "my-option43-space"; @@ -1197,7 +1197,7 @@ TEST_F(LibDhcpTest, option43Pad) { EXPECT_EQ(1, sub2->getValue()); } -// Verfies that option 255 (END) is handled as END in option 43 (so when +// Verifies that option 255 (END) is handled as END in option 43 (so when //flexible pad end flag is true) only when option 255 (END) is not defined. TEST_F(LibDhcpTest, option43End) { string space = "my-option43-space"; diff --git a/src/lib/dhcp/tests/option_string_unittest.cc b/src/lib/dhcp/tests/option_string_unittest.cc index 0020a7878a..7c98b160d3 100644 --- a/src/lib/dhcp/tests/option_string_unittest.cc +++ b/src/lib/dhcp/tests/option_string_unittest.cc @@ -56,7 +56,7 @@ TEST_F(OptionStringTest, constructorFromString) { // will result in an exception. EXPECT_THROW(OptionString(Option::V6, 123, ""), isc::OutOfRange); - // Check that an attempt to use string containgin only nulls + // Check that an attempt to use string containing only nulls // in the constructor will result in an exception. std::string nulls{"\0\0",2}; EXPECT_THROW(OptionString(Option::V6, 123, nulls), isc::OutOfRange); diff --git a/src/lib/dhcp/tests/packet_queue4_unittest.cc b/src/lib/dhcp/tests/packet_queue4_unittest.cc index edc75ca49f..2e2c3c0e2a 100644 --- a/src/lib/dhcp/tests/packet_queue4_unittest.cc +++ b/src/lib/dhcp/tests/packet_queue4_unittest.cc @@ -22,7 +22,7 @@ namespace { /// @brief DHCPv4 queue with implements drop and eat logic /// /// This class derives from the default DHCPv4 ring queue -/// and provies implementations for shouldDropPacket() and +/// and provides implementations for shouldDropPacket() and /// eatPackets(). This permits a full exercising of the /// PacketQueue interface as well as the basic v4 ring queue /// mechanics. diff --git a/src/lib/dhcp/tests/packet_queue6_unittest.cc b/src/lib/dhcp/tests/packet_queue6_unittest.cc index 087b0bfc58..abec5861cf 100644 --- a/src/lib/dhcp/tests/packet_queue6_unittest.cc +++ b/src/lib/dhcp/tests/packet_queue6_unittest.cc @@ -23,7 +23,7 @@ namespace { /// @brief DHCPv6 queue with implements drop and eat logic /// /// This class derives from the default DHCPv6 ring queue -/// and provies implementations for shouldDropPacket() and +/// and provides implementations for shouldDropPacket() and /// eatPackets(). This permits a full exercising of the /// PacketQueue interface as well as the basic v6 ring queue /// mechanics. diff --git a/src/lib/dhcp/tests/packet_queue_mgr4_unittest.cc b/src/lib/dhcp/tests/packet_queue_mgr4_unittest.cc index 4ad6e279b5..3790cfa8f2 100644 --- a/src/lib/dhcp/tests/packet_queue_mgr4_unittest.cc +++ b/src/lib/dhcp/tests/packet_queue_mgr4_unittest.cc @@ -20,7 +20,7 @@ using namespace isc::dhcp::test; /// @brief Convenience function for construction a dhcp-queue-control element map /// -/// @param queue_type logical name of the queue implemenation type +/// @param queue_type logical name of the queue implementation type /// @param capacity maximum queue capacity /// @param enable_queue bool value to ascribe to the 'enable-queue' parameter, defaults to true data::ElementPtr @@ -112,7 +112,7 @@ TEST_F(PacketQueueMgr4Test, defaultQueue) { << default_queue_type_ << "\", \"size\": 0 }"); } -// Verifies that PQM registry and creation of custome queue implementations. +// Verifies that PQM registry and creation of custom queue implementations. TEST_F(PacketQueueMgr4Test, customQueueType) { // Verify that we cannot create a queue for a non-existant type diff --git a/src/lib/dhcp/tests/packet_queue_mgr6_unittest.cc b/src/lib/dhcp/tests/packet_queue_mgr6_unittest.cc index a24472f0b8..754d50ed52 100644 --- a/src/lib/dhcp/tests/packet_queue_mgr6_unittest.cc +++ b/src/lib/dhcp/tests/packet_queue_mgr6_unittest.cc @@ -101,7 +101,7 @@ TEST_F(PacketQueueMgr6Test, defaultQueue) { << default_queue_type_ << "\", \"size\": 0 }"); } -// Verifies that PQM registry and creation of custome queue implementations. +// Verifies that PQM registry and creation of custom queue implementations. TEST_F(PacketQueueMgr6Test, customQueueType) { // Verify that we cannot create a queue for a non-existant type diff --git a/src/lib/dhcp/tests/pkt4_unittest.cc b/src/lib/dhcp/tests/pkt4_unittest.cc index 767a8fb70d..3f1a52239a 100644 --- a/src/lib/dhcp/tests/pkt4_unittest.cc +++ b/src/lib/dhcp/tests/pkt4_unittest.cc @@ -856,7 +856,7 @@ TEST_F(Pkt4Test, hwaddr) { EXPECT_TRUE(hwaddr == pkt->getHWAddr()); } -// This test verifies that the packet remte and local HW address can +// This test verifies that the packet remote and local HW address can // be set and returned. TEST_F(Pkt4Test, hwaddrSrcRemote) { scoped_ptr pkt(new Pkt4(DHCPOFFER, 1234)); @@ -1312,7 +1312,7 @@ TEST_F(Pkt4Test, nullTerminatedOptions) { pkt->pack() ); - // Create a vector of our expectd packed option data. + // Create a vector of our expected packed option data. vector packed_opts = { DHO_HOST_NAME, 3, 't', 'w', 'o', diff --git a/src/lib/dhcp/tests/pkt_captures.h b/src/lib/dhcp/tests/pkt_captures.h index 9e93ef04bf..e4ad760b09 100644 --- a/src/lib/dhcp/tests/pkt_captures.h +++ b/src/lib/dhcp/tests/pkt_captures.h @@ -57,7 +57,7 @@ public: /// @brief returns captured DISCOVER from Genexis hardware. /// - /// This device in uncommon, because it doesn't send VIVSO in Dicover, but + /// This device in uncommon, because it doesn't send VIVSO in Discover, but /// expects one in Offer. /// @return DISCOVER. static isc::dhcp::Pkt4Ptr discoverGenexis(); diff --git a/src/lib/dhcp_ddns/ncr_msg.h b/src/lib/dhcp_ddns/ncr_msg.h index 0acab2bb48..f6fafe212a 100644 --- a/src/lib/dhcp_ddns/ncr_msg.h +++ b/src/lib/dhcp_ddns/ncr_msg.h @@ -290,7 +290,7 @@ public: /// @brief Instance method for marshalling the contents of the request /// into the given buffer in the given format. /// - /// Whe the format is: + /// When the format is: /// /// JSON: Upon completion, the buffer will contain a two byte unsigned /// integer which specifies the length of the JSON text; followed by the diff --git a/src/lib/dhcpsrv/alloc_engine.h b/src/lib/dhcpsrv/alloc_engine.h index 670066664c..fe2860bd7f 100644 --- a/src/lib/dhcpsrv/alloc_engine.h +++ b/src/lib/dhcpsrv/alloc_engine.h @@ -1833,7 +1833,7 @@ private: protected: /// @brief Stores additional client query parameters on a V4 lease /// - /// Extended features such as LeaseQuery require addtional parameters + /// Extended features such as LeaseQuery require additional parameters /// to be stored for each lease, than we would otherwise retain. /// This function adds that information to the lease's user-context. /// (Note it is protected to facilitate unit testing). @@ -1853,7 +1853,7 @@ protected: /// @brief Stores additional client query parameters on a V6 lease /// /// Extended features such as LeaseQuery and Reconfigure require - /// addtional parameters to be stored for each lease, than we would + /// additional parameters to be stored for each lease, than we would /// otherwise retain. This function adds that information to the /// lease's user-context. /// (Note it is protected to facilitate unit testing). diff --git a/src/lib/dhcpsrv/benchmarks/parameters.h b/src/lib/dhcpsrv/benchmarks/parameters.h index c8f93524ba..020cac6304 100644 --- a/src/lib/dhcpsrv/benchmarks/parameters.h +++ b/src/lib/dhcpsrv/benchmarks/parameters.h @@ -16,7 +16,7 @@ namespace bench { /// @defgroup benchmark_params Benchmark parameters that define boundary values /// for benchmarks. /// -/// The range is defined as 512..65533. Google benchmark will pick a few specifc +/// The range is defined as 512..65533. Google benchmark will pick a few specific /// values: 512, 4096, 32768, 65533. /// @{ diff --git a/src/lib/dhcpsrv/callout_handle_store.h b/src/lib/dhcpsrv/callout_handle_store.h index ccef4355f2..59764e1ff9 100644 --- a/src/lib/dhcpsrv/callout_handle_store.h +++ b/src/lib/dhcpsrv/callout_handle_store.h @@ -54,7 +54,7 @@ isc::hooks::CalloutHandlePtr getCalloutHandle(const T& pktptr) { return (isc::hooks::CalloutHandlePtr()); } -} // namespace shcp +} // namespace dhcp } // namespace isc #endif // CALLOUT_HANDLE_STORE_H diff --git a/src/lib/dhcpsrv/cfg_iface.cc b/src/lib/dhcpsrv/cfg_iface.cc index 46d580a8d5..5c47516ee9 100644 --- a/src/lib/dhcpsrv/cfg_iface.cc +++ b/src/lib/dhcpsrv/cfg_iface.cc @@ -81,7 +81,7 @@ CfgIface::openSockets(const uint16_t family, const uint16_t port, // inactive state. We will later enable them selectively using the // interface names specified by the user. If wildcard interface was // specified, mark all interfaces active. Mark loopback inactive when - // not explicitely allowed. + // not explicitly allowed. setState(family, !wildcard_used_, !loopback_used_); IfaceMgr& iface_mgr = IfaceMgr::instance(); // Remove selection of unicast addresses from all interfaces. diff --git a/src/lib/dhcpsrv/config_backend_dhcp6.h b/src/lib/dhcpsrv/config_backend_dhcp6.h index dc4f6833f7..ffa19da5db 100644 --- a/src/lib/dhcpsrv/config_backend_dhcp6.h +++ b/src/lib/dhcpsrv/config_backend_dhcp6.h @@ -424,7 +424,7 @@ public: /// @param server_selector Server selector. /// @param pd_pool_prefix Address part of the prefix of the prefix /// delegation pool to which the option belongs. - /// @param pd_pool_prefix_length Prefix length of the prefix delegayion + /// @param pd_pool_prefix_length Prefix length of the prefix delegation /// pool to which the option belongs. /// @param option Option to be added or updated. virtual void diff --git a/src/lib/dhcpsrv/cql_host_data_source.cc b/src/lib/dhcpsrv/cql_host_data_source.cc index ff4f76e738..2c74136159 100644 --- a/src/lib/dhcpsrv/cql_host_data_source.cc +++ b/src/lib/dhcpsrv/cql_host_data_source.cc @@ -209,7 +209,7 @@ public: /// values which uniquely determine an entry in the table. Uses FNV-1a /// on 64 bits. /// - /// The primary key clustering column aggregates: host_dentifier, + /// The primary key clustering column aggregates: host_identifier, /// host_identifier_type, host_ipv4_subnet_id, host_ipv6_subnet_id, /// host_ipv4_address, reserved_ipv6_prefix_address, /// reserved_ipv6_prefix_length, option_code, option_space. @@ -217,14 +217,14 @@ public: /// @brief Create unique key for storage in table key. /// - /// The primary key partition key aggregates: host_dentifier, + /// The primary key partition key aggregates: host_identifier, /// host_identifier_type, host_ipv4_subnet_id, host_ipv6_subnet_id, /// host_ipv4_address uint64_t hashIntoKey() const; /// @brief Create unique key string for a host. /// - /// The primary key partition key aggregates: host_dentifier, + /// The primary key partition key aggregates: host_identifier, /// host_identifier_type, host_ipv4_subnet_id, host_ipv6_subnet_id, /// host_ipv4_address std::string hostKey() const; @@ -384,7 +384,7 @@ private: /// Pointer to Host object holding information being inserted into database. HostPtr host_; - /// @brief Primary key. Partition key. Aggregates: host_dentifier, + /// @brief Primary key. Partition key. Aggregates: host_identifier, /// host_identifier_type, host_ipv4_subnet_id host_ipv6_subnet_id, /// host_ipv4_address cass_int64_t key_; diff --git a/src/lib/dhcpsrv/cql_host_data_source.h b/src/lib/dhcpsrv/cql_host_data_source.h index f63b9e2538..5550a0e291 100644 --- a/src/lib/dhcpsrv/cql_host_data_source.h +++ b/src/lib/dhcpsrv/cql_host_data_source.h @@ -73,7 +73,7 @@ public: /// - tcp-keepalive no /// - tcp-nodelay no /// - /// For details regarding those paraemters, see + /// For details regarding those parameters, see /// @ref isc::db::CqlConnection::openDatabase. /// /// Finally, all the CQL commands are pre-compiled. @@ -109,7 +109,7 @@ public: /// /// This method supports both v4 and v6. /// - /// @param subnet_id subnet identfier. + /// @param subnet_id subnet identifier. /// @param addr specified address. /// @return true if deletion was successful, false if the host was not /// there. diff --git a/src/lib/dhcpsrv/cql_lease_mgr.cc b/src/lib/dhcpsrv/cql_lease_mgr.cc index 50d2ec2e17..a778ff647e 100644 --- a/src/lib/dhcpsrv/cql_lease_mgr.cc +++ b/src/lib/dhcpsrv/cql_lease_mgr.cc @@ -1730,7 +1730,7 @@ public: /// @brief Constructor to query for the stats for a range of subnets /// /// The query created will return statistics for the inclusive range of - /// subnets described by first and last sunbet IDs. + /// subnets described by first and last subnet IDs. /// /// @param conn An open connection to the database housing the lease data /// @param statement The lease data SQL prepared statement tag to execute diff --git a/src/lib/dhcpsrv/csv_lease_file4.h b/src/lib/dhcpsrv/csv_lease_file4.h index 3e102df8ec..9b9038ebc9 100644 --- a/src/lib/dhcpsrv/csv_lease_file4.h +++ b/src/lib/dhcpsrv/csv_lease_file4.h @@ -30,7 +30,7 @@ namespace dhcp { /// The @c Lease4 is a structure that should be itself responsible for this /// validation (see http://oldkea.isc.org/ticket/2405). However, when #2405 /// is implemented, the @c next function may need to be updated to use the -/// validation capablity of @c Lease4. +/// validation capability of @c Lease4. class CSVLeaseFile4 : public isc::util::VersionedCSVFile, public LeaseFileStats { public: diff --git a/src/lib/dhcpsrv/csv_lease_file6.h b/src/lib/dhcpsrv/csv_lease_file6.h index 3e0e989213..071a4be2eb 100644 --- a/src/lib/dhcpsrv/csv_lease_file6.h +++ b/src/lib/dhcpsrv/csv_lease_file6.h @@ -29,7 +29,7 @@ namespace dhcp { /// The @c Lease6 is a structure that should be itself responsible for this /// validation (see http://oldkea.isc.org/ticket/2405). However, when #2405 /// is implemented, the @c next function may need to be updated to use the -/// validation capablity of @c Lease6. +/// validation capability of @c Lease6. class CSVLeaseFile6 : public isc::util::VersionedCSVFile, public LeaseFileStats { public: diff --git a/src/lib/dhcpsrv/d2_client_mgr.h b/src/lib/dhcpsrv/d2_client_mgr.h index 4500e2b319..61e0621461 100644 --- a/src/lib/dhcpsrv/d2_client_mgr.h +++ b/src/lib/dhcpsrv/d2_client_mgr.h @@ -148,7 +148,7 @@ public: /// @param client_n N Flag from the client's FQDN /// @param server_s [out] S Flag for the server's FQDN /// @param server_n [out] N Flag for the server's FQDN - /// @param ddns_params DDNS behaviorial configuration parameters + /// @param ddns_params DDNS behavioral configuration parameters /// /// @throw isc::BadValue if client_s and client_n are both 1 as this is /// an invalid combination per RFCs. @@ -168,7 +168,7 @@ public: /// ('.' for IPv4 or ':' for IPv6) replaced with a hyphen, '-'. /// /// @param address IP address from which to derive the name (IPv4 or IPv6) - /// @param ddns_params DDNS behaviorial configuration parameters + /// @param ddns_params DDNS behavioral configuration parameters /// @param trailing_dot A boolean value which indicates whether trailing /// dot should be appended (if true) or not (false). /// @@ -185,7 +185,7 @@ public: /// .. /// /// @param partial_name domain name to qualify - /// @param ddns_params DDNS behaviorial configuration parameters + /// @param ddns_params DDNS behavioral configuration parameters /// @param trailing_dot A boolean value which when true guarantees the /// result will end with a "." and when false that the result will not /// end with a "." Note that this rule is applied even if the qualifying @@ -205,7 +205,7 @@ public: /// /// @param fqdn FQDN option from which to read client (inbound) flags /// @param fqdn_resp FQDN option to update with the server (outbound) flags - /// @param ddns_params DDNS behaviorial configuration parameters + /// @param ddns_params DDNS behavioral configuration parameters /// @tparam T FQDN Option class containing the FQDN data such as /// dhcp::Option4ClientFqdn or dhcp::Option6ClientFqdn template @@ -256,7 +256,7 @@ public: /// /// @param fqdn FQDN option from which to get client (inbound) name /// @param fqdn_resp FQDN option to update with the adjusted name - /// @param ddns_params DDNS behaviorial configuration parameters + /// @param ddns_params DDNS behavioral configuration parameters /// @tparam T FQDN Option class containing the FQDN data such as /// dhcp::Option4ClientFqdn or dhcp::Option6ClientFqdn template @@ -276,8 +276,8 @@ public: /// @param io_service IOService to be used for sender IO event processing /// @warning It is up to the invoking layer to ensure the io_service /// instance used outlives the D2ClientMgr send mode. When the send mode - /// is exited, either explicitly by callind stopSender() or implicitly - /// through D2CLientMgr destruction, any ASIO objects such as sockets or + /// is exited, either explicitly by calling stopSender() or implicitly + /// through D2ClientMgr destruction, any ASIO objects such as sockets or /// timers will be closed and released. If the io_service goes out of scope /// first this behavior could be unpredictable. /// diff --git a/src/lib/dhcpsrv/free_lease_queue.cc b/src/lib/dhcpsrv/free_lease_queue.cc index ea664776d4..3d271ae512 100644 --- a/src/lib/dhcpsrv/free_lease_queue.cc +++ b/src/lib/dhcpsrv/free_lease_queue.cc @@ -218,7 +218,7 @@ FreeLeaseQueue::LeasesPtr FreeLeaseQueue::getLeases(const AddressRange& range) const { auto cont = ranges_.find(range.start_); if (cont == ranges_.end()) { - isc_throw(BadValue, "conatiner for the specified address range " << range.start_ + isc_throw(BadValue, "container for the specified address range " << range.start_ << ":" << range.end_ << " does not exist"); } return (cont->leases_); @@ -228,7 +228,7 @@ FreeLeaseQueue::LeasesPtr FreeLeaseQueue::getLeases(const PrefixRange& range) const { auto cont = ranges_.find(range.start_); if (cont == ranges_.end()) { - isc_throw(BadValue, "conatiner for the specified prefix " << range.start_ + isc_throw(BadValue, "container for the specified prefix " << range.start_ << " and delegated length of " << static_cast(range.delegated_length_) << " does not exist"); } @@ -238,7 +238,7 @@ FreeLeaseQueue::getLeases(const PrefixRange& range) const { FreeLeaseQueue::RangeDescriptor FreeLeaseQueue::getRangeDescriptor(const uint64_t range_index) const { if (ranges_.get<2>().size() <= range_index) { - isc_throw(BadValue, "conatiner for the specified range index " << range_index + isc_throw(BadValue, "container for the specified range index " << range_index << " does not exist"); } auto cont = ranges_.get<2>().at(range_index); diff --git a/src/lib/dhcpsrv/free_lease_queue.h b/src/lib/dhcpsrv/free_lease_queue.h index 3a44afd17e..f34f18ae70 100644 --- a/src/lib/dhcpsrv/free_lease_queue.h +++ b/src/lib/dhcpsrv/free_lease_queue.h @@ -268,7 +268,7 @@ public: uint64_t getRangeIndex(const RangeType& range) const { auto cont = ranges_.get<1>().find(range.start_); if (cont == ranges_.get<1>().end()) { - isc_throw(BadValue, "conatiner for the specified range " << range.start_ + isc_throw(BadValue, "container for the specified range " << range.start_ << ":" << range.end_ << " does not exist"); } return (std::distance(ranges_.get<2>().begin(), ranges_.project<2>(cont))); @@ -376,7 +376,7 @@ private: /// @throw BadValue if the range with the given index does not exist. RangeDescriptor getRangeDescriptor(const uint64_t range_index) const; - /// @brief This is internal implemenation of the @c next and @c pop + /// @brief This is internal implementation of the @c next and @c pop /// methods. /// /// @param range range for which next address is to be returned. diff --git a/src/lib/dhcpsrv/host.h b/src/lib/dhcpsrv/host.h index ad60da7c47..c2825973f7 100644 --- a/src/lib/dhcpsrv/host.h +++ b/src/lib/dhcpsrv/host.h @@ -108,7 +108,7 @@ public: /// /// Set the key value. // If the size is greater than 16 bytes, we resize to 16 bytes. - /// Doesnt throw an exception. + /// Doesn't throw an exception. /// @param key auth key in binary to be stored void setAuthKey(const std::vector& key); diff --git a/src/lib/dhcpsrv/host_mgr.h b/src/lib/dhcpsrv/host_mgr.h index 21ee69612a..e22146f4b6 100644 --- a/src/lib/dhcpsrv/host_mgr.h +++ b/src/lib/dhcpsrv/host_mgr.h @@ -661,7 +661,7 @@ protected: /// @brief Cache an answer. /// - /// @param host Pointer to the missied host. + /// @param host Pointer to the missed host. virtual void cache(ConstHostPtr host) const; /// @brief Cache a negative answer. diff --git a/src/lib/dhcpsrv/ip_range_permutation.h b/src/lib/dhcpsrv/ip_range_permutation.h index e671098705..a76ade3a4e 100644 --- a/src/lib/dhcpsrv/ip_range_permutation.h +++ b/src/lib/dhcpsrv/ip_range_permutation.h @@ -58,7 +58,7 @@ namespace dhcp { /// caller so we forget them. /// /// This algorithm guarantees that all IP addresses or delegated prefixes -/// beloging to the given range are returned and no duplicates are returned. +/// belonging to the given range are returned and no duplicates are returned. /// The addresses or delegated prefixes are returned in a random order. /// /// @todo Methods of this class should be called in thread safe context. Otherwise diff --git a/src/lib/dhcpsrv/lease.h b/src/lib/dhcpsrv/lease.h index ab7ab66c44..71f4a525dc 100644 --- a/src/lib/dhcpsrv/lease.h +++ b/src/lib/dhcpsrv/lease.h @@ -326,7 +326,7 @@ struct Lease4 : public Lease { /// @brief Constructor. /// /// @param address IPv4 address. - /// @param hw_address Pointer to client's HW addresss. + /// @param hw_address Pointer to client's HW address. /// @param client_id pointer to the client id structure. /// @param valid_lifetime Valid lifetime value. /// @param cltt Timestamp when the lease is acquired, renewed. diff --git a/src/lib/dhcpsrv/lease_mgr.h b/src/lib/dhcpsrv/lease_mgr.h index 1c8ca49a81..36227aa6e7 100644 --- a/src/lib/dhcpsrv/lease_mgr.h +++ b/src/lib/dhcpsrv/lease_mgr.h @@ -143,13 +143,13 @@ public: /// The query created will return statistics for a single subnet /// /// @param subnet_id id of the subnet for which stats are desired - /// @throw BadValue if sunbet_id given is 0. + /// @throw BadValue if subnet_id given is 0. LeaseStatsQuery(const SubnetID& subnet_id); /// @brief Constructor to query for the stats for a range of subnets /// /// The query created will return statistics for the inclusive range of - /// subnets described by first and last sunbet IDs. + /// subnets described by first and last subnet IDs. /// /// @param first_subnet_id first subnet in the range of subnets /// @param last_subnet_id last subnet in the range of subnets diff --git a/src/lib/dhcpsrv/mysql_host_data_source.cc b/src/lib/dhcpsrv/mysql_host_data_source.cc index 9961a788bd..3f91497e3f 100644 --- a/src/lib/dhcpsrv/mysql_host_data_source.cc +++ b/src/lib/dhcpsrv/mysql_host_data_source.cc @@ -1994,7 +1994,7 @@ public: /// @brief MySQL Host Context Pool /// /// This class provides a pool of contexts. -/// The manager will use this class to handle avalilable contexts. +/// The manager will use this class to handle available contexts. /// There is only one ContextPool per manager per back-end, which is created /// and destroyed by the respective manager factory class. class MySqlHostContextPool { diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc index 71e45bfb73..580a80e4cb 100644 --- a/src/lib/dhcpsrv/mysql_lease_mgr.cc +++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc @@ -1532,7 +1532,7 @@ public: /// @param statement_index Index of the query's prepared statement /// @param fetch_type Indicates if query supplies lease type /// @param subnet_id id of the subnet for which stats are desired - /// @throw BadValue if sunbet_id given is 0 or if statement index is invalid. + /// @throw BadValue if subnet_id given is 0 or if statement index is invalid. MySqlLeaseStatsQuery(MySqlConnection& conn, const size_t statement_index, const bool fetch_type, const SubnetID& subnet_id) : LeaseStatsQuery(subnet_id), conn_(conn), statement_index_(statement_index), @@ -1547,7 +1547,7 @@ public: /// @brief Constructor to query for the stats for a range of subnets /// /// The query created will return statistics for the inclusive range of - /// subnets described by first and last sunbet IDs. + /// subnets described by first and last subnet IDs. /// /// @param conn An open connection to the database housing the lease data /// @param statement_index Index of the query's prepared statement diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.h b/src/lib/dhcpsrv/mysql_lease_mgr.h index f3f8b80aec..bd35f5eb0d 100644 --- a/src/lib/dhcpsrv/mysql_lease_mgr.h +++ b/src/lib/dhcpsrv/mysql_lease_mgr.h @@ -67,7 +67,7 @@ typedef boost::shared_ptr MySqlLeaseContextPtr; /// @brief MySQL Lease Context Pool /// /// This class provides a pool of contexts. -/// The manager will use this class to handle avalilable contexts. +/// The manager will use this class to handle available contexts. /// There is only one ContextPool per manager per back-end, which is created /// and destroyed by the respective manager factory class. class MySqlLeaseContextPool { diff --git a/src/lib/dhcpsrv/network.h b/src/lib/dhcpsrv/network.h index d033bdba13..3a04014125 100644 --- a/src/lib/dhcpsrv/network.h +++ b/src/lib/dhcpsrv/network.h @@ -470,7 +470,7 @@ public: inheritance, "t1-percent")); } - /// @brief Sets new precentage for calculating T1 (renew timer). + /// @brief Sets new percentage for calculating T1 (renew timer). /// /// @param t1_percent New percentage to use. void setT1Percent(const util::Optional& t1_percent) { @@ -486,7 +486,7 @@ public: inheritance, "t2-percent")); } - /// @brief Sets new precentage for calculating T2 (rebind timer). + /// @brief Sets new percentage for calculating T2 (rebind timer). /// /// @param t2_percent New percentage to use. void setT2Percent(const util::Optional& t2_percent) { @@ -526,7 +526,7 @@ public: ddns_override_no_update_ = ddns_override_no_update; } - /// @brief Returns ddns-overridie-client-update + /// @brief Returns ddns-override-client-update /// /// @param inheritance inheritance mode to be used. util::Optional @@ -1105,7 +1105,7 @@ protected: /// Meaningful only if hostname_char_set_ is not empty. util::Optional hostname_char_replacement_; - /// @brief Should Kea store addtional client query data (e.g. relay-agent-info) + /// @brief Should Kea store additional client query data (e.g. relay-agent-info) /// on the lease. util::Optional store_extended_info_; diff --git a/src/lib/dhcpsrv/parsers/base_network_parser.cc b/src/lib/dhcpsrv/parsers/base_network_parser.cc index b372445421..23b42c02a5 100644 --- a/src/lib/dhcpsrv/parsers/base_network_parser.cc +++ b/src/lib/dhcpsrv/parsers/base_network_parser.cc @@ -290,7 +290,7 @@ BaseNetworkParser::parseDdnsParams(const data::ConstElementPtr& network_data, network->setHostnameCharReplacement(hostname_char_replacement); } - // We need to validate santizer values here so we can detect problems and + // We need to validate sanitizer values here so we can detect problems and // cause a configuration. We don't retain the compilation because it's not // something we can inherit. if (!hostname_char_set.empty()) { diff --git a/src/lib/dhcpsrv/parsers/client_class_def_parser.cc b/src/lib/dhcpsrv/parsers/client_class_def_parser.cc index f097f53eb8..f46f6793a1 100644 --- a/src/lib/dhcpsrv/parsers/client_class_def_parser.cc +++ b/src/lib/dhcpsrv/parsers/client_class_def_parser.cc @@ -258,7 +258,7 @@ ClientClassDefParser::checkParametersSupported(const ConstElementPtr& class_def_ "user-context", "only-if-required" }; - // The v4 client class supports additional parmeters. + // The v4 client class supports additional parameters. static std::set supported_params_v4 = { "option-def", "next-server", "server-hostname", diff --git a/src/lib/dhcpsrv/parsers/option_data_parser.h b/src/lib/dhcpsrv/parsers/option_data_parser.h index 13044c324b..c8cabce16d 100644 --- a/src/lib/dhcpsrv/parsers/option_data_parser.h +++ b/src/lib/dhcpsrv/parsers/option_data_parser.h @@ -96,7 +96,7 @@ private: /// literal, then it is converted into binary format. These literals /// may contain upper and lower case digits. They may be octets /// delimited by colons or spaces (octets may be 1 or 2 digits) - /// If not delimited octets then they must be a continous string of + /// If not delimited octets then they must be a continuous string of /// digits with or without a "0x" prefix. Examples: /// /// -# ab:cd:ef - colon delimited diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.cc b/src/lib/dhcpsrv/pgsql_host_data_source.cc index 95aa432172..6e6e91ff4c 100644 --- a/src/lib/dhcpsrv/pgsql_host_data_source.cc +++ b/src/lib/dhcpsrv/pgsql_host_data_source.cc @@ -1023,7 +1023,7 @@ public: " IPv6 reservation"); } - // If we have reservation id we havent' seen yet, retrieve the + // If we have reservation id we haven't seen yet, retrieve the // the reservation, adding it to the current host uint64_t reservation_id = getReservationId(r, row); if (reservation_id && (reservation_id > most_recent_reservation_id_)) { @@ -1356,7 +1356,7 @@ public: /// @brief PostgreSQL Host Context Pool /// /// This class provides a pool of contexts. -/// The manager will use this class to handle avalilable contexts. +/// The manager will use this class to handle available contexts. /// There is only one ContextPool per manager per back-end, which is created /// and destroyed by the respective manager factory class. class PgSqlHostContextPool { diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.cc b/src/lib/dhcpsrv/pgsql_lease_mgr.cc index 5a9957817f..9fbc409a4b 100644 --- a/src/lib/dhcpsrv/pgsql_lease_mgr.cc +++ b/src/lib/dhcpsrv/pgsql_lease_mgr.cc @@ -1027,7 +1027,7 @@ public: /// @brief Constructor to query for the stats for a range of subnets /// /// The query created will return statistics for the inclusive range of - /// subnets described by first and last sunbet IDs. + /// subnets described by first and last subnet IDs. /// /// @param conn A open connection to the database housing the lease data /// @param statement The lease data SQL prepared statement to execute diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.h b/src/lib/dhcpsrv/pgsql_lease_mgr.h index f767111128..d2363baecb 100644 --- a/src/lib/dhcpsrv/pgsql_lease_mgr.h +++ b/src/lib/dhcpsrv/pgsql_lease_mgr.h @@ -66,7 +66,7 @@ typedef boost::shared_ptr PgSqlLeaseContextPtr; /// @brief PostgreSQL Lease Context Pool /// /// This class provides a pool of contexts. -/// The manager will use this class to handle avalilable contexts. +/// The manager will use this class to handle available contexts. /// There is only one ContextPool per manager per back-end, which is created /// and destroyed by the respective manager factory class. class PgSqlLeaseContextPool { diff --git a/src/lib/dhcpsrv/srv_config.h b/src/lib/dhcpsrv/srv_config.h index 63256c284d..5e66f79778 100644 --- a/src/lib/dhcpsrv/srv_config.h +++ b/src/lib/dhcpsrv/srv_config.h @@ -40,7 +40,7 @@ namespace dhcp { class CfgMgr; -/// @brief Convenience container for conveying DDNS behaviorial parameters +/// @brief Convenience container for conveying DDNS behavioral parameters /// It is intended to be created per Packet exchange using the selected /// subnet passed into functions that require them class DdnsParams { @@ -542,7 +542,7 @@ public: /// @brief Fetches the DDNS parameters for a given DHCPv4 subnet. /// /// Creates a DdnsParams structure which retain and thereafter - /// use the given subnet to fetch DDNS behaviorial parameters. + /// use the given subnet to fetch DDNS behavioral parameters. /// The values are fetched with the inheritance scope mode /// of Network::ALL. /// @@ -553,7 +553,7 @@ public: /// @brief Fetches the DDNS parameters for a given DHCPv6 subnet. /// /// Creates a DdnsParams structure which retain and thereafter - /// use the given subnet to fetch DDNS behaviorial parameters. + /// use the given subnet to fetch DDNS behavioral parameters. /// The values are fetched with the inheritance scope mode /// of Network::ALL. /// @@ -641,7 +641,7 @@ public: /// stored in the staging configuration. The other part of the /// configuration comes from the database. The configuration fetched /// from the database is stored in a separate @c SrvConfig instance - /// and then merged into the staging configuration prior to commiting + /// and then merged into the staging configuration prior to committing /// it. /// /// The merging strategy depends on the underlying data being merged. diff --git a/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc b/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc index 13c3e80c0b..f204ba2c8e 100644 --- a/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc +++ b/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc @@ -192,7 +192,7 @@ TEST_F(AllocEngine4Test, hintAlloc4) { subnet_->setValid(Triplet(1, 3, 5)); ctx.query_.reset(new Pkt4(DHCPREQUEST, 1234)); - // Speficy the valid lifetime we want. + // Specify the valid lifetime we want. OptionUint32Ptr opt(new OptionUint32(Option::V4, DHO_DHCP_LEASE_TIME, 4)); ctx.query_->addOption(opt); @@ -229,7 +229,7 @@ TEST_F(AllocEngine4Test, minAlloc4) { subnet_->setValid(Triplet(2, 3, 5)); ctx.query_.reset(new Pkt4(DHCPREQUEST, 1234)); - // Speficy the valid lifetime we want, as it is lower than the min value + // Specify the valid lifetime we want, as it is lower than the min value // we'll get this min value instead. OptionUint32Ptr opt(new OptionUint32(Option::V4, DHO_DHCP_LEASE_TIME, 1)); ctx.query_->addOption(opt); @@ -267,7 +267,7 @@ TEST_F(AllocEngine4Test, maxAlloc4) { subnet_->setValid(Triplet(1, 3, 5)); ctx.query_.reset(new Pkt4(DHCPREQUEST, 1234)); - // Speficy the valid lifetime we want, as it is greater than the max value + // Specify the valid lifetime we want, as it is greater than the max value // we'll get this max value instead. OptionUint32Ptr opt(new OptionUint32(Option::V4, DHO_DHCP_LEASE_TIME, 6)); ctx.query_->addOption(opt); @@ -644,7 +644,7 @@ TEST_F(AllocEngine4Test, hintRenew4) { subnet_->setValid(Triplet(1, 3, 5)); ctx.query_.reset(new Pkt4(DHCPREQUEST, 1234)); - // Speficy the valid lifetime we want. + // Specify the valid lifetime we want. OptionUint32Ptr opt(new OptionUint32(Option::V4, DHO_DHCP_LEASE_TIME, 4)); ctx.query_->addOption(opt); @@ -686,7 +686,7 @@ TEST_F(AllocEngine4Test, minRenew4) { subnet_->setValid(Triplet(2, 3, 5)); ctx.query_.reset(new Pkt4(DHCPREQUEST, 1234)); - // Speficy the valid lifetime we want, as it is lower than the min value + // Specify the valid lifetime we want, as it is lower than the min value // we'll get this min value instead. OptionUint32Ptr opt(new OptionUint32(Option::V4, DHO_DHCP_LEASE_TIME, 1)); ctx.query_->addOption(opt); @@ -729,7 +729,7 @@ TEST_F(AllocEngine4Test, maxRenew4) { subnet_->setValid(Triplet(1, 3, 5)); ctx.query_.reset(new Pkt4(DHCPREQUEST, 1234)); - // Speficy the valid lifetime we want, as it is greater than the max value + // Specify the valid lifetime we want, as it is greater than the max value // we'll get this max value instead. OptionUint32Ptr opt(new OptionUint32(Option::V4, DHO_DHCP_LEASE_TIME, 6)); ctx.query_->addOption(opt); @@ -1053,7 +1053,7 @@ public: return (lease); } - /// Covenience pointers to configuration elements. These are initialized + /// Convenience pointers to configuration elements. These are initialized /// in the constructor and are used throughout the tests. AllocEngine engine_; Subnet4Ptr subnet1_; diff --git a/src/lib/dhcpsrv/tests/alloc_engine6_unittest.cc b/src/lib/dhcpsrv/tests/alloc_engine6_unittest.cc index 118c058279..53757b404c 100644 --- a/src/lib/dhcpsrv/tests/alloc_engine6_unittest.cc +++ b/src/lib/dhcpsrv/tests/alloc_engine6_unittest.cc @@ -2949,7 +2949,7 @@ public: return (lease); } - /// Covenience pointers to configuration elements. These are initialized + /// Convenience pointers to configuration elements. These are initialized /// in the constructor and are used throughout the tests. AllocEngine engine_; Subnet6Ptr subnet1_; @@ -3379,7 +3379,7 @@ TEST_F(SharedNetworkAlloc6Test, requestRunningOut) { ASSERT_TRUE(lease); EXPECT_EQ("2001:db8:2::ff", lease->addr_.toText()); - // Ok, now try for anoher client. We should be completely full. + // Ok, now try for another client. We should be completely full. DuidPtr other_duid(new DUID(vector(12, 0xff))); AllocEngine::ClientContext6 ctx2(subnet2_, other_duid, false, false, "", false, query); diff --git a/src/lib/dhcpsrv/tests/cfg_iface_unittest.cc b/src/lib/dhcpsrv/tests/cfg_iface_unittest.cc index 770004bcf2..a3c1ea8218 100644 --- a/src/lib/dhcpsrv/tests/cfg_iface_unittest.cc +++ b/src/lib/dhcpsrv/tests/cfg_iface_unittest.cc @@ -204,7 +204,7 @@ TEST_F(CfgIfaceTest, explicitLoopbackV4) { // Reset configuration. cfg.reset(); - // Retry with wirdcard + // Retry with wildcard ASSERT_NO_THROW(cfg.use(AF_INET, "*")); ASSERT_NO_THROW(cfg.use(AF_INET, "lo")); ASSERT_NO_THROW(cfg.useSocketType(AF_INET, CfgIface::SOCKET_UDP)); @@ -378,7 +378,7 @@ TEST_F(CfgIfaceTest, explicitLoopbackV6) { // Reset configuration. cfg.reset(); - // Retry with wirdcard + // Retry with wildcard ASSERT_NO_THROW(cfg.use(AF_INET6, "*")); ASSERT_NO_THROW(cfg.use(AF_INET6, "lo/::1")); cfg.openSockets(AF_INET6, DHCP6_SERVER_PORT); diff --git a/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc b/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc index d52a5fd0de..951c378d22 100644 --- a/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc +++ b/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc @@ -42,7 +42,7 @@ namespace { /// @brief Verifies that a set of subnets contains a given a subnet /// -/// @param cfg_subnets set of sunbets in which to look +/// @param cfg_subnets set of subnets in which to look /// @param prefix prefix of the target subnet /// @param exp_subnet_id expected id of the target subnet /// @param exp_valid expected valid lifetime of the subnet diff --git a/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc b/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc index 410d5432cf..2447fc1230 100644 --- a/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc +++ b/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc @@ -48,7 +48,7 @@ generateInterfaceId(const std::string& text) { /// @brief Verifies that a set of subnets contains a given a subnet /// -/// @param cfg_subnets set of sunbets in which to look +/// @param cfg_subnets set of subnets in which to look /// @param exp_subnet_id expected id of the target subnet /// @param prefix prefix of the target subnet /// @param exp_valid expected valid lifetime of the subnet diff --git a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc index 0284ba5f46..43d573dd50 100644 --- a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc @@ -328,7 +328,7 @@ TEST_F(CfgMgrTest, configuration) { // This test checks the data directory handling. TEST_F(CfgMgrTest, dataDir) { - // It is only in DHCPv6 systax so switch to IPv6. + // It is only in DHCPv6 syntax so switch to IPv6. CfgMgr::instance().setFamily(AF_INET6); // Default. diff --git a/src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc b/src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc index 813d46d75a..38ba37e71d 100644 --- a/src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc +++ b/src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc @@ -102,7 +102,7 @@ protected: /// occur. /// @return Returns a pointer to class instance created, or NULL if /// for some unforeseen reason it wasn't created in the local dictionary - /// @throw indirectly, exceptions convertring the JSON text to elements, + /// @throw indirectly, exceptions converting the JSON text to elements, /// or by the parsing itself are not caught ClientClassDefPtr parseClientClassDef(const std::string& config, uint16_t family) { @@ -128,7 +128,7 @@ protected: } /// @brief Test that client class parser throws when unspported parameter - /// is specfied. + /// is specified. /// /// @param config JSON string containing the client class configuration. /// @param family The address family indicating whether the DHCPv4 or @@ -157,7 +157,7 @@ protected: /// @param family - the address family in which the parsing should /// occur. /// @return Returns a pointer to class dictionary created - /// @throw indirectly, execptions convertring the JSON text to elements, + /// @throw indirectly, execptions converting the JSON text to elements, /// or by the parsing itself are not caught ClientClassDictionaryPtr parseClientClassDefList(const std::string& config, uint16_t family) diff --git a/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc index 43c8e12748..8e47e7cdfe 100644 --- a/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc +++ b/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc @@ -183,7 +183,7 @@ public: /// /// This test checks if the CqlHostDataSource can be instantiated. This happens /// only if the database can be opened. Note that this is not part of the -/// CqlHostMgr test fixure set. This test checks that the database can be +/// CqlHostMgr test fixture set. This test checks that the database can be /// opened: the fixtures assume that and check basic operations. TEST(CqlHostDataSource, OpenDatabase) { diff --git a/src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc index 38f4455e43..d33d6dc62a 100644 --- a/src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc @@ -334,7 +334,7 @@ public: /// /// This test checks if the CqlLeaseMgr can be instantiated. This happens /// only if the database can be opened. Note that this is not part of the -/// CqlLeaseMgr test fixure set. This test checks that the database can be +/// CqlLeaseMgr test fixture set. This test checks that the database can be /// opened: the fixtures assume that and check basic operations. TEST(CqlOpenTest, OpenDatabase) { @@ -704,7 +704,7 @@ TEST_F(CqlLeaseMgrTest, lease6InvalidHostname) { /// @brief Verify that large IAID values work correctly. /// /// Adds lease with a large IAID to the database and verifies it can -/// fetched correclty. +/// fetched correctly. TEST_F(CqlLeaseMgrTest, leases6LargeIaidCheck) { testLease6LargeIaidCheck(); } diff --git a/src/lib/dhcpsrv/tests/d2_client_unittest.cc b/src/lib/dhcpsrv/tests/d2_client_unittest.cc index 5fc2a2b80e..9c551d54c9 100644 --- a/src/lib/dhcpsrv/tests/d2_client_unittest.cc +++ b/src/lib/dhcpsrv/tests/d2_client_unittest.cc @@ -146,7 +146,7 @@ TEST(D2ClientConfigTest, constructorsAndAccessors) { Optional opt_hostname_char_set("", true); Optional opt_hostname_char_replacement("", true); - // Veeify that constructor handles optional hostname char stuff. + // Verify that constructor handles optional hostname char stuff. ASSERT_NO_THROW(d2_client_config.reset(new D2ClientConfig(enable_updates, server_ip, diff --git a/src/lib/dhcpsrv/tests/d2_udp_unittest.cc b/src/lib/dhcpsrv/tests/d2_udp_unittest.cc index 1781ff95c4..9b156515c2 100644 --- a/src/lib/dhcpsrv/tests/d2_udp_unittest.cc +++ b/src/lib/dhcpsrv/tests/d2_udp_unittest.cc @@ -435,7 +435,7 @@ TEST_F(D2ClientMgrTest, ifaceRegister) { // Calling receive should complete the first message and start the second. IfaceMgr::instance().receive4(0, 0); - // Verify the callback hander was invoked, no errors counted. + // Verify the callback handler was invoked, no errors counted. EXPECT_EQ(2, getQueueSize()); ASSERT_EQ(1, callback_count_); ASSERT_EQ(0, error_handler_count_); diff --git a/src/lib/dhcpsrv/tests/dhcp_queue_control_parser_unittest.cc b/src/lib/dhcpsrv/tests/dhcp_queue_control_parser_unittest.cc index cf3f102bd6..3f167ef4fa 100644 --- a/src/lib/dhcpsrv/tests/dhcp_queue_control_parser_unittest.cc +++ b/src/lib/dhcpsrv/tests/dhcp_queue_control_parser_unittest.cc @@ -48,7 +48,7 @@ DHCPQueueControlParserTest::TearDown() { } // Verifies that DHCPQueueControlParser handles -// expected valid dhcp-queue-control contet +// expected valid dhcp-queue-control content TEST_F(DHCPQueueControlParserTest, validContent) { struct Scenario { std::string description_; diff --git a/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc index ace091e0cc..2a57365d44 100644 --- a/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc @@ -1715,7 +1715,7 @@ GenericLeaseMgrTest::testGetLeases6Duid() { uint32_t iaid = 7; // random number - SubnetID subnet_id = 8; // radom number + SubnetID subnet_id = 8; // random number Lease6Ptr lease1(new Lease6(Lease::TYPE_NA, addr1, duid1, iaid, 100, 200, subnet_id)); diff --git a/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.h b/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.h index b1c739ac01..7912fc0f27 100644 --- a/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.h +++ b/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.h @@ -104,7 +104,7 @@ public: /// @brief Compares a StatsMgr statistic to an expected value /// - /// Attempt to fetch the named statistic from the StatsMg and if + /// Attempt to fetch the named statistic from the StatsMgr and if /// found, compare its observed value to the given value. /// Fails if the stat is not found or if the values do not match. /// @@ -299,7 +299,7 @@ public: /// @brief verifies getLeases6 method by DUID /// /// Adds 3 leases to backend and retrieves, verifes empty - /// retrival of non existent DUID. + /// retrieval of non existent DUID. void testGetLeases6Duid(); /// @brief Checks that getLease6() works with different DUID sizes @@ -447,7 +447,7 @@ public: /// @brief Checks operation of v4 LeaseStatsQuery variants /// - /// It creates three subnets with leasese in various states in + /// It creates three subnets with leases in various states in /// each. It runs and verifies the returned query contents for /// each of the v4 startLeaseQuery variants: /// @@ -459,7 +459,7 @@ public: /// @brief Checks operation of v6 LeaseStatsQuery variants /// - /// It creates three subnets with leasese in various states in + /// It creates three subnets with leases in various states in /// each. It runs and verifies the returned query contents for /// each of the v6 startLeaseQuery variants: /// diff --git a/src/lib/dhcpsrv/tests/host_reservation_parser_unittest.cc b/src/lib/dhcpsrv/tests/host_reservation_parser_unittest.cc index a608136b3a..ee329dd076 100644 --- a/src/lib/dhcpsrv/tests/host_reservation_parser_unittest.cc +++ b/src/lib/dhcpsrv/tests/host_reservation_parser_unittest.cc @@ -274,8 +274,8 @@ CfgHostsSubnet::toElement() const { if (boot_file_name && boot_file_name->stringValue().empty()) { resv->remove("boot-file-name"); } - ConstElementPtr client_classess = resv->get("client-classes"); - if (client_classess && client_classess->empty()) { + ConstElementPtr client_classes = resv->get("client-classes"); + if (client_classes && client_classes->empty()) { resv->remove("client-classes"); } ConstElementPtr option_data = resv->get("option-data"); @@ -1169,7 +1169,7 @@ TEST_F(HostReservationParserTest, options6) { option->set("always-send", Element::create(false)); config = prettyPrint(config_element); boost::algorithm::to_lower(config); - + // Try to unparse it. CfgMgr::instance().setFamily(AF_INET6); CfgHostsSubnet cfg_subnet(cfg_hosts, SubnetID(10)); diff --git a/src/lib/dhcpsrv/tests/host_reservations_list_parser_unittest.cc b/src/lib/dhcpsrv/tests/host_reservations_list_parser_unittest.cc index 5827c0234b..fde9c4db54 100644 --- a/src/lib/dhcpsrv/tests/host_reservations_list_parser_unittest.cc +++ b/src/lib/dhcpsrv/tests/host_reservations_list_parser_unittest.cc @@ -36,7 +36,7 @@ protected: /// @brief Setup for each test. /// - /// Clears the configuration in the @c CfgMgr. It alse initializes + /// Clears the configuration in the @c CfgMgr. It also initializes /// hwaddr_ and duid_ class members. virtual void SetUp(); @@ -130,8 +130,8 @@ CfgHostsSubnet::toElement() const { if (boot_file_name && boot_file_name->stringValue().empty()) { resv->remove("boot-file-name"); } - ConstElementPtr client_classess = resv->get("client-classes"); - if (client_classess && client_classess->empty()) { + ConstElementPtr client_classes = resv->get("client-classes"); + if (client_classes && client_classes->empty()) { resv->remove("client-classes"); } ConstElementPtr option_data = resv->get("option-data"); @@ -259,7 +259,7 @@ TEST_F(HostReservationsListParserTest, duplicatedIdentifierValue4) { // parses IPv6 reservations correctly. TEST_F(HostReservationsListParserTest, ipv6Reservations) { // hexadecimal in lower case for toElement() - std::string config = + std::string config = "[ " " { \"duid\": \"01:02:03:04:05:06:07:08:09:0A\"," " \"ip-addresses\": [ ]," diff --git a/src/lib/dhcpsrv/tests/host_unittest.cc b/src/lib/dhcpsrv/tests/host_unittest.cc index 34ffb4fa05..af0a3412cd 100644 --- a/src/lib/dhcpsrv/tests/host_unittest.cc +++ b/src/lib/dhcpsrv/tests/host_unittest.cc @@ -971,7 +971,7 @@ TEST_F(HostTest, toText) { IOAddress("2001:db8:1::1"))); ); - // Add invisble user context + // Add invisible user context std::string user_context = "{ \"foo\": \"bar\" }"; host->setContext(Element::fromJSON(user_context)); @@ -1237,7 +1237,7 @@ TEST_F(HostTest, hostId) { EXPECT_EQ(12345, host->getHostId()); } -// Tets verifies if we can modify the host keys. +// Test verifies if we can modify the host keys. TEST_F(HostTest, keys) { HostPtr host; ASSERT_NO_THROW(host.reset(new Host("01:02:03:04:05:06", "hw-address", diff --git a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc index 01dadd931a..ecff883493 100644 --- a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc @@ -107,7 +107,7 @@ public: /// @brief Returns existing IPv4 lease for specified client identifier, /// HW address and subnet identifier. /// - /// @param client_id Aclient identifier + /// @param client_id A client identifier /// @param hwaddr A HW address. /// @param subnet_id A subnet identifier. /// @@ -352,13 +352,13 @@ public: /// @brief Pretends to wipe all IPv4 leases from a subnet /// @param subnet_id (ignored, but one day may specify the subnet) virtual size_t wipeLeases4(const SubnetID&) { - isc_throw(NotImplemented, "ConreteLeaseMgr::wipeLeases4 not implemented"); + isc_throw(NotImplemented, "ConcreteLeaseMgr::wipeLeases4 not implemented"); } /// @brief Pretends to wipe all IPv4 leases from a subnet /// @param subnet_id (ignored, but one day may specify the subnet) virtual size_t wipeLeases6(const SubnetID&) { - isc_throw(NotImplemented, "ConreteLeaseMgr::wipeLeases4 not implemented"); + isc_throw(NotImplemented, "ConcreteLeaseMgr::wipeLeases4 not implemented"); } /// @brief Returns backend type. diff --git a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc index 0dba30b831..443e744253 100644 --- a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc @@ -1071,7 +1071,7 @@ TEST_F(MemfileLeaseMgrTest, getLeases6HostnameMultiThread) { } /// @brief This test adds 3 leases and verifies fetch by DUID. -/// Verifies retrival of non existant DUID fails +/// Verifies retrieval of non existant DUID fails TEST_F(MemfileLeaseMgrTest, getLeases6Duid) { startBackend(V6); testGetLeases6Duid(); diff --git a/src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc index d740b64430..13d8b5aedc 100644 --- a/src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc @@ -110,10 +110,10 @@ public: /// /// This test checks if the MySqlLeaseMgr can be instantiated. This happens /// only if the database can be opened. Note that this is not part of the -/// MySqlLeaseMgr test fixure set. This test checks that the database can be +/// MySqlLeaseMgr test fixture set. This test checks that the database can be /// opened: the fixtures assume that and check basic operations. TEST(MySqlOpenTest, OpenDatabase) { - // Explicitely disable Multi-Threading. + // Explicitly disable Multi-Threading. MultiThreadingMgr::instance().setMode(false); // Schema needs to be created for the test to work. @@ -686,7 +686,7 @@ TEST_F(MySqlLeaseMgrTest, lease6InvalidHostnameMultiThreading) { /// @brief Verify that large IAID values work correctly. /// /// Adds lease with a large IAID to the database and verifies it can -/// fetched correclty. +/// fetched correctly. TEST_F(MySqlLeaseMgrTest, leases6LargeIaidCheck) { testLease6LargeIaidCheck(); } diff --git a/src/lib/dhcpsrv/tests/pgsql_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/pgsql_lease_mgr_unittest.cc index 393c0d36e3..4c58ee2c11 100644 --- a/src/lib/dhcpsrv/tests/pgsql_lease_mgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/pgsql_lease_mgr_unittest.cc @@ -110,10 +110,10 @@ public: /// /// This test checks if the PgSqlLeaseMgr can be instantiated. This happens /// only if the database can be opened. Note that this is not part of the -/// PgSqlLeaseMgr test fixure set. This test checks that the database can be +/// PgSqlLeaseMgr test fixture set. This test checks that the database can be /// opened: the fixtures assume that and check basic operations. TEST(PgSqlOpenTest, OpenDatabase) { - // Explicitely disable Multi-Threading. + // Explicitly disable Multi-Threading. MultiThreadingMgr::instance().setMode(false); // Schema needs to be created for the test to work. @@ -642,7 +642,7 @@ TEST_F(PgSqlLeaseMgrTest, lease6InvalidHostnameMultiThreading) { /// @brief Verify that large IAID values work correctly. /// /// Adds lease with a large IAID to the database and verifies it can -/// fetched correclty. +/// fetched correctly. TEST_F(PgSqlLeaseMgrTest, leases6LargeIaidCheck) { testLease6LargeIaidCheck(); } diff --git a/src/lib/dhcpsrv/tests/shared_network_unittest.cc b/src/lib/dhcpsrv/tests/shared_network_unittest.cc index 0f407a226d..e3e628101a 100644 --- a/src/lib/dhcpsrv/tests/shared_network_unittest.cc +++ b/src/lib/dhcpsrv/tests/shared_network_unittest.cc @@ -1294,7 +1294,7 @@ TEST(SharedNetwork6Test, relayInfoList) { EXPECT_FALSE(network->hasRelays()); EXPECT_FALSE(network->hasRelayAddress(IOAddress("2001:db8:2::1"))); - // Add realy addresses to the network. + // Add relay addresses to the network. network->addRelayAddress(IOAddress("2001:db8:2::1")); network->addRelayAddress(IOAddress("2001:db8:2::2")); network->addRelayAddress(IOAddress("2001:db8:2::3")); diff --git a/src/lib/dhcpsrv/testutils/generic_backend_unittest.h b/src/lib/dhcpsrv/testutils/generic_backend_unittest.h index 15b7d5d114..0e3bd15b2d 100644 --- a/src/lib/dhcpsrv/testutils/generic_backend_unittest.h +++ b/src/lib/dhcpsrv/testutils/generic_backend_unittest.h @@ -224,7 +224,7 @@ public: /// notation). It simply creates an @c OptionDescriptor with the generic /// option instance (containing an option code and no option value) and /// the other @c OptionDescriptor parameters set appropriately. The - /// @c CfgOption class contains methds that can be used on demand to + /// @c CfgOption class contains methods that can be used on demand to /// replace these instances with the appropriate types (derived from /// @c Option) which represent formatted option data, if necessary. /// @@ -249,7 +249,7 @@ public: /// /// @param srv_cfg server config where the global should be checked. /// @param name name of the global parameter - /// @param exp_value expected value of the global paramter as an Element + /// @param exp_value expected value of the global parameter as an Element void checkConfiguredGlobal(const SrvConfigPtr& srv_cfg, const std::string &name, data::ConstElementPtr exp_value); diff --git a/src/lib/dhcpsrv/testutils/generic_host_data_source_unittest.h b/src/lib/dhcpsrv/testutils/generic_host_data_source_unittest.h index bdc02f461e..c1a058aee4 100644 --- a/src/lib/dhcpsrv/testutils/generic_host_data_source_unittest.h +++ b/src/lib/dhcpsrv/testutils/generic_host_data_source_unittest.h @@ -307,7 +307,7 @@ public: void testClientIdNotHWAddr(); /// @brief Test adds specified number of hosts with unique hostnames, then - /// retrives them and checks that the hostnames are set properly. + /// retrieves them and checks that the hostnames are set properly. /// /// Uses gtest macros to report failures. /// @@ -589,10 +589,10 @@ public: isc::dhcp::CfgMgr::instance().clear(); } - /// @brief Abstract method for destroying the back end specific shcema + /// @brief Abstract method for destroying the back end specific schema virtual void destroySchema() = 0; - /// @brief Abstract method for creating the back end specific shcema + /// @brief Abstract method for creating the back end specific schema virtual void createSchema() = 0; /// @brief Abstract method which returns the back end specific connection diff --git a/src/lib/dhcpsrv/testutils/memory_host_data_source.cc b/src/lib/dhcpsrv/testutils/memory_host_data_source.cc index fdfc6f73ff..85f1e642ed 100644 --- a/src/lib/dhcpsrv/testutils/memory_host_data_source.cc +++ b/src/lib/dhcpsrv/testutils/memory_host_data_source.cc @@ -38,7 +38,7 @@ ConstHostCollection MemHostDataSource::getAll4(const SubnetID& subnet_id) const { ConstHostCollection hosts; for (auto h = store_.begin(); h != store_.end(); ++h) { - // Keep it when subnet_id matchs. + // Keep it when subnet_id matches. if ((*h)->getIPv4SubnetID() == subnet_id) { hosts.push_back(*h); } @@ -50,7 +50,7 @@ ConstHostCollection MemHostDataSource::getAll6(const SubnetID& subnet_id) const { ConstHostCollection hosts; for (auto h = store_.begin(); h != store_.end(); ++h) { - // Keep it when subnet_id matchs. + // Keep it when subnet_id matches. if ((*h)->getIPv6SubnetID() == subnet_id) { hosts.push_back(*h); } @@ -62,7 +62,7 @@ ConstHostCollection MemHostDataSource::getAllbyHostname(const std::string& hostname) const { ConstHostCollection hosts; for (auto h = store_.begin(); h != store_.end(); ++h) { - // Keep it when hostname matchs. + // Keep it when hostname matches. if ((*h)->getLowerHostname() == hostname) { hosts.push_back(*h); } diff --git a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.h b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.h index 02a1803d0f..3e23aac5bc 100644 --- a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.h +++ b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.h @@ -27,7 +27,7 @@ namespace test { /// @brief Test config backend that implements all of the DHCPv4 API calls /// /// This backend should be used for unit testing the DHCPv4 server and the -/// commands which manpiluate the configuration information stored in the +/// commands which manipulate the configuration information stored in the /// database. /// /// Server selectors supported by this test configuration backend are a diff --git a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.h b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.h index 2e5d92cf46..85a2c73927 100644 --- a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.h +++ b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.h @@ -27,7 +27,7 @@ namespace test { /// @brief Test config backend that implements all of the DHCPv6 API calls /// /// This backend should be used for unit testing the DHCPv6 server and the -/// commands which manpiluate the configuration information stored in the +/// commands which manipulate the configuration information stored in the /// database. /// /// Server selectors supported by this test configuration backend are a diff --git a/src/lib/dns/gen-rdatacode.py.in b/src/lib/dns/gen-rdatacode.py.in index 30a2d7b6fd..b68b8c119c 100644 --- a/src/lib/dns/gen-rdatacode.py.in +++ b/src/lib/dns/gen-rdatacode.py.in @@ -271,7 +271,7 @@ def generate_typeclasscode(fileprefix, basemtime, code2txt, type_or_class): return # Create a list of (code, code-text) pairs, where code-text is generally - # upper-cased, with applying speicial filters when necessary. + # upper-cased, with applying special filters when necessary. def convert(code_txt): # Workaround by heuristics: there's a "NULL" RR type, but it would # cause conflict with the C/C++ macro. We use Null as a special case. diff --git a/src/lib/dns/master_lexer.cc b/src/lib/dns/master_lexer.cc index c4a8fa5934..2a0fd9c799 100644 --- a/src/lib/dns/master_lexer.cc +++ b/src/lib/dns/master_lexer.cc @@ -366,7 +366,7 @@ public: virtual void handle(MasterLexer& lexer) const { // We've just seen '\r'. If this is part of a sequence of '\r\n', // we combine them as a single END-OF-LINE. Otherwise we treat the - // single '\r' as an EOL and continue tokeniziation from the character + // single '\r' as an EOL and continue tokenization from the character // immediately after '\r'. One tricky case is that there's a comment // between '\r' and '\n'. This implementation combines these // characters and treats them as a single EOL (the behavior derived diff --git a/src/lib/dns/rdata/generic/detail/txt_like.h b/src/lib/dns/rdata/generic/detail/txt_like.h index dbe220b685..5cc2eb7d0c 100644 --- a/src/lib/dns/rdata/generic/detail/txt_like.h +++ b/src/lib/dns/rdata/generic/detail/txt_like.h @@ -39,7 +39,7 @@ public: /// Exceptions /// /// \c InvalidRdataLength is thrown if rdata_len exceeds the maximum. - /// \c DNSMessageFORMERR is thrown if the RR is misformed. + /// \c DNSMessageFORMERR is thrown if the RR is malformed. TXTLikeImpl(util::InputBuffer& buffer, size_t rdata_len) { if (rdata_len > MAX_RDLENGTH) { isc_throw(InvalidRdataLength, "RDLENGTH too large: " << rdata_len); diff --git a/src/lib/dns/tests/rdata_naptr_unittest.cc b/src/lib/dns/tests/rdata_naptr_unittest.cc index 871424ac8e..dae4ee90da 100644 --- a/src/lib/dns/tests/rdata_naptr_unittest.cc +++ b/src/lib/dns/tests/rdata_naptr_unittest.cc @@ -95,7 +95,7 @@ TEST_F(Rdata_NAPTR_Test, badText) { // Order or preference cannot be missed EXPECT_THROW(const NAPTR naptr("10 \"S\" SIP \"\" _sip._udp.example.com."), InvalidRdataText); - // Unquoted fields must be seperated by spaces + // Unquoted fields must be separated by spaces EXPECT_THROW(const NAPTR naptr("100 10S SIP \"\" _sip._udp.example.com."), InvalidRdataText); EXPECT_THROW(const NAPTR naptr("10010 \"S\" \"SIP\" \"\" _sip._udp.example.com."), diff --git a/src/lib/eval/tests/context_unittest.cc b/src/lib/eval/tests/context_unittest.cc index 54e3d33ad5..427d0e7c37 100644 --- a/src/lib/eval/tests/context_unittest.cc +++ b/src/lib/eval/tests/context_unittest.cc @@ -1662,7 +1662,7 @@ TEST_F(EvalContextTest, vendorClass6DataIndex) { testVendorClass("vendor-class[4491].data[3] == 0x1234", Option::V6, 4491, 3); } -// Test the parsing of a sub-option with perent by code. +// Test the parsing of a sub-option with parent by code. TEST_F(EvalContextTest, subOptionWithCode) { EvalContext eval(Option::V4); @@ -1672,7 +1672,7 @@ TEST_F(EvalContextTest, subOptionWithCode) { checkTokenSubOption(eval.expression.at(0), 123, 234, TokenOption::TEXTUAL); } -// Test the parsing of a sub-option with perent by name. +// Test the parsing of a sub-option with parent by name. TEST_F(EvalContextTest, subOptionWithName) { EvalContext eval(Option::V4); diff --git a/src/lib/eval/tests/dependency_unittest.cc b/src/lib/eval/tests/dependency_unittest.cc index 6eaee1da4a..411e343536 100644 --- a/src/lib/eval/tests/dependency_unittest.cc +++ b/src/lib/eval/tests/dependency_unittest.cc @@ -26,7 +26,7 @@ namespace { /// @brief Test fixture for testing dependency. /// /// This class provides several convenience objects to be used during testing -/// of the dependcy of classification expressions. +/// of the dependency of classification expressions. class DependencyTest : public ::testing::Test { public: diff --git a/src/lib/eval/tests/evaluate_unittest.cc b/src/lib/eval/tests/evaluate_unittest.cc index 839981c29d..137bb418d3 100644 --- a/src/lib/eval/tests/evaluate_unittest.cc +++ b/src/lib/eval/tests/evaluate_unittest.cc @@ -491,7 +491,7 @@ TEST_F(ExpressionsTest, evaluateString) { testExpressionNegative("pkt6.msgtype == 1", Option::V6, EvalContext::PARSER_STRING); - // Check that ifelse works as expecting (it was added explicitely for + // Check that ifelse works as expecting (it was added explicitly for // the string evaluation). testExpressionString(Option::V4, "ifelse(option[100].exists,'foo','bar')", "foo"); diff --git a/src/lib/eval/tests/token_unittest.cc b/src/lib/eval/tests/token_unittest.cc index 0852e3f3d2..3b2efde4fe 100644 --- a/src/lib/eval/tests/token_unittest.cc +++ b/src/lib/eval/tests/token_unittest.cc @@ -1960,7 +1960,7 @@ TEST_F(TokenTest, concat) { TEST_F(TokenTest, tohexstring) { ASSERT_NO_THROW(t_.reset(new TokenToHexString())); - // Hexstring equires two values on the stack, try + // Hexstring requires two values on the stack, try // with 0 and 1 both should throw an exception EXPECT_THROW(t_->evaluate(*pkt4_, values_), EvalBadStack); @@ -2260,7 +2260,7 @@ TEST_F(TokenTest, vendor4SpecificVendorExists) { // Case 2: option present, but uses different enterprise-id, should fail testVendorExists(Option::V4, 4491, 1234, "false"); - // Case 3: option present and has matchin enterprise-id, should succeed + // Case 3: option present and has matching enterprise-id, should succeed testVendorExists(Option::V4, 4491, 4491, "true"); // Check if the logged messages are correct. @@ -2281,7 +2281,7 @@ TEST_F(TokenTest, vendor6SpecificVendorExists) { // Case 2: option present, but uses different enterprise-id, should fail testVendorExists(Option::V6, 4491, 1234, "false"); - // Case 3: option present and has matchin enterprise-id, should succeed + // Case 3: option present and has matching enterprise-id, should succeed testVendorExists(Option::V6, 4491, 4491, "true"); // Check if the logged messages are correct. diff --git a/src/lib/eval/token.h b/src/lib/eval/token.h index d233973198..183d9ad2f3 100644 --- a/src/lib/eval/token.h +++ b/src/lib/eval/token.h @@ -749,7 +749,7 @@ public: /// /// binary is the binary value (note it can be any value, i.e. /// it is not checked to really be not printable). - /// separator is litteral for instance '-' or ':'. The empty separator + /// separator is literal for instance '-' or ':'. The empty separator /// means no separator. /// /// The following example use a binary MAC address 06:ce:8f:55:b3:33: diff --git a/src/lib/hooks/callout_manager.h b/src/lib/hooks/callout_manager.h index 3e1eb10799..154a516b02 100644 --- a/src/lib/hooks/callout_manager.h +++ b/src/lib/hooks/callout_manager.h @@ -364,7 +364,7 @@ public: private: - /// @brief This method checks whether the hook_vector_ size is suffucient + /// @brief This method checks whether the hook_vector_ size is sufficient /// and extends it if necessary. /// /// The problem is as follows: some hooks are initialized statically diff --git a/src/lib/http/client.cc b/src/lib/http/client.cc index 63dd8ca1e3..b8523c253d 100644 --- a/src/lib/http/client.cc +++ b/src/lib/http/client.cc @@ -1189,7 +1189,7 @@ Connection::runParserInternal(const boost::system::error_code& ec, void Connection::timerCallback() { - // Request timeout occured. + // Request timeout occurred. terminate(boost::asio::error::timed_out); } diff --git a/src/lib/http/client.h b/src/lib/http/client.h index 406d34acff..abedc3cc47 100644 --- a/src/lib/http/client.h +++ b/src/lib/http/client.h @@ -76,7 +76,7 @@ public: struct RequestTimeout { /// @brief Constructor. /// - /// @param value Reuqest/response timeout value in milliseconds. + /// @param value Request/response timeout value in milliseconds. explicit RequestTimeout(long value) : value_(value) { } @@ -118,7 +118,7 @@ public: /// transaction is still in progress, the new transaction is queued. The /// queued transactions are started in the FIFO order one after another. If /// the connection is idle or the connection doesn't exist, the new - /// transaction is started immediatelly. + /// transaction is started immediately. /// /// The existing connection is tested before it is used for the new /// transaction by attempting to read (with message peeking) from the open @@ -142,7 +142,7 @@ public: /// /// The callback function provided by the caller is invoked when the /// transaction terminates, i.e. when the server has responded or when an - /// error occured. The callback is expected to be exception safe, but the + /// error occurred. The callback is expected to be exception safe, but the /// client internally guards against exceptions thrown by the callback. /// /// The first argument of the callback indicates an IO error during diff --git a/src/lib/http/connection.cc b/src/lib/http/connection.cc index cc843e78da..673e4466c6 100644 --- a/src/lib/http/connection.cc +++ b/src/lib/http/connection.cc @@ -387,7 +387,7 @@ HttpConnection::requestTimeoutCallback(TransactionPtr transaction) { // if such transaction exists. auto request = spawned_transaction->getRequest(); - // Depending on when the timeout occured, the HTTP version of the request + // Depending on when the timeout occurred, the HTTP version of the request // may or may not be available. Therefore we check if the HTTP version is // set in the request. If it is not available, we need to create a dummy // request with the default HTTP/1.0 version. This version will be used diff --git a/src/lib/http/connection.h b/src/lib/http/connection.h index a24f32303a..401f56da6e 100644 --- a/src/lib/http/connection.h +++ b/src/lib/http/connection.h @@ -335,7 +335,7 @@ protected: /// @param transaction Pointer to the transaction to be guarded by the timeout. void setupRequestTimer(TransactionPtr transaction = TransactionPtr()); - /// @brief Reset timer for detecing idle timeout in persistent connections. + /// @brief Reset timer for detecting idle timeout in persistent connections. void setupIdleTimer(); /// @brief Callback invoked when the HTTP Request Timeout occurs. diff --git a/src/lib/http/listener_impl.h b/src/lib/http/listener_impl.h index 0514d6ff74..df4f46e7b8 100644 --- a/src/lib/http/listener_impl.h +++ b/src/lib/http/listener_impl.h @@ -89,7 +89,7 @@ protected: /// @brief Creates an instance of the @c HttpConnection. /// - /// This method is virtual so as it can be overriden when customized + /// This method is virtual so as it can be overridden when customized /// connections are to be used, e.g. in case of unit testing. /// /// @param response_creator Pointer to the response creator object used to diff --git a/src/lib/http/request_parser.h b/src/lib/http/request_parser.h index 851e73f179..410ef32efe 100644 --- a/src/lib/http/request_parser.h +++ b/src/lib/http/request_parser.h @@ -203,7 +203,7 @@ private: /// If the next_state is HTTP_PARSE_OK_ST it indicates that the parsed /// value is a 3rd new line within request HTTP message. In this case the /// handler calls @ref HttpRequest::create to validate the received message - /// (excluding body). The hander then reads the "Content-Length" header to + /// (excluding body). The handler then reads the "Content-Length" header to /// check if the request contains a body. If the "Content-Length" is greater /// than zero, the parser transitions to HTTP_BODY_ST. If the /// "Content-Length" doesn't exist the parser transitions to diff --git a/src/lib/http/response_parser.h b/src/lib/http/response_parser.h index fa51caa910..b9a3744c45 100644 --- a/src/lib/http/response_parser.h +++ b/src/lib/http/response_parser.h @@ -201,7 +201,7 @@ private: /// If the next_state is HTTP_PARSE_OK_ST it indicates that the parsed /// value is a 3rd new line within request HTTP message. In this case the /// handler calls @ref HttpRequest::create to validate the received message - /// (excluding body). The hander then reads the "Content-Length" header to + /// (excluding body). The handler then reads the "Content-Length" header to /// check if the request contains a body. If the "Content-Length" is greater /// than zero, the parser transitions to HTTP_BODY_ST. If the /// "Content-Length" doesn't exist the parser transitions to diff --git a/src/lib/http/tests/connection_pool_unittests.cc b/src/lib/http/tests/connection_pool_unittests.cc index 13c4bd52bb..255a1a496f 100644 --- a/src/lib/http/tests/connection_pool_unittests.cc +++ b/src/lib/http/tests/connection_pool_unittests.cc @@ -33,7 +33,7 @@ typedef boost::shared_ptr ResponsePtr; /// @brief Request timeout used in tests. const long CONN_REQUEST_TIMEOUT = 1000; -/// @brief Idle connecion timeout used in tests. +/// @brief Idle connection timeout used in tests. const long CONN_IDLE_TIMEOUT = 1000; /// @brief Implementation of the @ref HttpResponseCreator. diff --git a/src/lib/http/tests/server_client_unittests.cc b/src/lib/http/tests/server_client_unittests.cc index ebb53b0d7b..fe07f705bb 100644 --- a/src/lib/http/tests/server_client_unittests.cc +++ b/src/lib/http/tests/server_client_unittests.cc @@ -221,7 +221,7 @@ protected: /// @brief Creates an instance of the @c HttpConnection. /// - /// This method is virtual so as it can be overriden when customized + /// This method is virtual so as it can be overridden when customized /// connections are to be used, e.g. in case of unit testing. /// /// @param io_service IO service to be used by the connection. @@ -694,7 +694,7 @@ public: return (s.str()); } - /// @brief Tests that HTTP request tiemout status is returned when the + /// @brief Tests that HTTP request timeout status is returned when the /// server does not receive the entire request. /// /// @param request Partial request for which the parser will be waiting for @@ -818,7 +818,7 @@ TEST_F(HttpListenerTest, listen) { // This test verifies that persistent HTTP connection can be established when -// "Conection: Keep-Alive" header value is specified. +// "Connection: Keep-Alive" header value is specified. TEST_F(HttpListenerTest, keepAlive) { // The first request contains the keep-alive header which instructs the server @@ -1697,9 +1697,9 @@ public: } /// @brief Tests that underlying TCP socket can be registered and - /// unregsitered via connection and close callbacks. + /// unregistered via connection and close callbacks. /// - /// It conducts to consequetive requests over the same client. + /// It conducts to consecutive requests over the same client. /// /// @param version HTTP version to be used. void testConnectCloseCallbacks(const HttpVersion& version) { diff --git a/src/lib/log/logger_manager.cc b/src/lib/log/logger_manager.cc index a03d2bd5b5..e0b9f21704 100644 --- a/src/lib/log/logger_manager.cc +++ b/src/lib/log/logger_manager.cc @@ -28,7 +28,7 @@ using namespace std; // Older log4cplus versions (1.2.0) don't have the initializer.h header that // would allow explicit initialization. Newer versions (2.0.4 for sure, possibly // older as well) have it and it's recommended to use it. We detect whether -// it's present or not and do explicit initalization if possible. +// it's present or not and do explicit initialization if possible. #ifdef LOG4CPLUS_INITIALIZER_H #include namespace { diff --git a/src/lib/mysql/mysql_binding.h b/src/lib/mysql/mysql_binding.h index d26f28621d..f1f03d849e 100644 --- a/src/lib/mysql/mysql_binding.h +++ b/src/lib/mysql/mysql_binding.h @@ -222,7 +222,7 @@ public: /// @throw InvalidOperation if the value is NULL or the binding /// type is not @c MYSQL_TYPE_BLOB. /// - /// @return Blob in a vactor. + /// @return Blob in a vector. std::vector getBlob() const; /// @brief Returns value held in the binding as blob. @@ -233,7 +233,7 @@ public: /// /// @throw InvalidOperation if the binding type is not @c MYSQL_TYPE_BLOB. /// - /// @return Blob in a vactor. + /// @return Blob in a vector. std::vector getBlobOrDefault(const std::vector& default_value) const; diff --git a/src/lib/mysql/testutils/mysql_schema.cc b/src/lib/mysql/testutils/mysql_schema.cc index d59cab784a..c5e9a46e84 100644 --- a/src/lib/mysql/testutils/mysql_schema.cc +++ b/src/lib/mysql/testutils/mysql_schema.cc @@ -31,7 +31,7 @@ validMySQLConnectionString() { } void destroyMySQLSchema(bool show_err, bool force) { - // If force is true or wipeMySQLData() fails, destory the schema. + // If force is true or wipeMySQLData() fails, destroy the schema. if (force || (!softWipeEnabled()) || wipeMySQLData(show_err)) { runMySQLScript(DATABASE_SCRIPTS_DIR, "mysql/dhcpdb_drop.mysql", show_err); } diff --git a/src/lib/process/config_ctl_info.cc b/src/lib/process/config_ctl_info.cc index 5f1f576423..1472162cf9 100644 --- a/src/lib/process/config_ctl_info.cc +++ b/src/lib/process/config_ctl_info.cc @@ -43,7 +43,7 @@ ConfigDbInfo::getParameterValue(const std::string& name, std::string& value) con return(true); } -//********* ConfiControlInfo ************// +//******** ConfigControlInfo ********// ConfigControlInfo::ConfigControlInfo(const ConfigControlInfo& other) : config_fetch_wait_time_(other.config_fetch_wait_time_) { diff --git a/src/lib/process/d_controller.cc b/src/lib/process/d_controller.cc index a450d6357c..24d1744056 100644 --- a/src/lib/process/d_controller.cc +++ b/src/lib/process/d_controller.cc @@ -149,7 +149,7 @@ DControllerBase::launch(int argc, char* argv[], const bool test_mode) { // Everything is clear for launch, so start the application's // event loop. try { - // Now that we have a proces, we can set up signal handling. + // Now that we have a process, we can set up signal handling. initSignalHandling(); runProcess(); } catch (const std::exception& ex) { @@ -392,7 +392,7 @@ DControllerBase::configFromFile() { // Temporary storage for logging configuration ConfigPtr storage(new ConfigBase()); - // Configure logging to the tempoary storage. + // Configure logging to the temporary storage. Daemon::configureLogger(module_config, storage); // Let's apply the new logging. We do it early, so we'll be able @@ -622,7 +622,7 @@ DControllerBase::configSetHandler(const std::string&, ConstElementPtr args) { // Temporary storage for logging configuration ConfigPtr storage(new ConfigBase()); - // Configure logging to the tempoary storage. + // Configure logging to the temporary storage. Daemon::configureLogger(module_config, storage); // Let's apply the new logging. We do it early, so we'll be able diff --git a/src/lib/process/daemon.h b/src/lib/process/daemon.h index 7ace9aafb4..9932cf17c7 100644 --- a/src/lib/process/daemon.h +++ b/src/lib/process/daemon.h @@ -66,7 +66,7 @@ public: /// /// Performs configuration backend specific final clean-up. This is called /// shortly before the daemon terminates. Depending on backend, it may - /// terminat existing msgq session, close LDAP connection or similar. + /// terminate existing msgq session, close LDAP connection or similar. /// /// The daemon is not expected to receive any further commands or /// configuration updates as it is in final stages of shutdown. diff --git a/src/lib/process/tests/config_ctl_info_unittests.cc b/src/lib/process/tests/config_ctl_info_unittests.cc index d7416592bb..1eaa16107c 100644 --- a/src/lib/process/tests/config_ctl_info_unittests.cc +++ b/src/lib/process/tests/config_ctl_info_unittests.cc @@ -19,7 +19,7 @@ using namespace isc::util; // Verifies initializing via an access string and unparsing into elements // We just test basic unparsing, as more rigorous testing is done in -// libkea-db testing which ConfibDBInfo uses. +// libkea-db testing which ConfigDBInfo uses. TEST(ConfigDbInfo, basicOperation) { ConfigDbInfo db; std::string access = "type=mysql user=tom password=terrific"; @@ -144,7 +144,7 @@ TEST(ConfigControlInfo, basicOperation) { EXPECT_FALSE(db_info2 == ConfigControlInfo::EMPTY_DB()); EXPECT_EQ (access_str2, db_info2.getAccessString()); - // Verify not finding a db reutrns EMPTY_DB(). + // Verify not finding a db returns EMPTY_DB(). const ConfigDbInfo& db_info3 = ctl.findConfigDb("type", "bogus"); EXPECT_TRUE(db_info3 == ConfigControlInfo::EMPTY_DB()); diff --git a/src/lib/process/tests/log_parser_unittests.cc b/src/lib/process/tests/log_parser_unittests.cc index 7d2a8e8d26..0561f21af7 100644 --- a/src/lib/process/tests/log_parser_unittests.cc +++ b/src/lib/process/tests/log_parser_unittests.cc @@ -313,7 +313,7 @@ TEST_F(LoggingTest, multipleLoggingDestinations) { // Verifies that log rotation occurs when configured. We do not // worry about contents of the log files, only that rotation occurs. // Such details are tested in lib/log. This test verifies that -// we can correcty configure logging such that rotation occurs as +// we can correctly configure logging such that rotation occurs as // expected. TEST_F(LoggingTest, logRotate) { wipeFiles(); diff --git a/src/lib/process/tests/logging_info_unittests.cc b/src/lib/process/tests/logging_info_unittests.cc index 7a8d1f113f..f69b7193f8 100644 --- a/src/lib/process/tests/logging_info_unittests.cc +++ b/src/lib/process/tests/logging_info_unittests.cc @@ -66,7 +66,7 @@ public: TEST_F(LoggingInfoTest, defaults) { // We now need to set the default logger explicitly. - // Otherwise leftovers from pervious tests that use DController + // Otherwise leftovers from previous tests that use DController // would leave the default logger set to TestBin. Daemon::setDefaultLoggerName("kea"); diff --git a/src/lib/process/testutils/d_test_stubs.h b/src/lib/process/testutils/d_test_stubs.h index 01531c76eb..ccd4f4109d 100644 --- a/src/lib/process/testutils/d_test_stubs.h +++ b/src/lib/process/testutils/d_test_stubs.h @@ -261,7 +261,7 @@ protected: /// @brief Provides alternate parse file implementation /// - /// Overrides the base class implementation to mimick controllers which + /// Overrides the base class implementation to mimic controllers which /// implement alternate file parsing. If enabled via useAlternateParser() /// the method will return a fixed map of elements reflecting the following /// JSON: @@ -284,7 +284,7 @@ public: /// /// Overrides the base class implementation so we can /// verify the getting the extended version text - /// contains derivaiton specific contributions. + /// contains derivation specific contributions. virtual std::string getVersionAddendum() { return ("StubController Version Text"); } diff --git a/src/lib/stats/tests/observation_unittest.cc b/src/lib/stats/tests/observation_unittest.cc index b360cfa0eb..ccd48a9253 100644 --- a/src/lib/stats/tests/observation_unittest.cc +++ b/src/lib/stats/tests/observation_unittest.cc @@ -292,7 +292,7 @@ TEST_F(ObservationTest, setCountLimit) { ASSERT_EQ(c.getSize(), 20); ASSERT_EQ(d.getSize(), 20); - // And whether storaged values are correct + // And whether stored values are correct uint32_t i = 20; // index of the last element in array of test's samples for (std::list::iterator it = samples_int.begin(); it != samples_int.end(); ++it) { EXPECT_EQ((*it).first, int_samples[i]); diff --git a/src/lib/testutils/sandbox.h b/src/lib/testutils/sandbox.h index f0df176be4..ffa063ef8f 100644 --- a/src/lib/testutils/sandbox.h +++ b/src/lib/testutils/sandbox.h @@ -48,7 +48,7 @@ public: ~Sandbox() { // Delete content of path_ recursively. if (nftw(path_.c_str(), Sandbox::rmFile, 10, FTW_DEPTH | FTW_MOUNT | FTW_PHYS) < 0) { - auto msg = "Some error occured while deleting unit test sandbox " + path_; + auto msg = "Some error occurred while deleting unit test sandbox " + path_; std::perror(msg.c_str()); exit(1); } diff --git a/src/lib/testutils/threaded_test.h b/src/lib/testutils/threaded_test.h index 7b0a972871..2db98cb314 100644 --- a/src/lib/testutils/threaded_test.h +++ b/src/lib/testutils/threaded_test.h @@ -68,7 +68,7 @@ protected: /// @brief Mutex used to synchronize threads. std::mutex mutex_; - /// Condtional variable for thread waits. + /// Conditional variable for thread waits. std::condition_variable condvar_; /// Flag indicating that the thread is ready. diff --git a/src/lib/testutils/xml_reporting_test_lib.sh.in b/src/lib/testutils/xml_reporting_test_lib.sh.in index d7813fa453..a0af090d79 100644 --- a/src/lib/testutils/xml_reporting_test_lib.sh.in +++ b/src/lib/testutils/xml_reporting_test_lib.sh.in @@ -318,7 +318,7 @@ _create_xml() { } # Print the lines between two matching regex patterns from a file. Excludes the -# lines that contain the patterns themselves. Matches only the first occurence. +# lines that contain the patterns themselves. Matches only the first occurrence. _print_lines_between_matching_patterns() { local start_pattern=${1}; shift local end_pattern=${1}; shift diff --git a/src/lib/util/optional.h b/src/lib/util/optional.h index 0e0beb28ba..b3472085ab 100644 --- a/src/lib/util/optional.h +++ b/src/lib/util/optional.h @@ -18,7 +18,7 @@ namespace util { /// /// This template class encapsulates an optional value. The default implementation /// encapsulates numeric values, but additional specializations are defined -/// as neccessary to support other types od data. +/// as necessary to support other types od data. /// /// This class includes a boolean flag which indicates if the encapsulated /// value is specified or unspecified. For example, a configuration parser diff --git a/src/lib/util/tests/doubles_unittest.cc b/src/lib/util/tests/doubles_unittest.cc index 8988906d3a..8d2efae9e0 100644 --- a/src/lib/util/tests/doubles_unittest.cc +++ b/src/lib/util/tests/doubles_unittest.cc @@ -24,7 +24,7 @@ TEST(Doubles, areDoublesEquivalent) { EXPECT_TRUE(areDoublesEquivalent( 1.0000000, 1.0000005)); EXPECT_FALSE(areDoublesEquivalent(1.0000000, 1.000005)); - // Check custome tolerance. + // Check custom tolerance. EXPECT_TRUE(areDoublesEquivalent( 1.000, 1.005, 0.01)); EXPECT_FALSE(areDoublesEquivalent(1.000, 1.005, 0.001)); } diff --git a/src/lib/util/tests/stopwatch_unittest.cc b/src/lib/util/tests/stopwatch_unittest.cc index 10abef2052..4c26f36203 100644 --- a/src/lib/util/tests/stopwatch_unittest.cc +++ b/src/lib/util/tests/stopwatch_unittest.cc @@ -244,7 +244,7 @@ TEST_F(StopwatchTest, realTime) { // Start it again. stopwatch.start(); - // Slee for 1 ms. + // Sleep for 1 ms. usleep(1000); // The durations should get updated as appropriate. diff --git a/src/lib/util/tests/unlock_guard_unittests.cc b/src/lib/util/tests/unlock_guard_unittests.cc index c64caa425a..f5acea0173 100644 --- a/src/lib/util/tests/unlock_guard_unittests.cc +++ b/src/lib/util/tests/unlock_guard_unittests.cc @@ -73,7 +73,7 @@ public: } if (lock_ == 1) { // only one thread has the lock - // self healing mutex reseting the dead lock flag + // self healing mutex resetting the dead lock flag dead_lock_ = false; // reset the thread id id_ = std::thread::id(); diff --git a/src/lib/yang/adaptor_option.h b/src/lib/yang/adaptor_option.h index 594c883882..a7e8d5ce7c 100644 --- a/src/lib/yang/adaptor_option.h +++ b/src/lib/yang/adaptor_option.h @@ -73,7 +73,7 @@ public: /// @brief Collect definition. /// /// This method looks at an option definition and adds the - /// space+name to code maping into the OptionCodes codes store + /// space+name to code mapping into the OptionCodes codes store /// aka definitions. /// /// @param option The option definition. diff --git a/src/lib/yang/testutils/translator_test.cc b/src/lib/yang/testutils/translator_test.cc index 1405ee53a0..b1df18ee6f 100644 --- a/src/lib/yang/testutils/translator_test.cc +++ b/src/lib/yang/testutils/translator_test.cc @@ -285,7 +285,7 @@ YangRepr::set(const Tree& tree, S_Session session) const { default: isc_throw(NotImplemented, - "YangRepr::set called with unupported type: " + "YangRepr::set called with unsupported type: " << item.type_); } session->set_item(item.xpath_.c_str(), s_val); diff --git a/src/lib/yang/translator.cc b/src/lib/yang/translator.cc index 3cac6fa6b0..1352ba6b80 100644 --- a/src/lib/yang/translator.cc +++ b/src/lib/yang/translator.cc @@ -103,7 +103,7 @@ TranslatorBasic::value(S_Val s_val) { default: isc_throw(NotImplemented, - "value called with unupported type: " << s_val->type()); + "value called with unsupported type: " << s_val->type()); } } @@ -278,7 +278,7 @@ TranslatorBasic::value(ConstElementPtr elem, sr_type_t type) { default: isc_throw(NotImplemented, - "value called with unupported type: " << type); + "value called with unsupported type: " << type); } return (s_val); diff --git a/src/lib/yang/translator_class.h b/src/lib/yang/translator_class.h index a027d4a724..b6a9926099 100644 --- a/src/lib/yang/translator_class.h +++ b/src/lib/yang/translator_class.h @@ -25,7 +25,7 @@ namespace yang { /// "option-data":