From 6ae0d625f0571efa6482618636629e8e210a7718 Mon Sep 17 00:00:00 2001 From: "Jeremy C. Reed" Date: Wed, 6 Mar 2013 08:41:51 -0600 Subject: [PATCH] [master] many misspelling and typo fixes reviewed by jelte via jabber. Changes some log message descriptions and some function arguments and some output. --- doc/design/cc-protocol.txt | 4 ++-- doc/devel/01-dns.dox | 2 +- doc/devel/02-dhcp.dox | 2 +- examples/README | 2 +- src/bin/auth/auth_srv.h | 2 +- src/bin/auth/gen-statisticsitems.py.pre.in | 2 +- src/bin/auth/query.cc | 2 +- src/bin/bind10/TODO | 2 +- src/bin/bind10/init_messages.mes | 2 +- src/bin/bindctl/README | 2 +- src/bin/cmdctl/b10-certgen.cc | 6 +++--- src/bin/dbutil/dbutil.py.in | 2 +- src/bin/dbutil/tests/dbutil_test.sh.in | 2 +- src/bin/ddns/ddns.py.in | 4 ++-- src/bin/ddns/tests/ddns_test.py | 8 ++++---- src/bin/dhcp4/ctrl_dhcp4_srv.cc | 2 +- src/bin/dhcp4/ctrl_dhcp4_srv.h | 2 +- src/bin/dhcp4/dhcp4.dox | 2 +- src/bin/dhcp4/tests/config_parser_unittest.cc | 8 ++++---- src/bin/dhcp6/ctrl_dhcp6_srv.cc | 2 +- src/bin/dhcp6/ctrl_dhcp6_srv.h | 2 +- src/bin/dhcp6/dhcp6.dox | 2 +- src/bin/dhcp6/dhcp6_srv.cc | 2 +- src/bin/dhcp6/tests/config_parser_unittest.cc | 8 ++++---- src/bin/loadzone/tests/loadzone_test.py | 2 +- src/bin/msgq/msgq.py.in | 2 +- src/bin/resolver/response_scrubber.h | 4 ++-- .../sockcreator/tests/sockcreator_tests.cc | 2 +- src/bin/stats/tests/b10-stats-httpd_test.py | 2 +- src/bin/stats/tests/b10-stats_test.py | 4 ++-- src/bin/xfrin/tests/xfrin_test.py | 2 +- src/bin/xfrin/xfrin.py.in | 4 ++-- src/bin/xfrout/tests/xfrout_test.py.in | 2 +- src/bin/xfrout/xfrout.py.in | 2 +- src/lib/asiodns/io_fetch.h | 2 +- src/lib/asiodns/sync_udp_server.cc | 8 ++++---- src/lib/asiodns/tests/dns_server_unittest.cc | 8 ++++---- src/lib/asiodns/udp_server.cc | 8 ++++---- src/lib/asiolink/io_asio_socket.h | 2 +- src/lib/cc/data.h | 2 +- src/lib/cc/session.cc | 2 +- src/lib/cc/tests/session_unittests.cc | 2 +- src/lib/config/documentation.txt | 2 +- src/lib/config/tests/fake_session.cc | 4 ++-- src/lib/datasrc/database.h | 2 +- src/lib/datasrc/master_loader_callbacks.h | 2 +- src/lib/datasrc/memory/domaintree.h | 2 +- src/lib/datasrc/memory/rdata_serialization.h | 2 +- src/lib/datasrc/memory/zone_finder.cc | 2 +- src/lib/datasrc/sqlite3_accessor.cc | 2 +- src/lib/datasrc/tests/testdata/rrset_toWire2 | 2 +- src/lib/datasrc/zone_iterator.h | 2 +- src/lib/dhcp/dhcp6.h | 2 +- src/lib/dhcp/libdhcp++.h | 2 +- src/lib/dhcp/option.h | 4 ++-- src/lib/dhcp/option_custom.h | 2 +- src/lib/dhcp/option_data_types.h | 2 +- src/lib/dhcp/option_definition.h | 4 ++-- src/lib/dhcp/option_int.h | 2 +- src/lib/dhcp/option_int_array.h | 2 +- src/lib/dhcp/tests/duid_unittest.cc | 2 +- src/lib/dhcp/tests/iface_mgr_unittest.cc | 6 +++--- src/lib/dhcp/tests/libdhcp++_unittest.cc | 12 +++++------ src/lib/dhcp/tests/option_custom_unittest.cc | 6 +++--- src/lib/dhcp/tests/option_unittest.cc | 2 +- src/lib/dhcpsrv/cfgmgr.h | 4 ++-- src/lib/dhcpsrv/dbaccess_parser.h | 4 ++-- src/lib/dhcpsrv/dhcp_config_parser.h | 2 +- src/lib/dhcpsrv/dhcpsrv_messages.mes | 2 +- src/lib/dhcpsrv/lease_mgr.h | 4 ++-- src/lib/dhcpsrv/mysql_lease_mgr.h | 2 +- src/lib/dhcpsrv/subnet.h | 2 +- .../tests/lease_mgr_factory_unittest.cc | 2 +- src/lib/dhcpsrv/tests/lease_mgr_unittest.cc | 2 +- src/lib/dhcpsrv/tests/subnet_unittest.cc | 2 +- src/lib/dns/gen-rdatacode.py.in | 2 +- src/lib/dns/messagerenderer.cc | 2 +- .../dns/python/tests/message_python_test.py | 2 +- .../tests/rrset_collection_python_test.py | 2 +- src/lib/dns/tests/testdata/rrset_toWire2 | 2 +- src/lib/log/tests/logger_example.cc | 2 +- src/lib/nsas/TODO | 2 +- src/lib/nsas/address_request_callback.h | 2 +- src/lib/nsas/nameserver_entry.h | 6 +++--- src/lib/nsas/tests/hash_unittest.cc | 2 +- src/lib/nsas/tests/zone_entry_unittest.cc | 2 +- src/lib/python/isc/bind10/sockcreator.py | 2 +- .../python/isc/bind10/tests/component_test.py | 2 +- .../isc/bind10/tests/socket_cache_test.py | 2 +- src/lib/python/isc/cc/tests/session_test.py | 6 +++--- src/lib/python/isc/config/ccsession.py | 2 +- src/lib/python/isc/config/cfgmgr.py | 4 ++-- .../python/isc/config/tests/ccsession_test.py | 4 ++-- .../python/isc/datasrc/tests/datasrc_test.py | 2 +- .../server_common/tests/tsig_keyring_test.py | 2 +- src/lib/python/isc/xfrin/diff.py | 20 +++++++++---------- src/lib/python/isc/xfrin/tests/diff_tests.py | 2 +- src/lib/util/encode/base16_from_binary.h | 2 +- src/lib/util/encode/base32hex_from_binary.h | 2 +- src/lib/util/encode/binary_from_base16.h | 2 +- src/lib/util/encode/binary_from_base32hex.h | 2 +- src/lib/util/lru_list.h | 2 +- src/lib/util/python/gen_wiredata.py.in | 4 ++-- src/lib/util/tests/lru_list_unittest.cc | 2 +- src/lib/util/unittests/run_all.cc | 2 +- .../features/terrain/bind10_control.py | 2 +- tests/lettuce/features/terrain/nsupdate.py | 2 +- tests/lettuce/features/terrain/querying.py | 2 +- tests/tools/badpacket/option_info.h | 2 +- tests/tools/dhcp-ubench/benchmark.h | 2 +- tests/tools/dhcp-ubench/dhcp-perf-guide.xml | 4 ++-- tests/tools/perfdhcp/command_options.h | 2 +- tests/tools/perfdhcp/stats_mgr.h | 6 +++--- tests/tools/perfdhcp/test_control.cc | 2 +- tests/tools/perfdhcp/test_control.h | 4 ++-- .../perfdhcp/tests/command_options_helper.h | 2 +- .../tests/command_options_unittest.cc | 2 +- .../perfdhcp/tests/stats_mgr_unittest.cc | 2 +- .../perfdhcp/tests/test_control_unittest.cc | 2 +- tools/query_cmp/src/lib/compare_rrset.py | 2 +- tools/reorder_message_file.py | 2 +- 121 files changed, 181 insertions(+), 181 deletions(-) diff --git a/doc/design/cc-protocol.txt b/doc/design/cc-protocol.txt index 012953087..0543a52d3 100644 --- a/doc/design/cc-protocol.txt +++ b/doc/design/cc-protocol.txt @@ -261,8 +261,8 @@ Group Subscriptions (type "subscribe") -------------------------------------- A subscription requires the "group", "instance", and a flag to -indicate the subscription type ("sybtype"). If instance is "*" the -instance name will be ignored when decising to forward a message to +indicate the subscription type ("subtype"). If instance is "*" the +instance name will be ignored when deciding to forward a message to this client or not. "subtype" is a DATA element, and contains "normal" for normal channel diff --git a/doc/devel/01-dns.dox b/doc/devel/01-dns.dox index e72dbbde2..ed76deaa9 100644 --- a/doc/devel/01-dns.dox +++ b/doc/devel/01-dns.dox @@ -8,7 +8,7 @@ * * @section b10-cfgmgr b10-cfgmgr Overview * - * @todo: Descibe b10-cfgmgr here. + * @todo: Describe b10-cfgmgr here. * * */ diff --git a/doc/devel/02-dhcp.dox b/doc/devel/02-dhcp.dox index b98920f70..ddc5e2302 100644 --- a/doc/devel/02-dhcp.dox +++ b/doc/devel/02-dhcp.dox @@ -21,7 +21,7 @@ * * DHCPv4 server component is now integrated with the BIND10 message queue. * The integration is performed by establishSession() and disconnectSession() - * functions in isc::dhcp::ControlledDhcpv4Srv class. main() method deifined + * functions in isc::dhcp::ControlledDhcpv4Srv class. main() method defined * in the src/bin/dhcp4/main.cc file instantiates isc::dhcp::ControlledDhcpv4Srv * class that establishes connection with msgq and install necessary handlers * for receiving commands and configuration updates. It is derived from diff --git a/examples/README b/examples/README index aa5f3c97d..e8e7953c5 100644 --- a/examples/README +++ b/examples/README @@ -31,7 +31,7 @@ sinclude(m4/ax_boost_include.m4) sinclude(m4/ax_isc_bind10.m4) (and same for other m4 files as they are added under m4/) -On some systems, espeically if you have installed the BIND 10 +On some systems, especially if you have installed the BIND 10 libraries in an uncommon path, programs linked with the BIND 10 library may not work at run time due to the "missing" shared library. Normally, you should be able to avoid this problem by making sure diff --git a/src/bin/auth/auth_srv.h b/src/bin/auth/auth_srv.h index 107e2e6e2..8ad72bef9 100644 --- a/src/bin/auth/auth_srv.h +++ b/src/bin/auth/auth_srv.h @@ -228,7 +228,7 @@ public: * \brief Set and get the addresses we listen on. */ void setListenAddresses(const isc::server_common::portconfig::AddressList& - addreses); + addresses); const isc::server_common::portconfig::AddressList& getListenAddresses() const; diff --git a/src/bin/auth/gen-statisticsitems.py.pre.in b/src/bin/auth/gen-statisticsitems.py.pre.in index e2d162304..ca5e01383 100755 --- a/src/bin/auth/gen-statisticsitems.py.pre.in +++ b/src/bin/auth/gen-statisticsitems.py.pre.in @@ -289,7 +289,7 @@ def generate_cxx(itemsfile, ccfile, utfile, def_mtime): This method recursively builds two lists: - msg_counter_types consists of strings for all leaf items, each defines one enum element with a comment, e.g. - COUNTER_ITEM, ///< item's descriptin + COUNTER_ITEM, ///< item's description - item_names consists of tuples of three elements, depending on whether it's a leaf element (no child from it) or not: (leaf) ( "item_name", NULL, COUNTER_ITEM ) diff --git a/src/bin/auth/query.cc b/src/bin/auth/query.cc index c5b9b1627..770f624c8 100644 --- a/src/bin/auth/query.cc +++ b/src/bin/auth/query.cc @@ -373,7 +373,7 @@ Query::process(datasrc::ClientList& client_list, // If we have no matching authoritative zone for the query name, return // REFUSED. In short, this is to be compatible with BIND 9, but the // background discussion is not that simple. See the relevant topic - // at the BIND 10 developers's ML: + // at the BIND 10 developers' ML: // https://lists.isc.org/mailman/htdig/bind10-dev/2010-December/001633.html if (result.dsrc_client_ == NULL) { // If we tried to find a "parent zone" for a DS query and failed, diff --git a/src/bin/bind10/TODO b/src/bin/bind10/TODO index 6f50dbddf..82abdb1bb 100644 --- a/src/bin/bind10/TODO +++ b/src/bin/bind10/TODO @@ -6,7 +6,7 @@ - Stop a component - Force-stop a component - Mechanism to wait for child to start before continuing -- Use .spec file to define comands +- Use .spec file to define commands - Rename "c-channel" stuff to msgq for clarity - Reply to shutdown message? - Some sort of group creation so termination signals can be sent to diff --git a/src/bin/bind10/init_messages.mes b/src/bin/bind10/init_messages.mes index 9cdb7efcb..e4e354cfb 100644 --- a/src/bin/bind10/init_messages.mes +++ b/src/bin/bind10/init_messages.mes @@ -34,7 +34,7 @@ The named component is about to be started by the b10-init process. % BIND10_COMPONENT_START_EXCEPTION component %1 failed to start: %2 An exception (mentioned in the message) happened during the startup of the -named component. The componet is not considered started and further actions +named component. The component is not considered started and further actions will be taken about it. % BIND10_COMPONENT_STOP component %1 is being stopped diff --git a/src/bin/bindctl/README b/src/bin/bindctl/README index 8b98ff58c..a9a185f6b 100644 --- a/src/bin/bindctl/README +++ b/src/bin/bindctl/README @@ -1,2 +1,2 @@ 1. Start bindctl by run command "sh bindctl". -2. Login to b10-cmdctld with the username and password. The username and password will be saved in file default_user.csv automatcally after logining successfully, so next time bindctl will login with the username and password saved in default_user.csv. For more usage information, please turn to "man bindctl". \ No newline at end of file +2. Login to b10-cmdctl with the username and password. The username and password will be saved in file default_user.csv automatically after logining successfully, so next time bindctl will login with the username and password saved in default_user.csv. For more usage information, please turn to "man bindctl". diff --git a/src/bin/cmdctl/b10-certgen.cc b/src/bin/cmdctl/b10-certgen.cc index 579ae60e1..59bba9ebb 100644 --- a/src/bin/cmdctl/b10-certgen.cc +++ b/src/bin/cmdctl/b10-certgen.cc @@ -62,7 +62,7 @@ usage() { std::cout << "Options:" << std::endl; std::cout << "-c, --certfile=FILE\t\tfile to read or store the certificate" << std::endl; - std::cout << "-f, --force\t\t\toverwrite existing certficate even if it" + std::cout << "-f, --force\t\t\toverwrite existing certificate even if it" << std::endl <<"\t\t\t\tis valid" << std::endl; std::cout << "-h, --help\t\t\tshow this help" << std::endl; std::cout << "-k, --keyfile=FILE\t\tfile to store the generated private key" @@ -194,7 +194,7 @@ public: print("Creating certificate file " + cert_file_name); - // The exact call changed aftert 1.8, adding the + // The exact call changed after 1.8, adding the // hash function option #if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,0) X509_Certificate cert = @@ -229,7 +229,7 @@ public: validateCertificate(const std::string& certfile) { // Since we are dealing with a self-signed certificate here, we // also use the certificate to check itself; i.e. we add it - // as a trusted certificate, then validate the certficate itself. + // as a trusted certificate, then validate the certificate itself. //const X509_Certificate cert(certfile); try { X509_Store store; diff --git a/src/bin/dbutil/dbutil.py.in b/src/bin/dbutil/dbutil.py.in index 7a1469cfc..292a0babb 100755 --- a/src/bin/dbutil/dbutil.py.in +++ b/src/bin/dbutil/dbutil.py.in @@ -16,7 +16,7 @@ # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. """ -@file Dabase Utilities +@file Database Utilities This file holds the "dbutil" program, a general utility program for doing management of the BIND 10 database. There are two modes of operation: diff --git a/src/bin/dbutil/tests/dbutil_test.sh.in b/src/bin/dbutil/tests/dbutil_test.sh.in index 4bc9f85ce..a98e4b1c2 100755 --- a/src/bin/dbutil/tests/dbutil_test.sh.in +++ b/src/bin/dbutil/tests/dbutil_test.sh.in @@ -132,7 +132,7 @@ check_no_backup() { # .schema command, with spaces removed and upper converted to lowercase. # # The database is copied before the schema is taken (and removed after) -# as SQLite3 assummes a writeable database, which may not be the case if +# as SQLite3 assumes a writeable database, which may not be the case if # getting the schema from a reference copy. # # @param $1 Database for which the schema is required diff --git a/src/bin/ddns/ddns.py.in b/src/bin/ddns/ddns.py.in index d382495e4..6f09bcc0a 100755 --- a/src/bin/ddns/ddns.py.in +++ b/src/bin/ddns/ddns.py.in @@ -236,7 +236,7 @@ class DDNSServer: '''Exception for internal errors in an update session. This exception is expected to be caught within the server class, - only used for controling the code flow. + only used for controlling the code flow. ''' pass @@ -511,7 +511,7 @@ class DDNSServer: Right now, this is a straightforward subroutine of handle_request(), but is intended to be extended evetually so that it can handle more - comlicated operations for TCP (which requires asynchronous write). + complicated operations for TCP (which requires asynchronous write). Further, when we support multiple requests over a single TCP connection, this method may even be shared by multiple methods. diff --git a/src/bin/ddns/tests/ddns_test.py b/src/bin/ddns/tests/ddns_test.py index e7d2099f9..4cf31be49 100755 --- a/src/bin/ddns/tests/ddns_test.py +++ b/src/bin/ddns/tests/ddns_test.py @@ -40,7 +40,7 @@ READ_ZONE_DB_FILE = TESTDATA_PATH + "rwtest.sqlite3" # original, to be copied TEST_ZONE_NAME = Name('example.org') TEST_ZONE_NAME_STR = TEST_ZONE_NAME.to_text() UPDATE_RRTYPE = RRType.SOA -TEST_QID = 5353 # arbitrary chosen +TEST_QID = 5353 # arbitrarily chosen TEST_RRCLASS = RRClass.IN TEST_RRCLASS_STR = TEST_RRCLASS.to_text() TEST_SERVER6 = ('2001:db8::53', 53, 0, 0) @@ -53,7 +53,7 @@ TEST_ACL_CONTEXT = isc.acl.dns.RequestContext( socket.IPPROTO_UDP, socket.AI_NUMERICHOST)[0][4]) # TSIG key for tests when needed. The key name is TEST_ZONE_NAME. TEST_TSIG_KEY = TSIGKey("example.org:SFuWd/q99SzF8Yzd1QbB9g==") -# TSIG keyring that contanins the test key +# TSIG keyring that contains the test key TEST_TSIG_KEYRING = TSIGKeyRing() TEST_TSIG_KEYRING.add(TEST_TSIG_KEY) # Another TSIG key not in the keyring, making verification fail @@ -450,7 +450,7 @@ class TestDDNSServer(unittest.TestCase): self.assertEqual(1, isc.config.parse_answer(answer)[0]) self.assertEqual({}, self.ddns_server._zone_config) - # the first zone cofig is valid, but not the second. the first one + # the first zone config is valid, but not the second. the first one # shouldn't be installed. bad_config = { 'zones': [ { 'origin': TEST_ZONE_NAME_STR, 'class': TEST_RRCLASS_STR, @@ -856,7 +856,7 @@ class TestDDNSServer(unittest.TestCase): def test_select_multi_tcp(self): '''Test continuation of sending a TCP response, multiple sockets.''' # Check if the implementation still works with multiple outstanding - # TCP contexts. We use three (arbitray choice), of which two will be + # TCP contexts. We use three (arbitrary choice), of which two will be # writable after select and complete the send. tcp_socks = [] for i in range(0, 3): diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc index 8ac49d3cd..eb7d5599a 100644 --- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc +++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc @@ -156,7 +156,7 @@ void ControlledDhcpv4Srv::establishSession() { // Dumy configuration handler is internally invoked by the // constructor and on success the constructor updates // the current session with the configuration that had been - // commited in the previous session. If we did not install + // committed in the previous session. If we did not install // the dummy handler, the previous configuration would have // been lost. config_session_ = new ModuleCCSession(specfile, *cc_session_, diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.h b/src/bin/dhcp4/ctrl_dhcp4_srv.h index ac15c44c3..e45deff9c 100644 --- a/src/bin/dhcp4/ctrl_dhcp4_srv.h +++ b/src/bin/dhcp4/ctrl_dhcp4_srv.h @@ -136,7 +136,7 @@ protected: /// @brief Helper session object that represents raw connection to msgq. isc::cc::Session* cc_session_; - /// @brief Session that receives configuation and commands + /// @brief Session that receives configuration and commands isc::config::ModuleCCSession* config_session_; }; diff --git a/src/bin/dhcp4/dhcp4.dox b/src/bin/dhcp4/dhcp4.dox index c189c8af7..86ae845a9 100644 --- a/src/bin/dhcp4/dhcp4.dox +++ b/src/bin/dhcp4/dhcp4.dox @@ -33,7 +33,7 @@ assigned is not implemented in IfaceMgr yet. DHCPv4 server component is now integrated with BIND10 message queue. The integration is performed by establishSession() and disconnectSession() -functions in isc::dhcp::ControlledDhcpv4Srv class. main() method deifined +functions in isc::dhcp::ControlledDhcpv4Srv class. main() method defined in the src/bin/dhcp4/main.cc file instantiates isc::dhcp::ControlledDhcpv4Srv class that establishes connection with msgq and install necessary handlers for receiving commands and configuration updates. It is derived from diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc index 9b3be5134..80b304c8b 100644 --- a/src/bin/dhcp4/tests/config_parser_unittest.cc +++ b/src/bin/dhcp4/tests/config_parser_unittest.cc @@ -487,7 +487,7 @@ TEST_F(Dhcp4ParserTest, optionDefIpv4Address) { EXPECT_TRUE(def->getEncapsulatedSpace().empty()); } -// The goal of this test is to check whether an option definiiton +// The goal of this test is to check whether an option definition // that defines an option carrying a record of data fields can // be created. TEST_F(Dhcp4ParserTest, optionDefRecord) { @@ -1060,7 +1060,7 @@ TEST_F(Dhcp4ParserTest, optionDataTwoSpaces) { ASSERT_TRUE(status); checkResult(status, 0); - // Options should be now availabe for the subnet. + // Options should be now available for the subnet. Subnet4Ptr subnet = CfgMgr::instance().getSubnet4(IOAddress("192.0.2.200")); ASSERT_TRUE(subnet); // Try to get the option from the space dhcp4. @@ -1430,7 +1430,7 @@ TEST_F(Dhcp4ParserTest, optionDataInvalidChar) { testInvalidOptionParam("01020R", "data"); } -// Verify that option data containins '0x' prefix is rejected +// Verify that option data containing '0x' prefix is rejected // by the configuration. TEST_F(Dhcp4ParserTest, optionDataUnexpectedPrefix) { // Option code 0 is reserved and should not be accepted @@ -1530,7 +1530,7 @@ TEST_F(Dhcp4ParserTest, stdOptionData) { boost::shared_ptr option_addrs = boost::dynamic_pointer_cast(option); // If cast is unsuccessful than option returned was of a - // differnt type than Option6IA. This is wrong. + // different type than Option6IA. This is wrong. ASSERT_TRUE(option_addrs); // Get addresses from the option. diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc index e4e17f1ea..c3488e5af 100644 --- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc +++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc @@ -155,7 +155,7 @@ void ControlledDhcpv6Srv::establishSession() { // Dumy configuration handler is internally invoked by the // constructor and on success the constructor updates // the current session with the configuration that had been - // commited in the previous session. If we did not install + // committed in the previous session. If we did not install // the dummy handler, the previous configuration would have // been lost. config_session_ = new ModuleCCSession(specfile, *cc_session_, diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.h b/src/bin/dhcp6/ctrl_dhcp6_srv.h index 0e699ce54..908304d17 100644 --- a/src/bin/dhcp6/ctrl_dhcp6_srv.h +++ b/src/bin/dhcp6/ctrl_dhcp6_srv.h @@ -134,7 +134,7 @@ protected: /// @brief Helper session object that represents raw connection to msgq. isc::cc::Session* cc_session_; - /// @brief Session that receives configuation and commands + /// @brief Session that receives configuration and commands isc::config::ModuleCCSession* config_session_; }; diff --git a/src/bin/dhcp6/dhcp6.dox b/src/bin/dhcp6/dhcp6.dox index 3a738ecff..4376a2a83 100644 --- a/src/bin/dhcp6/dhcp6.dox +++ b/src/bin/dhcp6/dhcp6.dox @@ -51,7 +51,7 @@ list of parsers for each received entry. Parser is an object that is derived from a DhcpConfigParser class. Once a parser is created (constructor), its value is set (using build() method). Once all parsers are - build, the configuration is then applied ("commited") and commit() method is + build, the configuration is then applied ("committed") and commit() method is called. All parsers are defined in src/bin/dhcp6/config_parser.cc file. Some of them diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc index 5f1580fbf..4c19e743d 100644 --- a/src/bin/dhcp6/dhcp6_srv.cc +++ b/src/bin/dhcp6/dhcp6_srv.cc @@ -353,7 +353,7 @@ Dhcpv6Srv::generateServerID() { } // Some interfaces (like lo on Linux) report 6-bytes long - // MAC adress 00:00:00:00:00:00. Let's not use such weird interfaces + // MAC address 00:00:00:00:00:00. Let's not use such weird interfaces // to generate DUID. if (isRangeZero(iface->getMac(), iface->getMac() + iface->getMacLen())) { continue; diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc index 4430cb234..63fc98090 100644 --- a/src/bin/dhcp6/tests/config_parser_unittest.cc +++ b/src/bin/dhcp6/tests/config_parser_unittest.cc @@ -598,7 +598,7 @@ TEST_F(Dhcp6ParserTest, optionDefIpv6Address) { EXPECT_EQ(OPT_IPV6_ADDRESS_TYPE, def->getType()); } -// The goal of this test is to check whether an option definiiton +// The goal of this test is to check whether an option definition // that defines an option carrying a record of data fields can // be created. TEST_F(Dhcp6ParserTest, optionDefRecord) { @@ -1176,7 +1176,7 @@ TEST_F(Dhcp6ParserTest, optionDataTwoSpaces) { ASSERT_TRUE(status); checkResult(status, 0); - // Options should be now availabe for the subnet. + // Options should be now available for the subnet. Subnet6Ptr subnet = CfgMgr::instance().getSubnet6(IOAddress("2001:db8:1::5")); ASSERT_TRUE(subnet); // Try to get the option from the space dhcp6. @@ -1484,7 +1484,7 @@ TEST_F(Dhcp6ParserTest, optionDataInvalidChar) { testInvalidOptionParam("01020R", "data"); } -// Verify that option data containins '0x' prefix is rejected +// Verify that option data containing '0x' prefix is rejected // by the configuration. TEST_F(Dhcp6ParserTest, optionDataUnexpectedPrefix) { // Option code 0 is reserved and should not be accepted @@ -1582,7 +1582,7 @@ TEST_F(Dhcp6ParserTest, stdOptionData) { boost::shared_ptr optionIA = boost::dynamic_pointer_cast(option); // If cast is unsuccessful than option returned was of a - // differnt type than Option6IA. This is wrong. + // different type than Option6IA. This is wrong. ASSERT_TRUE(optionIA); // If cast was successful we may use accessors exposed by // Option6IA to validate that the content of this option diff --git a/src/bin/loadzone/tests/loadzone_test.py b/src/bin/loadzone/tests/loadzone_test.py index 351bc5921..16499baa8 100755 --- a/src/bin/loadzone/tests/loadzone_test.py +++ b/src/bin/loadzone/tests/loadzone_test.py @@ -41,7 +41,7 @@ ORIG_SOA_TXT = 'example.org. 3600 IN SOA ns1.example.org. ' +\ 'admin.example.org. 1234 3600 1800 2419200 7200\n' NEW_SOA_TXT = 'example.org. 3600 IN SOA ns.example.org. ' +\ 'admin.example.org. 1235 3600 1800 2419200 7200\n' -# This is the brandnew SOA for a newly created zone +# This is the brand new SOA for a newly created zone ALT_NEW_SOA_TXT = 'example.com. 3600 IN SOA ns.example.com. ' +\ 'admin.example.com. 1234 3600 1800 2419200 7200\n' diff --git a/src/bin/msgq/msgq.py.in b/src/bin/msgq/msgq.py.in index 63d008ecc..6435c9260 100755 --- a/src/bin/msgq/msgq.py.in +++ b/src/bin/msgq/msgq.py.in @@ -406,7 +406,7 @@ class MsgQ: routing, data = self.read_packet(fd, sock) except (MsgQReceiveError, MsgQCloseOnReceive) as err: # If it's MsgQCloseOnReceive and that happens without reading - # any data, it basically means the remote clinet has closed the + # any data, it basically means the remote client has closed the # socket, so we log it as debug information. Otherwise, it's # a somewhat unexpected event, so we consider it an "error". if isinstance(err, MsgQCloseOnReceive) and not err.partial_read: diff --git a/src/bin/resolver/response_scrubber.h b/src/bin/resolver/response_scrubber.h index cb80b26e0..af4bd9705 100644 --- a/src/bin/resolver/response_scrubber.h +++ b/src/bin/resolver/response_scrubber.h @@ -25,7 +25,7 @@ /// unsigned data in a response is more of a problem. (Note that even data from /// signed zones may be not be signed, e.g. delegations are not signed.) In /// particular, how do we know that the server from which the response was -/// received was authoritive for the data it returned? +/// received was authoritative for the data it returned? /// /// The part of the code that checks for this is the "Data Scrubbing" module. /// Although it includes the checking of IP addresses and ports, it is called @@ -219,7 +219,7 @@ /// referral been to the com nameservers, it would be a valid response; the com /// zone could well be serving all the data for example.com. Having said that, /// the A record for ns1.example.net would still be regarded as being out of -/// bailiwick becase the nameserver is not authoritative for the .net zone. +/// bailiwick because the nameserver is not authoritative for the .net zone. /// /// \subsection DataScrubbingEx4 Example 4: Inconsistent Answer Section /// Qu: www.example.com\n diff --git a/src/bin/sockcreator/tests/sockcreator_tests.cc b/src/bin/sockcreator/tests/sockcreator_tests.cc index b834e1cbb..67fb53ea8 100644 --- a/src/bin/sockcreator/tests/sockcreator_tests.cc +++ b/src/bin/sockcreator/tests/sockcreator_tests.cc @@ -99,7 +99,7 @@ udpCheck(const int socknum) { } // The check function (tcpCheck/udpCheck) is passed as a parameter to the test -// code, so provide a conveniet typedef. +// code, so provide a convenient typedef. typedef void (*socket_check_t)(const int); // Address-family-specific scoket checks. diff --git a/src/bin/stats/tests/b10-stats-httpd_test.py b/src/bin/stats/tests/b10-stats-httpd_test.py index 466e44843..9a463abd7 100644 --- a/src/bin/stats/tests/b10-stats-httpd_test.py +++ b/src/bin/stats/tests/b10-stats-httpd_test.py @@ -173,7 +173,7 @@ class TestItemNameList(unittest.TestCase): stats_httpd.item_name_list({'a':[1,2,3]}, 'a')) self.assertEqual(['a', 'a[0]', 'a[1]', 'a[2]'], stats_httpd.item_name_list({'a':[1,2,3]}, '')) - # for a list under adict under a dict + # for a list under a dict under a dict self.assertEqual(['a', 'a/b', 'a/b[0]', 'a/b[1]', 'a/b[2]'], stats_httpd.item_name_list({'a':{'b':[1,2,3]}}, 'a')) self.assertEqual(['a', 'a/b', 'a/b[0]', 'a/b[1]', 'a/b[2]'], diff --git a/src/bin/stats/tests/b10-stats_test.py b/src/bin/stats/tests/b10-stats_test.py index 773290252..f807168e2 100644 --- a/src/bin/stats/tests/b10-stats_test.py +++ b/src/bin/stats/tests/b10-stats_test.py @@ -398,8 +398,8 @@ class TestStats(unittest.TestCase): (0, "Stats is up. (PID " + str(os.getpid()) + ")")) # 'showschema' command. update_modules() will be called, which - # (implicitly) cofirms the correct method is called; further details - # are tested seprately. + # (implicitly) confirms the correct method is called; further details + # are tested separately. call_log = [] (rcode, value) = self.__send_command(__stats, 'showschema') self.assertEqual([('update_module', ())], call_log) diff --git a/src/bin/xfrin/tests/xfrin_test.py b/src/bin/xfrin/tests/xfrin_test.py index 272124b3d..86c2ef5bf 100644 --- a/src/bin/xfrin/tests/xfrin_test.py +++ b/src/bin/xfrin/tests/xfrin_test.py @@ -607,7 +607,7 @@ class TestXfrinIXFRAdd(TestXfrinState): # signed, rejecting it. self.assertRaises(xfrin.XfrinProtocolError, self.state.handle_rr, self.conn, end_soa_rrset) - # No diffs were commited + # No diffs were committed self.assertEqual([], self.conn._datasrc_client.committed_diffs) def test_handle_out_of_sync(self): diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in index 65a27bbce..12a4a1093 100755 --- a/src/bin/xfrin/xfrin.py.in +++ b/src/bin/xfrin/xfrin.py.in @@ -432,7 +432,7 @@ class XfrinIXFRAdd(XfrinState): if soa_serial == conn._end_serial: # The final part is there. Finish the transfer by # checking the last TSIG (if required), the zone data and - # commiting. + # committing. conn.finish_transfer() self.set_xfrstate(conn, XfrinIXFREnd()) return True @@ -820,7 +820,7 @@ class XfrinConnection(asyncore.dispatcher): def finish_transfer(self): """ Perform any necessary checks after a transfer. Then complete the - transfer by commiting the transaction into the data source. + transfer by committing the transaction into the data source. """ self._check_response_tsig_last() if not check_zone(self._zone_name, self._rrclass, diff --git a/src/bin/xfrout/tests/xfrout_test.py.in b/src/bin/xfrout/tests/xfrout_test.py.in index 2802ace46..f663e55cd 100644 --- a/src/bin/xfrout/tests/xfrout_test.py.in +++ b/src/bin/xfrout/tests/xfrout_test.py.in @@ -191,7 +191,7 @@ class Dbserver: self.transfer_counter -= 1 class TestXfroutSessionBase(unittest.TestCase): - '''Base classs for tests related to xfrout sessions + '''Base class for tests related to xfrout sessions This class defines common setup/teadown and utility methods. Actual tests are delegated to subclasses. diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in index d6ef360a8..2939dc001 100755 --- a/src/bin/xfrout/xfrout.py.in +++ b/src/bin/xfrout/xfrout.py.in @@ -186,7 +186,7 @@ class XfroutSession(): ''' # Check the xfrout quota. We do both increase/decrease in this - # method so it's clear we always release it once acuired. + # method so it's clear we always release it once acquired. quota_ok = self._server.increase_transfers_counter() ex = None try: diff --git a/src/lib/asiodns/io_fetch.h b/src/lib/asiodns/io_fetch.h index c31ee092c..0a0314486 100644 --- a/src/lib/asiodns/io_fetch.h +++ b/src/lib/asiodns/io_fetch.h @@ -143,7 +143,7 @@ public: /// \brief Constructor /// This constructor has one parameter "query_message", which /// is the shared_ptr to a full query message. It's different - /// with above contructor which has only question section. All + /// with above constructor which has only question section. All /// other parameters are same. /// /// \param query_message the shared_ptr to a full query message diff --git a/src/lib/asiodns/sync_udp_server.cc b/src/lib/asiodns/sync_udp_server.cc index c3f5348fc..d5d2a7a86 100644 --- a/src/lib/asiodns/sync_udp_server.cc +++ b/src/lib/asiodns/sync_udp_server.cc @@ -174,13 +174,13 @@ SyncUDPServer::operator()(asio::error_code, size_t) { void SyncUDPServer::stop() { /// Using close instead of cancel, because cancel - /// will only cancel the asynchornized event already submitted + /// will only cancel the asynchronized event already submitted /// to io service, the events post to io service after /// cancel still can be scheduled by io service, if - /// the socket is cloesed, all the asynchronized event + /// the socket is closed, all the asynchronized event /// for it won't be scheduled by io service not matter it is - /// submit to io serice before or after close call. And we will - //. get bad_descriptor error + /// submit to io service before or after close call. And we will + /// get bad_descriptor error. socket_->close(); stopped_ = true; } diff --git a/src/lib/asiodns/tests/dns_server_unittest.cc b/src/lib/asiodns/tests/dns_server_unittest.cc index c05a34b1a..51fb6b868 100644 --- a/src/lib/asiodns/tests/dns_server_unittest.cc +++ b/src/lib/asiodns/tests/dns_server_unittest.cc @@ -51,8 +51,8 @@ /// Before the server start to run /// After we get the query and check whether it's valid /// After we lookup the query -/// After we compoisite the answer -/// After user get the final result. +/// After we compose the answer +/// After user gets the final result. /// The standard about whether we stop the server successfully or not /// is based on the fact that if the server is still running, the io @@ -83,7 +83,7 @@ const char* const server_port_str = "5553"; const char* const query_message = "BIND10 is awesome"; // \brief provide capacity to derived class the ability -// to stop DNSServer at certern point +// to stop DNSServer at certain point class ServerStopper { public: ServerStopper() : server_to_stop_(NULL) {} @@ -148,7 +148,7 @@ class SimpleAnswer : public DNSAnswer, public ServerStopper { }; // \brief simple client, send one string to server and wait for response -// in case, server stopped and client cann't get response, there is a timer wait +// in case, server stopped and client can't get response, there is a timer wait // for specified seconds (the value is just a estimate since server process logic is quite // simple, and all the intercommunication is local) then cancel the waiting. class SimpleClient : public ServerStopper { diff --git a/src/lib/asiodns/udp_server.cc b/src/lib/asiodns/udp_server.cc index cf4b1c4f8..f84a4d6c7 100644 --- a/src/lib/asiodns/udp_server.cc +++ b/src/lib/asiodns/udp_server.cc @@ -323,13 +323,13 @@ UDPServer::asyncLookup() { void UDPServer::stop() { /// Using close instead of cancel, because cancel - /// will only cancel the asynchornized event already submitted + /// will only cancel the asynchronized event already submitted /// to io service, the events post to io service after /// cancel still can be scheduled by io service, if - /// the socket is cloesed, all the asynchronized event + /// the socket is closed, all the asynchronized event /// for it won't be scheduled by io service not matter it is - /// submit to io serice before or after close call. And we will - //. get bad_descriptor error + /// submit to io service before or after close call. And we will + // get bad_descriptor error. data_->socket_->close(); } diff --git a/src/lib/asiolink/io_asio_socket.h b/src/lib/asiolink/io_asio_socket.h index f6d64a002..a3f3f9708 100644 --- a/src/lib/asiolink/io_asio_socket.h +++ b/src/lib/asiolink/io_asio_socket.h @@ -158,7 +158,7 @@ public: /// (The reason there is a need to know is because the call to open() passes /// in the state of the coroutine at the time the call is made. On an /// asynchronous I/O, we need to set the state to point to the statement - /// after the call to open() _before_ we pass the corouine to the open() + /// after the call to open() _before_ we pass the coroutine to the open() /// call. Unfortunately, the macros that set the state of the coroutine /// also yield control - which we don't want to do if the open is /// synchronous. Hence we need to know before we make the call to open() diff --git a/src/lib/cc/data.h b/src/lib/cc/data.h index db25d9fb3..74e5c123b 100644 --- a/src/lib/cc/data.h +++ b/src/lib/cc/data.h @@ -504,7 +504,7 @@ public: // find the Element at 'id', and store the element pointer in t // returns true if found, or false if not found (either because - // it doesnt exist or one of the elements in the path is not + // it doesn't exist or one of the elements in the path is not // a MapElement) bool find(const std::string& id, ConstElementPtr& t) const; diff --git a/src/lib/cc/session.cc b/src/lib/cc/session.cc index da78bd48b..c2f39edd4 100644 --- a/src/lib/cc/session.cc +++ b/src/lib/cc/session.cc @@ -260,7 +260,7 @@ SessionImpl::getSocketDesc() { /// @todo boost 1.42 uses native() method, but it is deprecated /// in 1.49 and native_handle() is recommended instead if (!socket_.is_open()) { - isc_throw(InvalidOperation, "Can't return socket desciptor: no socket opened."); + isc_throw(InvalidOperation, "Can't return socket descriptor: no socket opened."); } return socket_.native(); } diff --git a/src/lib/cc/tests/session_unittests.cc b/src/lib/cc/tests/session_unittests.cc index fc6e538d5..ed865297e 100644 --- a/src/lib/cc/tests/session_unittests.cc +++ b/src/lib/cc/tests/session_unittests.cc @@ -46,7 +46,7 @@ TEST(AsioSession, establish) { asio::io_service io_service_; Session sess(io_service_); - // can't return socket desciptor before session is established + // can't return socket descriptor before session is established EXPECT_THROW(sess.getSocketDesc(), isc::InvalidOperation); EXPECT_THROW( diff --git a/src/lib/config/documentation.txt b/src/lib/config/documentation.txt index 67fe427ec..a93413078 100644 --- a/src/lib/config/documentation.txt +++ b/src/lib/config/documentation.txt @@ -18,7 +18,7 @@ In order for this to work, it is important that all modules have a way of dynami Overview -------- -Central to the configuration part is the Configuraion Manager b10-cfgmgr. The configuration manager loads any existing configuration, receives configuration updates from user interfaces, and notifies modules about configuration updates. +Central to the configuration part is the Configuration Manager b10-cfgmgr. The configuration manager loads any existing configuration, receives configuration updates from user interfaces, and notifies modules about configuration updates. UI <---UIAPI---> Configuration Manager <---ModuleAPI---> Module <---ModuleAPI---> Module diff --git a/src/lib/config/tests/fake_session.cc b/src/lib/config/tests/fake_session.cc index 56a30d42f..4c19963ae 100644 --- a/src/lib/config/tests/fake_session.cc +++ b/src/lib/config/tests/fake_session.cc @@ -97,7 +97,7 @@ bool FakeSession::recvmsg(ConstElementPtr& msg, bool nonblock, int) { if (started_ && !nonblock) { // This would schedule another read for length, leading to - // corputed data + // corrupted data isc_throw(DoubleRead, "Second read scheduled from recvmsg"); } @@ -119,7 +119,7 @@ FakeSession::recvmsg(ConstElementPtr& env, ConstElementPtr& msg, bool nonblock, { if (started_ && !nonblock) { // This would schedule another read for length, leading to - // corputed data + // corrupted data isc_throw(DoubleRead, "Second read scheduled from recvmsg"); } diff --git a/src/lib/datasrc/database.h b/src/lib/datasrc/database.h index 3302adf8b..19c28ebfb 100644 --- a/src/lib/datasrc/database.h +++ b/src/lib/datasrc/database.h @@ -228,7 +228,7 @@ public: public: /// \brief Destructor /// - /// Virtual destructor, so any descendand class is destroyed correctly. + /// Virtual destructor, so any descendant class is destroyed correctly. virtual ~IteratorContext() {} /// \brief Function to provide next resource record diff --git a/src/lib/datasrc/master_loader_callbacks.h b/src/lib/datasrc/master_loader_callbacks.h index ae827c96b..e1d3a9208 100644 --- a/src/lib/datasrc/master_loader_callbacks.h +++ b/src/lib/datasrc/master_loader_callbacks.h @@ -47,7 +47,7 @@ createMasterLoaderCallbacks(const isc::dns::Name& name, /// loaded RRsets into a zone updater. /// /// The zone updater should be opened in the replace mode no changes should -/// have been done to it yet (but it is not checked). It is not commited +/// have been done to it yet (but it is not checked). It is not committed /// automatically and it is up to the caller to commit the changes (or not). /// It must not be destroyed for the whole time of loading. /// diff --git a/src/lib/datasrc/memory/domaintree.h b/src/lib/datasrc/memory/domaintree.h index 48164525a..6e8b06288 100644 --- a/src/lib/datasrc/memory/domaintree.h +++ b/src/lib/datasrc/memory/domaintree.h @@ -42,7 +42,7 @@ namespace isc { namespace datasrc { namespace memory { -/// Forward declare DomainTree class here is convinent for following +/// Forward declare DomainTree class here is convenient for following /// friend class declare inside DomainTreeNode and DomainTreeNodeChain template class DomainTree; diff --git a/src/lib/datasrc/memory/rdata_serialization.h b/src/lib/datasrc/memory/rdata_serialization.h index e46786cf4..a6146a5ee 100644 --- a/src/lib/datasrc/memory/rdata_serialization.h +++ b/src/lib/datasrc/memory/rdata_serialization.h @@ -533,7 +533,7 @@ public: } } - /// \brief Rewind the iterator to the beginnig of data. + /// \brief Rewind the iterator to the beginning of data. /// /// The following next() and nextSig() will start iterating from the /// beginning again. diff --git a/src/lib/datasrc/memory/zone_finder.cc b/src/lib/datasrc/memory/zone_finder.cc index 5acc5be51..4f9183e88 100644 --- a/src/lib/datasrc/memory/zone_finder.cc +++ b/src/lib/datasrc/memory/zone_finder.cc @@ -144,7 +144,7 @@ struct FindState { // These will be set to a domain node of the highest delegation point, // if any. In fact, we could use a single variable instead of both. - // But then we would need to distinquish these two cases by something + // But then we would need to distinguish these two cases by something // else and it seemed little more confusing when this was written. const ZoneNode* zonecut_node_; const ZoneNode* dname_node_; diff --git a/src/lib/datasrc/sqlite3_accessor.cc b/src/lib/datasrc/sqlite3_accessor.cc index a8580281a..b7c063d11 100644 --- a/src/lib/datasrc/sqlite3_accessor.cc +++ b/src/lib/datasrc/sqlite3_accessor.cc @@ -1068,7 +1068,7 @@ private: /// \param serial Zone serial number for which an index is being sought. /// \param diff Code to delete record additions or deletions /// - /// \return int ID of the row in the difss table corresponding to the + /// \return int ID of the row in the diffs table corresponding to the /// statement. /// /// \exception TooLittleData Internal error, no result returned when one diff --git a/src/lib/datasrc/tests/testdata/rrset_toWire2 b/src/lib/datasrc/tests/testdata/rrset_toWire2 index b9a6a154c..743f968e3 100644 --- a/src/lib/datasrc/tests/testdata/rrset_toWire2 +++ b/src/lib/datasrc/tests/testdata/rrset_toWire2 @@ -18,7 +18,7 @@ # RDATA: 192.0.2.1 c0 00 02 01 # -# 2nd RR: the owner name is compresed +# 2nd RR: the owner name is compressed c0 00 00 01 00 01 00 00 0e 10 diff --git a/src/lib/datasrc/zone_iterator.h b/src/lib/datasrc/zone_iterator.h index e1c69294d..bdf219a90 100644 --- a/src/lib/datasrc/zone_iterator.h +++ b/src/lib/datasrc/zone_iterator.h @@ -27,7 +27,7 @@ namespace datasrc { /** * \brief Read-only iterator to a zone. * - * You can get an instance of (descendand of) ZoneIterator from + * You can get an instance of (descendant of) ZoneIterator from * DataSourceClient::getIterator() method. The actual concrete implementation * will be different depending on the actual data source used. This is the * abstract interface. diff --git a/src/lib/dhcp/dhcp6.h b/src/lib/dhcp/dhcp6.h index 116019e3f..874ee4631 100644 --- a/src/lib/dhcp/dhcp6.h +++ b/src/lib/dhcp/dhcp6.h @@ -134,7 +134,7 @@ extern const int dhcpv6_type_name_max; #define LQ_QUERY_OFFSET 17 /* - * DHCPv6 well-known multicast addressess, from section 5.1 of RFC 3315 + * DHCPv6 well-known multicast addresses, from section 5.1 of RFC 3315 */ #define ALL_DHCP_RELAY_AGENTS_AND_SERVERS "ff02::1:2" #define ALL_DHCP_SERVERS "ff05::1:3" diff --git a/src/lib/dhcp/libdhcp++.h b/src/lib/dhcp/libdhcp++.h index c6594b9fd..c24261102 100644 --- a/src/lib/dhcp/libdhcp++.h +++ b/src/lib/dhcp/libdhcp++.h @@ -61,7 +61,7 @@ public: /// @param code option code. /// /// @return true if the specified option is a standard option. - /// @todo We arleady create option definitions for the subset if + /// @todo We already create option definitions for the subset if /// standard options. We are aiming that this function checks /// the presence of the standard option definition and if it finds /// it, then the true value is returned. However, at this point diff --git a/src/lib/dhcp/option.h b/src/lib/dhcp/option.h index 553e82598..28e65a968 100644 --- a/src/lib/dhcp/option.h +++ b/src/lib/dhcp/option.h @@ -128,7 +128,7 @@ public: /// @brief Constructor, used for received options. /// - /// This contructor is similar to the previous one, but it does not take + /// This constructor is similar to the previous one, but it does not take /// the whole vector, but rather subset of it. /// /// @todo This can be templated to use different containers, not just @@ -280,7 +280,7 @@ public: /// /// Option will be resized to length of buffer. /// - /// @param first iterator pointing begining of buffer to copy. + /// @param first iterator pointing to beginning of buffer to copy. /// @param last iterator pointing to end of buffer to copy. void setData(const OptionBufferConstIter first, const OptionBufferConstIter last); diff --git a/src/lib/dhcp/option_custom.h b/src/lib/dhcp/option_custom.h index c25347b4f..079c270af 100644 --- a/src/lib/dhcp/option_custom.h +++ b/src/lib/dhcp/option_custom.h @@ -278,7 +278,7 @@ public: /// /// Option will be resized to length of buffer. /// - /// @param first iterator pointing begining of buffer to copy. + /// @param first iterator pointing to beginning of buffer to copy. /// @param last iterator pointing to end of buffer to copy. void setData(const OptionBufferConstIter first, const OptionBufferConstIter last); diff --git a/src/lib/dhcp/option_data_types.h b/src/lib/dhcp/option_data_types.h index e53fa6e2d..94e7e9e97 100644 --- a/src/lib/dhcp/option_data_types.h +++ b/src/lib/dhcp/option_data_types.h @@ -405,7 +405,7 @@ private: /// /// This function is used by some of the public static functions /// to create an instance of OptionDataTypeUtil class. - /// When instance is called it calls the class'es constructor + /// When this instance is called it calls the classes constructor /// and initializes some of the private data members. /// /// @return instance of OptionDataTypeUtil singleton. diff --git a/src/lib/dhcp/option_definition.h b/src/lib/dhcp/option_definition.h index df5def739..efb48b9cf 100644 --- a/src/lib/dhcp/option_definition.h +++ b/src/lib/dhcp/option_definition.h @@ -515,7 +515,7 @@ private: /// using two indexes: /// - sequenced: used to access elements in the order they have /// been added to the container -/// - option code: used to search defintions of options +/// - option code: used to search definitions of options /// with a specified option code (aka option type). /// Note that this container can hold multiple options with the /// same code. For this reason, the latter index can be used to @@ -555,7 +555,7 @@ typedef boost::shared_ptr OptionDefContainerPtr; typedef OptionDefContainer::nth_index<1>::type OptionDefContainerTypeIndex; /// Pair of iterators to represent the range of options definitions /// having the same option type value. The first element in this pair -/// represents the begining of the range, the second element +/// represents the beginning of the range, the second element /// represents the end. typedef std::pair OptionDefContainerTypeRange; diff --git a/src/lib/dhcp/option_int.h b/src/lib/dhcp/option_int.h index ebb16415c..9a4cfb1be 100644 --- a/src/lib/dhcp/option_int.h +++ b/src/lib/dhcp/option_int.h @@ -56,7 +56,7 @@ public: /// @brief Constructor. /// - /// This constructor creates option from a buffer. This construtor + /// This constructor creates option from a buffer. This constructor /// may throw exception if \ref unpack function throws during buffer /// parsing. /// diff --git a/src/lib/dhcp/option_int_array.h b/src/lib/dhcp/option_int_array.h index 1babee56d..a87e9b51d 100644 --- a/src/lib/dhcp/option_int_array.h +++ b/src/lib/dhcp/option_int_array.h @@ -102,7 +102,7 @@ public: /// @brief Constructor. /// - /// This constructor creates option from a buffer. This construtor + /// This constructor creates option from a buffer. This constructor /// may throw exception if \ref unpack function throws during buffer /// parsing. /// diff --git a/src/lib/dhcp/tests/duid_unittest.cc b/src/lib/dhcp/tests/duid_unittest.cc index de20e5106..44aa56163 100644 --- a/src/lib/dhcp/tests/duid_unittest.cc +++ b/src/lib/dhcp/tests/duid_unittest.cc @@ -146,7 +146,7 @@ TEST(ClientIdTest, constructor) { uint8_t data1[] = {0, 1, 2, 3, 4, 5, 6}; vector data2(data1, data1 + sizeof(data1)); - // checks for C-style construtor (uint8_t * + len) + // checks for C-style constructor (uint8_t * + len) scoped_ptr id1(new ClientId(data1, sizeof(data1))); vector vecdata = id1->getClientId(); EXPECT_TRUE(data2 == vecdata); diff --git a/src/lib/dhcp/tests/iface_mgr_unittest.cc b/src/lib/dhcp/tests/iface_mgr_unittest.cc index d72ef9ef5..6f59ddb3e 100644 --- a/src/lib/dhcp/tests/iface_mgr_unittest.cc +++ b/src/lib/dhcp/tests/iface_mgr_unittest.cc @@ -657,7 +657,7 @@ TEST_F(IfaceMgrTest, sendReceive6) { // since we opened 2 sockets on the same interface and none of them is multicast, // none is preferred over the other for sending data, so we really should not - // assume the one or the other will always be choosen for sending data. Therefore + // assume the one or the other will always be chosen for sending data. Therefore // we should accept both values as source ports. EXPECT_TRUE((rcvPkt->getRemotePort() == 10546) || (rcvPkt->getRemotePort() == 10547)); @@ -749,7 +749,7 @@ TEST_F(IfaceMgrTest, sendReceive4) { // since we opened 2 sockets on the same interface and none of them is multicast, // none is preferred over the other for sending data, so we really should not - // assume the one or the other will always be choosen for sending data. We should + // assume the one or the other will always be chosen for sending data. We should // skip checking source port of sent address. // try to receive data over the closed socket. Closed socket's descriptor is @@ -967,7 +967,7 @@ size_t parse_mac(const std::string& textMac, uint8_t* mac, size_t macLen) { tmp.flags(ios::hex); int i = 0; uint8_t octet = 0; // output octet - uint8_t byte; // parsed charater from text representation + uint8_t byte; // parsed character from text representation while (!tmp.eof()) { tmp >> byte; // hex value diff --git a/src/lib/dhcp/tests/libdhcp++_unittest.cc b/src/lib/dhcp/tests/libdhcp++_unittest.cc index 1a87b1382..dbab49290 100644 --- a/src/lib/dhcp/tests/libdhcp++_unittest.cc +++ b/src/lib/dhcp/tests/libdhcp++_unittest.cc @@ -62,9 +62,9 @@ public: /// option has been initialized correctly. /// /// @param code option code. - /// @param begin iterator pointing a begining of a buffer to + /// @param begin iterator pointing at beginning of a buffer to /// be used to create option instance. - /// @param end iterator pointing an end of a buffer to be + /// @param end iterator pointing at end of a buffer to be /// used to create option instance. /// @param expected_type type of the option created by the /// factory function returned by the option definition. @@ -86,9 +86,9 @@ public: /// option has been initialized correctly. /// /// @param code option code. - /// @param begin iterator pointing a begining of a buffer to + /// @param begin iterator pointing at beginning of a buffer to /// be used to create option instance. - /// @param end iterator pointing an end of a buffer to be + /// @param end iterator pointing at end of a buffer to be /// used to create option instance. /// @param expected_type type of the option created by the /// factory function returned by the option definition. @@ -111,9 +111,9 @@ private: /// option has been initialized correctly. /// /// @param code option code. - /// @param begin iterator pointing a begining of a buffer to + /// @param begin iterator pointing at beginning of a buffer to /// be used to create option instance. - /// @param end iterator pointing an end of a buffer to be + /// @param end iterator pointing at end of a buffer to be /// used to create option instance. /// @param expected_type type of the option created by the /// factory function returned by the option definition. diff --git a/src/lib/dhcp/tests/option_custom_unittest.cc b/src/lib/dhcp/tests/option_custom_unittest.cc index a34852b6a..e0ae727bc 100644 --- a/src/lib/dhcp/tests/option_custom_unittest.cc +++ b/src/lib/dhcp/tests/option_custom_unittest.cc @@ -310,7 +310,7 @@ TEST_F(OptionCustomTest, int32Data) { } // The purpose of this test is to verify that the option definition comprising -// single IPv4 addres can be used to create an instance of custom option. +// single IPv4 address can be used to create an instance of custom option. TEST_F(OptionCustomTest, ipv4AddressData) { OptionDefinition opt_def("OPTION_FOO", 231, "ipv4-address"); @@ -343,7 +343,7 @@ TEST_F(OptionCustomTest, ipv4AddressData) { } // The purpose of this test is to verify that the option definition comprising -// single IPv6 addres can be used to create an instance of custom option. +// single IPv6 address can be used to create an instance of custom option. TEST_F(OptionCustomTest, ipv6AddressData) { OptionDefinition opt_def("OPTION_FOO", 1000, "ipv6-address"); @@ -999,7 +999,7 @@ TEST_F(OptionCustomTest, setBooleanDataArray) { EXPECT_TRUE(value2); } -// The purpose of this test is to verify that am option carying +// The purpose of this test is to verify that am option carrying // an array of 16-bit signed integer values can be created with // no values initially and that the values can be later added to it. TEST_F(OptionCustomTest, setUint16DataArray) { diff --git a/src/lib/dhcp/tests/option_unittest.cc b/src/lib/dhcp/tests/option_unittest.cc index 1fc49f162..2ce3bc6a3 100644 --- a/src/lib/dhcp/tests/option_unittest.cc +++ b/src/lib/dhcp/tests/option_unittest.cc @@ -220,7 +220,7 @@ TEST_F(OptionTest, v6_basic) { ); } -// tests contructor used in pkt reception +// tests constructor used in pkt reception // option contains actual data TEST_F(OptionTest, v6_data1) { for (int i = 0; i < 32; i++) diff --git a/src/lib/dhcpsrv/cfgmgr.h b/src/lib/dhcpsrv/cfgmgr.h index f4eecb5d1..00f7e251d 100644 --- a/src/lib/dhcpsrv/cfgmgr.h +++ b/src/lib/dhcpsrv/cfgmgr.h @@ -40,7 +40,7 @@ namespace dhcp { /// This singleton class holds the whole configuration for DHCPv4 and DHCPv6 /// servers. It currently holds information about zero or more subnets6. /// Each subnet may contain zero or more pools. Pool4 and Pool6 is the most -/// basic "chunk" of configuration. It contains a range of assigneable +/// basic "chunk" of configuration. It contains a range of assignable /// addresses. /// /// Below is a sketch of configuration inheritance (not implemented yet). @@ -248,7 +248,7 @@ protected: /// purposes. CfgMgr(); - /// @brief virtual desctructor + /// @brief virtual destructor virtual ~CfgMgr(); /// @brief a container for IPv6 subnets. diff --git a/src/lib/dhcpsrv/dbaccess_parser.h b/src/lib/dhcpsrv/dbaccess_parser.h index 140f11d40..53e3f81ea 100644 --- a/src/lib/dhcpsrv/dbaccess_parser.h +++ b/src/lib/dhcpsrv/dbaccess_parser.h @@ -41,7 +41,7 @@ public: /// strings. /// /// Only the "type" sub-element is mandatory: the remaining sub-elements -/// depend on the datbase chosen. +/// depend on the database chosen. class DbAccessParser: public DhcpConfigParser { public: /// @brief Keyword and associated value @@ -115,7 +115,7 @@ protected: return (values_); } - /// @brief Construct dbtabase access string + /// @brief Construct database access string /// /// Constructs the database access string from the stored parameters. /// diff --git a/src/lib/dhcpsrv/dhcp_config_parser.h b/src/lib/dhcpsrv/dhcp_config_parser.h index 44cf51999..cb419f85b 100644 --- a/src/lib/dhcpsrv/dhcp_config_parser.h +++ b/src/lib/dhcpsrv/dhcp_config_parser.h @@ -65,7 +65,7 @@ class DhcpConfigParser { //@{ private: - // Private construtor and assignment operator assures that nobody + // Private constructor and assignment operator assures that nobody // will be able to copy or assign a parser. There are no defined // bodies for them. DhcpConfigParser(const DhcpConfigParser& source); diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes index 21a7c7904..9b8a0ce9a 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.mes +++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes @@ -215,7 +215,7 @@ with the specified address to the MySQL backend database. % DHCPSRV_MYSQL_COMMIT committing to MySQL database The code has issued a commit call. All outstanding transactions will be committed to the database. Note that depending on the MySQL settings, -the commital may not include a write to disk. +the committal may not include a write to disk. % DHCPSRV_MYSQL_DB opening MySQL lease database: %1 This informational message is logged when a DHCP server (either V4 or diff --git a/src/lib/dhcpsrv/lease_mgr.h b/src/lib/dhcpsrv/lease_mgr.h index e6aaa5164..b6f70010a 100644 --- a/src/lib/dhcpsrv/lease_mgr.h +++ b/src/lib/dhcpsrv/lease_mgr.h @@ -44,7 +44,7 @@ /// There are no intermediate plans to implement DHCPv4 failover /// (draft-ietf-dhc-failover-12.txt). Currently (Oct. 2012) the DHCPv6 failover /// is being defined in DHC WG in IETF (draft-ietf-dhcpv6-failover-requirements, -/// draft-ietf-dhcpv6-dailover-design), but the work is not advanced enough +/// draft-ietf-dhcpv6-failover-design), but the work is not advanced enough /// for implementation plans yet. v4 failover requires additional parameters /// to be kept with a lease. It is likely that v6 failover will require similar /// fields. Such implementation will require database schema extension. @@ -477,7 +477,7 @@ public: /// @brief Returns existing IPv6 lease for a given IPv6 address. /// /// For a given address, we assume that there will be only one lease. - /// The assumtion here is that there will not be site or link-local + /// The assumption here is that there will not be site or link-local /// addresses used, so there is no way of having address duplication. /// /// @param addr address of the searched lease diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.h b/src/lib/dhcpsrv/mysql_lease_mgr.h index 62f443507..48370e1c1 100644 --- a/src/lib/dhcpsrv/mysql_lease_mgr.h +++ b/src/lib/dhcpsrv/mysql_lease_mgr.h @@ -192,7 +192,7 @@ public: /// @brief Returns existing IPv6 lease for a given IPv6 address. /// /// For a given address, we assume that there will be only one lease. - /// The assumtion here is that there will not be site or link-local + /// The assumption here is that there will not be site or link-local /// addresses used, so there is no way of having address duplication. /// /// @param addr address of the searched lease diff --git a/src/lib/dhcpsrv/subnet.h b/src/lib/dhcpsrv/subnet.h index cf29450d8..e797bdfdd 100644 --- a/src/lib/dhcpsrv/subnet.h +++ b/src/lib/dhcpsrv/subnet.h @@ -208,7 +208,7 @@ public: typedef OptionContainer::nth_index<1>::type OptionContainerTypeIndex; /// Pair of iterators to represent the range of options having the /// same option type value. The first element in this pair represents - /// the begining of the range, the second element represents the end. + /// the beginning of the range, the second element represents the end. typedef std::pair OptionContainerTypeRange; /// Type of the index #2 - option persistency flag. diff --git a/src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc b/src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc index 99244768d..e439c879e 100644 --- a/src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc +++ b/src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc @@ -149,7 +149,7 @@ TEST_F(LeaseMgrFactoryTest, redactAccessStringEmptyPassword) { /// @brief redactConfigString test - no password /// /// Checks that the redacted configuration string excludes the password if there -/// was no password to begion with. +/// was no password to begin with. TEST_F(LeaseMgrFactoryTest, redactAccessStringNoPassword) { LeaseMgr::ParameterMap parameters = diff --git a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc index 8d8c7f85b..6103a9656 100644 --- a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc @@ -474,7 +474,7 @@ TEST(Lease6, Lease6Constructor) { /// is followed by the reverse check on operator!=(). TEST(Lease6, OperatorEquals) { - // check a variety of addressemas with different bits set. + // check a variety of addresses with different bits set. const IOAddress addr("2001:db8:1::456"); uint8_t duid_array[] = {0, 1, 2, 3, 4, 5, 6, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf}; DuidPtr duid(new DUID(duid_array, sizeof(duid_array))); diff --git a/src/lib/dhcpsrv/tests/subnet_unittest.cc b/src/lib/dhcpsrv/tests/subnet_unittest.cc index 9f06c89e8..1f0ef8b3c 100644 --- a/src/lib/dhcpsrv/tests/subnet_unittest.cc +++ b/src/lib/dhcpsrv/tests/subnet_unittest.cc @@ -398,7 +398,7 @@ TEST(Subnet6Test, addPersistentOption) { // those that server sends to clients regardless if they ask // for them or not. We pick 3 out of 10 options and mark them // non-persistent and 7 other options persistent. - // Code values: 102, 105 and 108 are divisable by 3 + // Code values: 102, 105 and 108 are divisible by 3 // and options with these codes will be flagged non-persistent. // Options with other codes will be flagged persistent. bool persistent = (code % 3) ? true : false; diff --git a/src/lib/dns/gen-rdatacode.py.in b/src/lib/dns/gen-rdatacode.py.in index 7ea2ae535..d0a2576ec 100755 --- a/src/lib/dns/gen-rdatacode.py.in +++ b/src/lib/dns/gen-rdatacode.py.in @@ -186,7 +186,7 @@ def import_definitions(classcode2txt, typecode2txt, typeandclass): # list is processed in the same order on all systems. The resulting # files should compile regardless of the order in which the components # are included but... Having a fixed order for the directories should - # eliminate system-dependent problems. (Note that the drectory names + # eliminate system-dependent problems. (Note that the directory names # in BIND 10 are ASCII, so the order should be locale-independent.) dirlist = os.listdir('@srcdir@/rdata') dirlist.sort() diff --git a/src/lib/dns/messagerenderer.cc b/src/lib/dns/messagerenderer.cc index 0cd11cef5..bc11cb4d8 100644 --- a/src/lib/dns/messagerenderer.cc +++ b/src/lib/dns/messagerenderer.cc @@ -182,7 +182,7 @@ struct MessageRenderer::MessageRendererImpl { size_t hash, bool case_sensitive) const { // Find a matching entry, if any. We use some heuristics here: often - // the same name appers consecutively (like repeating the same owner + // the same name appears consecutively (like repeating the same owner // name for a single RRset), so in case there's a collision in the // bucket it will be more likely to find it in the tail side of the // bucket. diff --git a/src/lib/dns/python/tests/message_python_test.py b/src/lib/dns/python/tests/message_python_test.py index bf39a8379..996ef8970 100644 --- a/src/lib/dns/python/tests/message_python_test.py +++ b/src/lib/dns/python/tests/message_python_test.py @@ -520,7 +520,7 @@ test.example.com. 3600 IN A 192.0.2.2 data = read_wire_data("message_fromWire22.wire") self.assertRaises(DNSMessageFORMERR, self.p.from_wire, data[:-1]) - def test_from_wire_combind_rrs(self): + def test_from_wire_combined_rrs(self): factoryFromFile(self.p, "message_fromWire19.wire") rrset = self.p.get_section(Message.SECTION_ANSWER)[0] self.assertEqual(RRType("A"), rrset.get_type()) diff --git a/src/lib/dns/python/tests/rrset_collection_python_test.py b/src/lib/dns/python/tests/rrset_collection_python_test.py index 1bbbc80b0..20d147f24 100644 --- a/src/lib/dns/python/tests/rrset_collection_python_test.py +++ b/src/lib/dns/python/tests/rrset_collection_python_test.py @@ -17,7 +17,7 @@ import os import unittest from pydnspp import * -# This should refer to the testdata diretory for the C++ tests. +# This should refer to the testdata directory for the C++ tests. TESTDATA_DIR = os.environ["TESTDATA_PATH"].split(':')[0] class RRsetCollectionBaseTest(unittest.TestCase): diff --git a/src/lib/dns/tests/testdata/rrset_toWire2 b/src/lib/dns/tests/testdata/rrset_toWire2 index 601de8b4b..ca6483f6b 100644 --- a/src/lib/dns/tests/testdata/rrset_toWire2 +++ b/src/lib/dns/tests/testdata/rrset_toWire2 @@ -18,7 +18,7 @@ # RDATA: 192.0.2.1 c0 00 02 01 # -# 2nd RR: the owner name is compresed +# 2nd RR: the owner name is compressed c0 00 00 01 00 01 00 00 0e 10 diff --git a/src/lib/log/tests/logger_example.cc b/src/lib/log/tests/logger_example.cc index 08c9084dd..4b2042951 100644 --- a/src/lib/log/tests/logger_example.cc +++ b/src/lib/log/tests/logger_example.cc @@ -134,7 +134,7 @@ int main(int argc, char** argv) { // the parsing starts (console output for the BIND 10 root logger). This // is included in the logging specifications UNLESS the first switch on // the command line is a "-l" flag starting a new logger. To track this, - // the "sw_found" flag is set when a switch is completey processed. The + // the "sw_found" flag is set when a switch is completely processed. The // processing of "-l" will only add information for a previous logger to // the list if this flag is set. while ((option = getopt(argc, argv, "hc:d:f:l:m:s:y:z:")) != -1) { diff --git a/src/lib/nsas/TODO b/src/lib/nsas/TODO index 4a206908f..92ca0bb70 100644 --- a/src/lib/nsas/TODO +++ b/src/lib/nsas/TODO @@ -21,7 +21,7 @@ Long term: tricky, though, because we need to be thread safe. There seems to be solution to use weak_ptr inside the hash_table instead of shared_ptr and catch the exception inside get() (and getOrAdd) and delete the dead pointer. -* Better way to dispatch all calbacks in a list is needed. We take them out of +* Better way to dispatch all callbacks in a list is needed. We take them out of the list and dispatch them one by one. This is wrong because when an exception happens inside the callback, we lose the ones not dispatched yet. diff --git a/src/lib/nsas/address_request_callback.h b/src/lib/nsas/address_request_callback.h index 457c5879c..e43dfe295 100644 --- a/src/lib/nsas/address_request_callback.h +++ b/src/lib/nsas/address_request_callback.h @@ -42,7 +42,7 @@ namespace nsas { class AddressRequestCallback { public: - /// Default constructor, copy contructor and assignment operator + /// Default constructor, copy constructor and assignment operator /// are implicitly present and are OK. /// \brief Virtual Destructor diff --git a/src/lib/nsas/nameserver_entry.h b/src/lib/nsas/nameserver_entry.h index 77a640d66..3ffdf1001 100644 --- a/src/lib/nsas/nameserver_entry.h +++ b/src/lib/nsas/nameserver_entry.h @@ -168,8 +168,8 @@ public: * \short Update RTT of an address. * * This is similar to updateAddressRTTAtIndex, but you pass the address, - * not it's index. Passing the index might be unsafe, because the position - * of the address or the cound of addresses may change in time. + * not its index. Passing the index might be unsafe, because the position + * of the address or the count of addresses may change in time. * * \param rtt Round-Trip Time * \param address The address whose RTT should be updated. @@ -235,7 +235,7 @@ public: * \param resolver Who to ask. * \param callback The callback. * \param family Which addresses are interesting to the caller. This does - * not change which adresses are requested, but the callback might + * not change which addresses are requested, but the callback might * be executed when at last one requested type is available (eg. not * waiting for the other one). * \return The state the entry is currently in. It can return UNREACHABLE diff --git a/src/lib/nsas/tests/hash_unittest.cc b/src/lib/nsas/tests/hash_unittest.cc index 251e4b17c..f71d4b35e 100644 --- a/src/lib/nsas/tests/hash_unittest.cc +++ b/src/lib/nsas/tests/hash_unittest.cc @@ -76,7 +76,7 @@ TEST_F(HashTest, Algorithm) { const int size = HASHTABLE_DEFAULT_SIZE; // Size of the hash table Hash hash(size, 255, false);// Hashing algorithm object with seed // randomisation disabled - string base = "alphabeta"; // Base of the names to behashed + string base = "alphabeta"; // Base of the names to be hashed vector values; // Results stored here // Generate hash values diff --git a/src/lib/nsas/tests/zone_entry_unittest.cc b/src/lib/nsas/tests/zone_entry_unittest.cc index 198229978..3de965e8a 100644 --- a/src/lib/nsas/tests/zone_entry_unittest.cc +++ b/src/lib/nsas/tests/zone_entry_unittest.cc @@ -372,7 +372,7 @@ TEST_F(ZoneEntryTest, CallbacksAOnly) { EXPECT_TRUE(IOAddress("192.0.2.1").equals( callback_->successes_[1].getAddress())); EXPECT_EQ(1, callback_->unreachable_count_); - // Everything arriwed, so we are ready + // Everything arrived, so we are ready EXPECT_EQ(Fetchable::READY, zone->getState()); // Try asking something more and see it asks no more zone->addCallback(callback_, V4_ONLY); diff --git a/src/lib/python/isc/bind10/sockcreator.py b/src/lib/python/isc/bind10/sockcreator.py index db9e6c54b..dec22c188 100644 --- a/src/lib/python/isc/bind10/sockcreator.py +++ b/src/lib/python/isc/bind10/sockcreator.py @@ -26,7 +26,7 @@ from libutil_io_python import recv_fd logger = isc.log.Logger("init") """ -Module that comunicates with the privileged socket creator (b10-sockcreator). +Module that communicates with the privileged socket creator (b10-sockcreator). """ class CreatorError(Exception): diff --git a/src/lib/python/isc/bind10/tests/component_test.py b/src/lib/python/isc/bind10/tests/component_test.py index adc035eba..0fde13e49 100644 --- a/src/lib/python/isc/bind10/tests/component_test.py +++ b/src/lib/python/isc/bind10/tests/component_test.py @@ -513,7 +513,7 @@ class ComponentTests(InitUtils, unittest.TestCase): def test_pid_not_running(self): """ - Test that a componet that is not yet started doesn't have a PID. + Test that a component that is not yet started doesn't have a PID. But it won't fail if asked for and return None. """ for component_type in [Component, diff --git a/src/lib/python/isc/bind10/tests/socket_cache_test.py b/src/lib/python/isc/bind10/tests/socket_cache_test.py index bbbf77689..1e1d83a3d 100644 --- a/src/lib/python/isc/bind10/tests/socket_cache_test.py +++ b/src/lib/python/isc/bind10/tests/socket_cache_test.py @@ -72,7 +72,7 @@ class SocketTest(Test): """ Check it closes the socket when removed. """ - # This should make the refcount 0 and call the descructor + # This should make the refcount 0 and call the destructor # right away self.__socket = None self.assertEqual([42], self._closes) diff --git a/src/lib/python/isc/cc/tests/session_test.py b/src/lib/python/isc/cc/tests/session_test.py index 8de1e969a..65afb6ca7 100644 --- a/src/lib/python/isc/cc/tests/session_test.py +++ b/src/lib/python/isc/cc/tests/session_test.py @@ -257,7 +257,7 @@ class testSession(unittest.TestCase): self.assertEqual({"hello": "a"}, msg) self.assertFalse(sess.has_queued_msgs()) - # ask for a differe sequence number reply (that doesn't exist) + # ask for a different sequence number reply (that doesn't exist) # then ask for the one that is there self.assertFalse(sess.has_queued_msgs()) sess._socket.addrecv({'to': 'someone', 'reply': 1}, {"hello": "a"}) @@ -270,7 +270,7 @@ class testSession(unittest.TestCase): self.assertEqual({"hello": "a"}, msg) self.assertFalse(sess.has_queued_msgs()) - # ask for a differe sequence number reply (that doesn't exist) + # ask for a different sequence number reply (that doesn't exist) # then ask for any message self.assertFalse(sess.has_queued_msgs()) sess._socket.addrecv({'to': 'someone', 'reply': 1}, {"hello": "a"}) @@ -285,7 +285,7 @@ class testSession(unittest.TestCase): #print("sending message {'to': 'someone', 'reply': 1}, {'hello': 'a'}") - # ask for a differe sequence number reply (that doesn't exist) + # ask for a different sequence number reply (that doesn't exist) # send a new message, ask for specific message (get the first) # then ask for any message (get the second) self.assertFalse(sess.has_queued_msgs()) diff --git a/src/lib/python/isc/config/ccsession.py b/src/lib/python/isc/config/ccsession.py index a5858a745..b592d8de8 100644 --- a/src/lib/python/isc/config/ccsession.py +++ b/src/lib/python/isc/config/ccsession.py @@ -529,7 +529,7 @@ class ModuleCCSession(ConfigData): seq = self._session.group_sendmsg(cmd, group, instance=instance, to=to, want_answer=True) # For non-blocking, we'll have rpc_call_async (once the nonblock - # actualy works) + # actually works) reply, rheaders = self._session.group_recvmsg(nonblock=False, seq=seq) code, value = parse_answer(reply) if code == CC_REPLY_NO_RECPT: diff --git a/src/lib/python/isc/config/cfgmgr.py b/src/lib/python/isc/config/cfgmgr.py index bc24cbb4a..82c8e6c96 100644 --- a/src/lib/python/isc/config/cfgmgr.py +++ b/src/lib/python/isc/config/cfgmgr.py @@ -221,7 +221,7 @@ class ConfigManagerData: class ConfigManager: """Creates a configuration manager. The data_path is the path - to the directory containing the configuraton file, + to the directory containing the configuration file, database_filename points to the configuration file. If session is set, this will be used as the communication channel session. If not, a new session will be created. @@ -443,7 +443,7 @@ class ConfigManager: # (which is possible solution to the offline configuration problem) # or when we solve the incorect behaviour here when a config is # rejected (spying modules don't know it was rejected and some modules - # might have been commited already). + # might have been committed already). if module_name in self.virtual_modules: # The module is virtual, so call it to get the answer try: diff --git a/src/lib/python/isc/config/tests/ccsession_test.py b/src/lib/python/isc/config/tests/ccsession_test.py index 3c1c57ea9..2a2d79071 100644 --- a/src/lib/python/isc/config/tests/ccsession_test.py +++ b/src/lib/python/isc/config/tests/ccsession_test.py @@ -734,7 +734,7 @@ class TestModuleCCSession(unittest.TestCase): mccs.check_command() self.assertEqual(len(fake_session.message_queue), 0) - def test_ignore_commant_remote_module(self): + def test_ignore_command_remote_module(self): """ Test that commands for remote modules aren't handled. Remote module specified by the spec file name. @@ -742,7 +742,7 @@ class TestModuleCCSession(unittest.TestCase): self._common_remote_module_test( self._internal_ignore_command_remote_module) - def test_ignore_commant_remote_module_by_name(self): + def test_ignore_command_remote_module_by_name(self): """ Test that commands for remote modules aren't handled. Remote module specified by its name. diff --git a/src/lib/python/isc/datasrc/tests/datasrc_test.py b/src/lib/python/isc/datasrc/tests/datasrc_test.py index abc9739b7..4cc4e9b07 100644 --- a/src/lib/python/isc/datasrc/tests/datasrc_test.py +++ b/src/lib/python/isc/datasrc/tests/datasrc_test.py @@ -261,7 +261,7 @@ class DataSrcClient(unittest.TestCase): rrets = dsc.get_iterator(isc.dns.Name("example.com")) # there are more than 80 RRs in this zone... let's just count them # (already did a full check of the smaller zone above) - # There are 40 non-RRSIG RRsets and 32 dinstinct RRSIGs. + # There are 40 non-RRSIG RRsets and 32 distinct RRSIGs. self.assertEqual(72, len(list(rrets))) # same test, but now with explicit False argument for separate_rrs diff --git a/src/lib/python/isc/server_common/tests/tsig_keyring_test.py b/src/lib/python/isc/server_common/tests/tsig_keyring_test.py index e9a217469..6b9b75c44 100644 --- a/src/lib/python/isc/server_common/tests/tsig_keyring_test.py +++ b/src/lib/python/isc/server_common/tests/tsig_keyring_test.py @@ -65,7 +65,7 @@ class TSIGKeyRingTest(unittest.TestCase): def test_initialization(self): """ - Test we can initialize and deintialize the keyring. It also + Test we can initialize and deinitialize the keyring. It also tests the interaction with the keyring() function. """ # The keyring function raises until initialized diff --git a/src/lib/python/isc/xfrin/diff.py b/src/lib/python/isc/xfrin/diff.py index 4e06eea1a..4c97267e5 100644 --- a/src/lib/python/isc/xfrin/diff.py +++ b/src/lib/python/isc/xfrin/diff.py @@ -52,10 +52,10 @@ class Diff: """ The class represents a diff against current state of datasource on one zone. The usual way of working with it is creating it, then putting - bunch of changes in and commiting at the end. + bunch of changes in and committing at the end. If you change your mind, you can just stop using the object without - really commiting it. In that case no changes will happen in the data + really committing it. In that case no changes will happen in the data sounce. The class works as a kind of a buffer as well, it does not direct @@ -123,12 +123,12 @@ class Diff: def __check_committed(self): """ - This checks if the diff is already commited or broken. If it is, it + This checks if the diff is already committed or broken. If it is, it raises ValueError. This check is for methods that need to work only on - yet uncommited diffs. + yet uncommitted diffs. """ if self.__updater is None: - raise ValueError("The diff is already commited or it has raised " + + raise ValueError("The diff is already committed or it has raised " + "an exception, you come late") def __append_with_soa_check(self, buf, operation, rr): @@ -200,7 +200,7 @@ class Diff: Schedules addition of an RR into the zone in this diff. The rr is of isc.dns.RRset type and it must contain only one RR. - If this is not the case or if the diff was already commited, this + If this is not the case or if the diff was already committed, this raises the ValueError exception. The rr class must match the one of the datasource client. If @@ -213,7 +213,7 @@ class Diff: Schedules deleting an RR from the zone in this diff. The rr is of isc.dns.RRset type and it must contain only one RR. - If this is not the case or if the diff was already commited, this + If this is not the case or if the diff was already committed, this raises the ValueError exception. The rr class must match the one of the datasource client. If @@ -287,7 +287,7 @@ class Diff: This is called from time to time automatically, but you can call it manually if you really want to. - This raises ValueError if the diff was already commited. + This raises ValueError if the diff was already committed. It also can raise isc.datasrc.Error. If that happens, you should stop using this object and abort the modification. @@ -344,7 +344,7 @@ class Diff: self.__updater.commit() finally: # Remove the updater. That will free some resources for one, but - # mark this object as already commited, so we can check + # mark this object as already committed, so we can check # We delete it even in case the commit failed, as that makes us # unusable. @@ -594,6 +594,6 @@ class Diff: This must not be called after a commit, or it'd throw ValueError. ''' - # Apply itself will check it is not yet commited. + # Apply itself will check it is not yet committed. self.apply() return self.__updater.get_rrset_collection() diff --git a/src/lib/python/isc/xfrin/tests/diff_tests.py b/src/lib/python/isc/xfrin/tests/diff_tests.py index bb83340e0..ac04dc1b8 100644 --- a/src/lib/python/isc/xfrin/tests/diff_tests.py +++ b/src/lib/python/isc/xfrin/tests/diff_tests.py @@ -256,7 +256,7 @@ class DiffTest(unittest.TestCase): """ Try to add few items into the diff and see they are stored in there. - Also try passing an rrset that has differnt amount of RRs than 1. + Also try passing an rrset that has different amount of RRs than 1. """ diff = Diff(self, Name('example.org.')) self.__data_common(diff, diff.add_data, 'add') diff --git a/src/lib/util/encode/base16_from_binary.h b/src/lib/util/encode/base16_from_binary.h index 8606c619c..7ac4fd15d 100644 --- a/src/lib/util/encode/base16_from_binary.h +++ b/src/lib/util/encode/base16_from_binary.h @@ -83,7 +83,7 @@ class base16_from_binary : > super_t; public: - // make composible buy using templated constructor + // make composable by using templated constructor template base16_from_binary(BOOST_PFTO_WRAPPER(T) start) : super_t( diff --git a/src/lib/util/encode/base32hex_from_binary.h b/src/lib/util/encode/base32hex_from_binary.h index 5d16d044b..be35c014f 100644 --- a/src/lib/util/encode/base32hex_from_binary.h +++ b/src/lib/util/encode/base32hex_from_binary.h @@ -85,7 +85,7 @@ class base32hex_from_binary : > super_t; public: - // make composible buy using templated constructor + // make composable by using templated constructor template base32hex_from_binary(BOOST_PFTO_WRAPPER(T) start) : super_t( diff --git a/src/lib/util/encode/binary_from_base16.h b/src/lib/util/encode/binary_from_base16.h index 50342f101..e9fdd277b 100644 --- a/src/lib/util/encode/binary_from_base16.h +++ b/src/lib/util/encode/binary_from_base16.h @@ -91,7 +91,7 @@ class binary_from_base16 : public Base > super_t; public: - // make composible buy using templated constructor + // make composable by using templated constructor template binary_from_base16(BOOST_PFTO_WRAPPER(T) start) : super_t( diff --git a/src/lib/util/encode/binary_from_base32hex.h b/src/lib/util/encode/binary_from_base32hex.h index 1d83f5436..43b7d64dd 100644 --- a/src/lib/util/encode/binary_from_base32hex.h +++ b/src/lib/util/encode/binary_from_base32hex.h @@ -94,7 +94,7 @@ class binary_from_base32hex : public Base > super_t; public: - // make composible buy using templated constructor + // make composable by using templated constructor template binary_from_base32hex(BOOST_PFTO_WRAPPER(T) start) : super_t( diff --git a/src/lib/util/lru_list.h b/src/lib/util/lru_list.h index e5db8699f..332f6ce86 100644 --- a/src/lib/util/lru_list.h +++ b/src/lib/util/lru_list.h @@ -47,7 +47,7 @@ public: /// When an object is dropped from the LRU list because it has not been /// accessed for some time, it is possible that the action should trigger /// some other functions. For this reason, it is possible to register - /// a list-wide functor object to execute in this casee. + /// a list-wide functor object to execute in this case. /// /// Note that the function does not execute as the result of a call to /// remove() - that is an explicit call and it is assumed that the caller diff --git a/src/lib/util/python/gen_wiredata.py.in b/src/lib/util/python/gen_wiredata.py.in index 55724c9f1..c219e2575 100755 --- a/src/lib/util/python/gen_wiredata.py.in +++ b/src/lib/util/python/gen_wiredata.py.in @@ -914,9 +914,9 @@ class NSECBASE(RR): nbitmap = 1 # number of bitmaps block = 0 maplen = None # default bitmap length, auto-calculate - bitmap = '040000000003' # an arbtrarily chosen bitmap sample + bitmap = '040000000003' # an arbitrarily chosen bitmap sample def dump(self, f): - # first, construct the bitmpa data + # first, construct the bitmap data block_list = [] maplen_list = [] bitmap_list = [] diff --git a/src/lib/util/tests/lru_list_unittest.cc b/src/lib/util/tests/lru_list_unittest.cc index c0201eaa5..5f740e021 100644 --- a/src/lib/util/tests/lru_list_unittest.cc +++ b/src/lib/util/tests/lru_list_unittest.cc @@ -311,7 +311,7 @@ TEST_F(LruListTest, Touch) { EXPECT_EQ(1, entry7_.use_count()); EXPECT_EQ(3, lru.size()); - // Now touch the entry agin to move it to the back of the list. + // Now touch the entry again to move it to the back of the list. // This checks that the iterator stored in the entry as a result of the // last touch operation is valid. lru.touch(entry1_); diff --git a/src/lib/util/unittests/run_all.cc b/src/lib/util/unittests/run_all.cc index 5f50f77e2..0e3492b64 100644 --- a/src/lib/util/unittests/run_all.cc +++ b/src/lib/util/unittests/run_all.cc @@ -31,7 +31,7 @@ run_all() { // The catching of exceptions generated in tests is controlled by the // B10TEST_CATCH_EXCEPTION environment variable. Setting this to - // 1 enables the cacthing of exceptions; setting it to 0 disables it. + // 1 enables the catching of exceptions; setting it to 0 disables it. // Anything else causes a message to be printed to stderr and the default // taken. (The default is to catch exceptions if compiling with clang // and false if not.) diff --git a/tests/lettuce/features/terrain/bind10_control.py b/tests/lettuce/features/terrain/bind10_control.py index 9426d8ce0..5aab43160 100644 --- a/tests/lettuce/features/terrain/bind10_control.py +++ b/tests/lettuce/features/terrain/bind10_control.py @@ -188,7 +188,7 @@ def parse_bindctl_output_as_data_structure(): If it is valid, it is parsed and returned as whatever data structure it represented. """ - # strip any extra output after a charater that commonly terminates a valid + # strip any extra output after a character that commonly terminates a valid # JSON expression, i.e., ']', '}' and '"'. (The extra output would # contain 'Exit from bindctl' message, and depending on environment some # other control-like characters...but why is this message even there?) diff --git a/tests/lettuce/features/terrain/nsupdate.py b/tests/lettuce/features/terrain/nsupdate.py index 946439d1b..26964f511 100644 --- a/tests/lettuce/features/terrain/nsupdate.py +++ b/tests/lettuce/features/terrain/nsupdate.py @@ -21,7 +21,7 @@ def run_nsupdate(commands): """Run nsupdate. Parameters: commands: a sequence of strings which will be sent. - update_address: adress to send the update to + update_address: address to send the update to update_port: port to send the update to zone: zone to update diff --git a/tests/lettuce/features/terrain/querying.py b/tests/lettuce/features/terrain/querying.py index abd7c1805..ae348fd7d 100644 --- a/tests/lettuce/features/terrain/querying.py +++ b/tests/lettuce/features/terrain/querying.py @@ -68,7 +68,7 @@ class QueryResult(object): name: The domain name to query qtype: The RR type to query. Defaults to A if it is None. qclass: The RR class to query. Defaults to IN if it is None. - address: The IP adress to send the query to. + address: The IP address to send the query to. port: The port number to send the query to. additional_args: List of additional arguments (e.g. '+dnssec'). All parameters must be either strings or have the correct string diff --git a/tests/tools/badpacket/option_info.h b/tests/tools/badpacket/option_info.h index aebeb6626..944f60e57 100644 --- a/tests/tools/badpacket/option_info.h +++ b/tests/tools/badpacket/option_info.h @@ -129,7 +129,7 @@ public: /// /// \return The offset of the field corresponding to this option in the DNS /// message flags field. The returned value is only valid for - /// options that correpond to fields in the flags word. + /// options that correspond to fields in the flags word. static int offset(int index); /// \brief Return minimum allowed value of an option diff --git a/tests/tools/dhcp-ubench/benchmark.h b/tests/tools/dhcp-ubench/benchmark.h index 6001e8129..fc3360698 100644 --- a/tests/tools/dhcp-ubench/benchmark.h +++ b/tests/tools/dhcp-ubench/benchmark.h @@ -178,7 +178,7 @@ protected: /// Number of operations (e.g. insert lease num times) uint32_t num_; - /// Synchronous or asynchonous mode? + /// Synchronous or asynchronous mode? bool sync_; /// Should the test print out extra information? diff --git a/tests/tools/dhcp-ubench/dhcp-perf-guide.xml b/tests/tools/dhcp-ubench/dhcp-perf-guide.xml index 583b15591..7ff534c1a 100644 --- a/tests/tools/dhcp-ubench/dhcp-perf-guide.xml +++ b/tests/tools/dhcp-ubench/dhcp-perf-guide.xml @@ -172,7 +172,7 @@ The framework attempts to do the same amount of work for every - backend thus allowing fair complarison between them. + backend thus allowing fair comparison between them. @@ -1160,7 +1160,7 @@ The exit status is: Currently, perfdhcp is seen from the server perspective as relay agent. This simplifies its implementation: specifically there is no need to - receive traffic sent to braodcast addresses. However, it does impose + receive traffic sent to broadcast addresses. However, it does impose a requirement that the IPv4 address has to be set manually on the interface that will be used to communicate with the server. For example, if the DHCPv4 server is listening diff --git a/tests/tools/perfdhcp/command_options.h b/tests/tools/perfdhcp/command_options.h index 4b804dc3e..246fea3f9 100644 --- a/tests/tools/perfdhcp/command_options.h +++ b/tests/tools/perfdhcp/command_options.h @@ -443,7 +443,7 @@ private: std::vector xid_offset_; /// Random value offset in templates. Random value offset /// points to last octet of DUID. Up to 4 last octets of - /// DUID are randomized to simulate differnt clients. + /// DUID are randomized to simulate different clients. std::vector rnd_offset_; /// Offset of elapsed time option in template packet. int elp_offset_; diff --git a/tests/tools/perfdhcp/stats_mgr.h b/tests/tools/perfdhcp/stats_mgr.h index 537e81ddf..0a2df6627 100644 --- a/tests/tools/perfdhcp/stats_mgr.h +++ b/tests/tools/perfdhcp/stats_mgr.h @@ -104,7 +104,7 @@ public: private: /// \brief Default constructor. /// - /// Default constrcutor is private because we don't want client + /// Default constructor is private because we don't want client /// class to call it because we want client class to specify /// counter's name. CustomCounter() { }; @@ -494,7 +494,7 @@ public: /// \return maximum delay between packets. double getMaxDelay() const { return(max_delay_); } - /// \brief Return avarage packet delay. + /// \brief Return average packet delay. /// /// Method returns average packet delay. If no packets have been /// received for this exchange avg delay can't be calculated and @@ -988,7 +988,7 @@ public: return(xchg_stats->getMaxDelay()); } - /// \brief Return avarage packet delay. + /// \brief Return average packet delay. /// /// Method returns average packet delay for specified /// exchange type. diff --git a/tests/tools/perfdhcp/test_control.cc b/tests/tools/perfdhcp/test_control.cc index e51065f4a..4a3075a16 100644 --- a/tests/tools/perfdhcp/test_control.cc +++ b/tests/tools/perfdhcp/test_control.cc @@ -1804,7 +1804,7 @@ TestControl::setDefaults4(const TestControlSocket& socket, pkt->setRemotePort(DHCP4_SERVER_PORT); // The remote server's name or IP. pkt->setRemoteAddr(IOAddress(options.getServerName())); - // Set local addresss. + // Set local address. pkt->setLocalAddr(IOAddress(socket.addr_)); // Set relay (GIADDR) address to local address. pkt->setGiaddr(IOAddress(socket.addr_)); diff --git a/tests/tools/perfdhcp/test_control.h b/tests/tools/perfdhcp/test_control.h index 245cf6db2..936d256ee 100644 --- a/tests/tools/perfdhcp/test_control.h +++ b/tests/tools/perfdhcp/test_control.h @@ -245,7 +245,7 @@ public: /// throw exception. /// /// \throw isc::InvalidOperation if command line options are not parsed. - /// \throw isc::Unexpected if internal Test Controler error occured. + /// \throw isc::Unexpected if internal Test Controller error occured. /// \return error_code, 3 if number of received packets is not equal /// to number of sent packets, 0 if everything is ok. int run(); @@ -483,7 +483,7 @@ protected: /// \throw isc::BadValue if socket can't be created for given /// interface, local address or remote address. /// \throw isc::InvalidOperation if broadcast option can't be - /// set for the v4 socket or if multicast option cat't be set + /// set for the v4 socket or if multicast option can't be set /// for the v6 socket. /// \throw isc::Unexpected if interal unexpected error occured. /// \return socket descriptor. diff --git a/tests/tools/perfdhcp/tests/command_options_helper.h b/tests/tools/perfdhcp/tests/command_options_helper.h index 7436bd79f..253fe12b8 100644 --- a/tests/tools/perfdhcp/tests/command_options_helper.h +++ b/tests/tools/perfdhcp/tests/command_options_helper.h @@ -53,7 +53,7 @@ public: /// \brief Destructor. /// - /// Dealocates wrapped array of C-strings. + /// Deallocates wrapped array of C-strings. ~ArgvPtr() { if (argv_ != NULL) { for(int i = 0; i < argc_; ++i) { diff --git a/tests/tools/perfdhcp/tests/command_options_unittest.cc b/tests/tools/perfdhcp/tests/command_options_unittest.cc index 360178fd4..bda256f43 100644 --- a/tests/tools/perfdhcp/tests/command_options_unittest.cc +++ b/tests/tools/perfdhcp/tests/command_options_unittest.cc @@ -546,7 +546,7 @@ TEST_F(CommandOptionsTest, Interface) { // In order to make this test portable we need to know // at least one interface name on OS where test is run. // Interface Manager has ability to detect interfaces. - // Altough we don't call initIsInterface explicitely + // Although we don't call initIsInterface explicitely // here it is called by CommandOptions object interally // so this function is covered by the test. dhcp::IfaceMgr& iface_mgr = dhcp::IfaceMgr::instance(); diff --git a/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc b/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc index 8a83cacbd..ebb4f345f 100644 --- a/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc +++ b/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc @@ -262,7 +262,7 @@ TEST_F(StatsMgrTest, SendReceiveSimple) { boost::shared_ptr rcvd_packet(createPacket4(DHCPOFFER, common_transid)); stats_mgr->addExchangeStats(StatsMgr4::XCHG_DO); - // The following attempt is expected to pass becase the right + // The following attempt is expected to pass because the right // exchange type is used. ASSERT_NO_THROW( stats_mgr->passSentPacket(StatsMgr4::XCHG_DO, sent_packet) diff --git a/tests/tools/perfdhcp/tests/test_control_unittest.cc b/tests/tools/perfdhcp/tests/test_control_unittest.cc index ae67e6ef6..f7666aedb 100644 --- a/tests/tools/perfdhcp/tests/test_control_unittest.cc +++ b/tests/tools/perfdhcp/tests/test_control_unittest.cc @@ -263,7 +263,7 @@ public: /// If number of clients is between 257 and 65536 they can differ /// on two last positions so the returned value will be 2 and so on. /// - /// \param clients_num number of simulated clinets + /// \param clients_num number of simulated clients /// \return maximum mismatch position int unequalOctetPosition(int clients_num) const { if (!clients_num) { diff --git a/tools/query_cmp/src/lib/compare_rrset.py b/tools/query_cmp/src/lib/compare_rrset.py index 737d761ef..d7b34257b 100755 --- a/tools/query_cmp/src/lib/compare_rrset.py +++ b/tools/query_cmp/src/lib/compare_rrset.py @@ -242,7 +242,7 @@ def resp_casecmp(msg1, msg2, num): msg1.get_section(Message.SECTION_ADDITIONAL), \ msg2.get_section(Message.SECTION_ADDITIONAL)) - # If there are any differnt comparisons in the sections above, print the details + # If there are any different comparisons in the sections above, print the details # contained in buf formattedly. if not res_hdr or not res_ques or not res_ans or not res_auth or not res_addi: print('=' * 30, ' BEGIN QUERY %s ' % num, '=' * 30, sep='') diff --git a/tools/reorder_message_file.py b/tools/reorder_message_file.py index 2ba4d7c3e..ce5934fb0 100644 --- a/tools/reorder_message_file.py +++ b/tools/reorder_message_file.py @@ -142,7 +142,7 @@ def print_dict(dictionary): Prints the dictionary with a blank line between entries. Parameters: - dicitionary - Map holding the message dictionary + dictionary - Map holding the message dictionary """ count = 0 for msgid in sorted(dictionary): -- GitLab