diff --git a/doc/design/cc-protocol.txt b/doc/design/cc-protocol.txt index 01295308781131d5efff299754a8d5f8ee18f8d9..0543a52d32b9b39921cd7817ad39820129f4b786 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 e72dbbde2e6708b3cc684a1793bd9922c9d6802e..ed76deaa9258cf19746180d7de6e5c0dd5dcbe16 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 b98920f703e2b60a32ae150895242e72f97380ef..ddc5e2302d91a6b7a601b9471105e87736029053 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 aa5f3c97d9184d3398e01bcfdcbac48c3ae8a562..e8e7953c5df5451606e8f1a58c96c2524b52dbbd 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 107e2e6e202aed629cebf917cbe6e9ca4f24052f..8ad72bef90e3951f83cc319292e22158d7485953 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 e2d16230404c8911ce5a2f6a4b0ea82179ad31e3..ca5e0138330cd2249745a0effcb443846c6f2eb5 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 c5b9b162722f116ca30cbeab919ea812091347c3..770f624c8b021e9c670dbc45ba52c15a17d3aa34 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 6f50dbddf59607f58f163bbe8a5e523d2281d089..82abdb1bb06817e2bbffa21a263c82053860a324 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 9cdb7efcbd42d73f1ac7fbed6b53ba7549c6525d..e4e354cfb8f4bc7bd9ead0d6f06c0e1f4094b3f0 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 8b98ff58c9f6ccca7b5a546cf23025aed2f9e8b4..a9a185f6be2ff43019bed7de0c44908bf9339cdb 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 579ae60e19c136841182a1bc8e97911b2eec30c0..59bba9ebb985d96e6d3dc3a38e85cc6f7139bb0c 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 7a1469cfca9b908b18116df7d754ff7f016e2017..292a0babb7487ff2caf7eafdb0f7517dc2755658 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 4bc9f85ce59ea1364b94aa06a82a1f0676e8bd5c..a98e4b1c21819bfb8e6bbd420e5e553251a5fdf3 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 d382495e49be86bc0ee455618fdc11233f959af4..6f09bcc0a911e4638a295d3ae567d63271e66ccd 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 e7d2099f93968784e0879584fbeb1c3268531e1a..4cf31be49b1eb4adf4105d64ec169fd54d325bce 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 8ac49d3cde3cee650b1dc348135aba04b5fc7433..eb7d5599a0aa24b6e06d66df7cd1fe097e9af0f4 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 ac15c44c3aaa613b575282be72ce9039e25ee908..e45deff9c975d380579b997f2d6fba94b17e2269 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 c189c8af7eb762d96fe854795e9c38b1cf7cd70f..86ae845a9c3f3d6ff58f75b988adc8889200449e 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 9b3be5134cb3bfa6dc36239fcdeee5ecc153be56..80b304c8ba87df49f7c3e17472fb0998e2638de1 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 e4e17f1eaae6828f3e1d2d1a641659243d4098dd..c3488e5af0d3c14c47028d0b773869e0091368b1 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 0e699ce544b8bdcb73a51fea4551a0e49a8dbd70..908304d170b6eab2d72062dadd5fe60dc34a4b7f 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 3a738ecfffed54c4b742a6915707ae02e71b9821..4376a2a830e9d183201963ad299b1d076328655f 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 5f1580fbfbbbfc1ec871f9f40c097fc2f937e1c0..4c19e743d9227f673b1d213567a1dd2a233dc974 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 4430cb234f7d190e3c9a188f8a4c29121a48383b..63fc980906a5237647d1bc74ece7f895a787751f 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 351bc5921d7fbc2a12bb6d92ac84260fd1b615ef..16499baa8c6108b27695ca633aa738c00e8394da 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 63d008eccac0a0648e17dfe21df7ce5497712ed2..6435c9260a7c673ad3d54e5609666c9f3ed84065 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 cb80b26e00f37cbed6b1331d53e541186acaf213..af4bd9705f07ac32bd4cdec885c301b98b7a1787 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 b834e1cbb8a6d5fa5e9f97315ef4e35ec618bfa4..67fb53ea81c19e66bd77aa0702f2069fc354d0bf 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 466e4484375ce14d9deca8d4d2efd5cbd2056088..9a463abd7d089452af934dfeeb7ad20ec5e6b408 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 773290252a6b978e771e95750a10505b4d7929a3..f807168e25ff316f61ac3aa6ce556bb0e171f47c 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 272124b3d4be56454f19f4d6a293e4cc50fec339..86c2ef5bf2e64a27a5855cfc88e8327966c59544 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 65a27bbcedf92c0372f843ed6e766c46fe87c5a1..12a4a109335dafe6057c93fb0da649e4cba82f9d 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 2802ace46b62ff3d216355d48549823f4deabddf..f663e55cd39c19c9ab35a506fbf4305c2a3e5980 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 d6ef360a88bc2e4a62c675b40a8c7d21a4ee2180..2939dc0012aaf5c03d8a1611ab056a2d8699414e 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 c31ee092c9f806bd4e86963ea307cbeb480bb9f0..0a0314486b27424d9992e4d6a07f3cc51707b08b 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 c3f5348fc4587ce6577bbaa919abc197a589472f..d5d2a7a867de97f649cb545174a7f22d4d0ddb76 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 c05a34b1ade6ac255b0dc08d0a6abfe8b22172d0..51fb6b8680d89784a37182ba51da814c53504df9 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 cf4b1c4f888d6d0c953447f1adbbf3c71f9fdc80..f84a4d6c7d4ae8ac1a0aa9bf4625fd6ce8143993 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 f6d64a00261b88cd5bf48665df2580ac12f4f1b7..a3f3f97082460d0bd3e9916e9ff2bc0e0c5db8e7 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 db25d9fb3c120dc3b4f7068af48012ed291a13a3..74e5c123be0d988e23885db3b9eebd399653f37a 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 da78bd48b0f8062350a6e71ad801af54c675b15f..c2f39edd4c774ff5093c9baf0edeb6a69100c698 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 fc6e538d574d539332761655b358329ef530d5c3..ed865297ecc06ed260cd74b4d1174e0bbfa0bae5 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 67fe427ecd357aed01ef47351229e1fe41ac0827..a9341307826f162f0c839d2f62cf381363a888f9 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 56a30d42f56f75c7e156b55466a9a3c51fb3935a..4c19963ae6bff77eb46e37ab439784e69c5fd47b 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 3302adf8b2727a5a76c83fcb167afe804661caa1..19c28ebfb05bb692e427c20136c8b7d2d6cff6b3 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 ae827c96b5904d39f90e4da0ead6da4c448d43f2..e1d3a9208291919fcec73feb10630e2d0aa6e3a9 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 48164525a97bd31c6987e677b9e49bf8a2555f53..6e8b06288cb725fbfc6b502fc526d2c32d4aa512 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 e46786cf44804535b87f06affc947d26047e0ac1..a6146a5eeb376349f35edaf4cc34df9f531fa7c3 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 5acc5be51160d629792a6a161d4893021fd968fe..4f9183e888c6208dcc3ea46991e7c37da6ec760c 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 a8580281a165fc73df6293219272383aa2fddf67..b7c063d11a8fa1be45076f990e78fa2da2ea4035 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 b9a6a154cbe4c59451d9cabd4f7cbac4e1e72587..743f968e37bca7e383ed5f099365ca8705f94965 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 e1c69294dad0157f804a9f3a385fe7bb6950e3d6..bdf219a90c10953406872f657ac5714c9ab78fc4 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 116019e3fef728904950e042a3ee38fe15ae280e..874ee4631c882c48855227bc05199dfc2c4483b4 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 c6594b9fdc363ee3a1f269ab06e08160eb837df3..c242611023ec937eb1337997b3fda5bcd48a14e6 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 553e82598e9c76ac4fed6d193594ab9dd0e4c224..28e65a968dd7d212e6ea95b5b15b215708dd8517 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 c25347b4fa3951b6cabd9d5f0b9ccef589dffb9e..079c270af6174e05503b2d5d6a65f0e59f43ffa4 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 e53fa6e2dbe78d29e3f02acdf2bf942025be3b8e..94e7e9e971c6122e93de73472ba1d773508a4c75 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 df5def739f889b7cd1054dbd19e0bb44d9090a62..efb48b9cf5bf3399cf089d93d7ea5b2099afe347 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 ebb16415c768e6c485fcaea4db9aa1b8a2473aa2..9a4cfb1bee7261136fbe091e81b8be36a21ea84a 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 1babee56d966e0c48d0aa16576a02b5b545bbe7c..a87e9b51df7d630b7d45d0437dc5339ecf20fe2d 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 de20e510604d1d01b9e9165bea144afb1adda733..44aa561635004a2c4e718fcee8301095705d3223 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 d72ef9ef56b1ef5267f769464e7e01ebe28fa482..6f59ddb3e8985e8a5d1de54338e2027474862b10 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 1a87b1382502c6048dcdf449518c94b244ba2489..dbab49290dc4030ae5e35b0a708cb03160e4af5d 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 a34852b6adf0c45924ccb614a0da4268d8f51e87..e0ae727bccd99938ce4c41a75ea45aa3823dc5d1 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 1fc49f162753773151fa438ed0543a5738a9e167..2ce3bc6a37f4dffab9fe66f650a8f95f61c379ff 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 f4eecb5d1bd9a1a2a562c5271f17f8a2cefb6b01..00f7e251dfc95fc94e89dd24a279bab1f6bb8964 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 140f11d408ccc0c83b204d6e95dc6781a3a24e39..53e3f81ea3f72598921058e7c8d3df18cb238894 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 44cf5199904afd1a9f3b69254e6a8d35328173c2..cb419f85bfee4473d0dfaa152528b65c8859faa9 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 21a7c7904ce0f9ee6d29849e2bbaf105a69821ff..9b8a0ce9a0fba2969180721eac3e42cf9f225512 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 e6aaa5164217ba409f079432fe68f35cfa591d92..b6f70010af29e48b61d6aa3fc2f07dce5fcad50d 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 62f4435078f23d3be10f7036505fd18fa4f4e4e0..48370e1c1f39630eb8a5456a43983b1a50121fc3 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 cf29450d8c73613eba74cd0f3594dfe86ef5c9fc..e797bdfdd683bc7fb293a6a5ad957f7f4e43be0e 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 99244768da6bc931d60c8cd840f945c86c6b7551..e439c879e09bfa5416adaff9182d400fcee49866 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 8d8c7f85bd4d16ece652d7a3864163e69c4eb562..6103a9656f07c7aa0d2244d9bd5b1935701978de 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 9f06c89e8450ceb859e1c3af4ad06f851c0f0336..1f0ef8b3cd552137a13eff3b1730de9f91fe9409 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 7ea2ae5352a56243669568cfe66f5dba435d5834..d0a2576ecc8958cad257ff6a46c1b01032d8a207 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 0cd11cef5a01f29169c5f10a5dd9d3c2ec646017..bc11cb4d83dad1be92a9047c2c96a94a7f2eafdb 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 bf39a8379aec4e43773c5d6a8852c8d6f42a3dc8..996ef8970cae29cbec78fb85afc1979b077ddd48 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 1bbbc80b0910ebee07d11b7683c2546e8333a734..20d147f244b72313fe044b77dce3781b46aa9700 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 601de8b4b81ed3b4a07ab462c6a05d03af61c7f2..ca6483f6b7818329f05d79a3a5b0f7363622ca71 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 08c9084ddd981362a6974e0e50e1013e8040c7a4..4b2042951c748ac86983dbfb460304030f38e929 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 4a206908f0b0eda096dad78b39127dc89c1507aa..92ca0bb7055894da5cafd19b044e7cae81995c5d 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 457c5879cca439052ae28e1656d9cc7684824eed..e43dfe295f4118bd9014b7d93cc562effadbbd94 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 77a640d660f7c493e3c488e89bf9cf96e26f5dee..3ffdf1001d32d856cbbbe2c08dfbbeba155a122e 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 251e4b17cf6020509780e544621d55e400630aa1..f71d4b35e52acd1766587fc62c21009a8099a90a 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 198229978e06d35617badc76bc9bdfb6b1c13059..3de965e8aac59f05bed1a4c43eb484e398f1853a 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 db9e6c54bb260e69d460b2e0c32c43da212772dc..dec22c1880f0a1875010816368b49f77b7181c5d 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 adc035eba399d6eba0c90816d164fef8b2d8550a..0fde13e49479e6d71388c43c8e3b6285d4461a98 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 bbbf776892987c5970d8995744fd8eb9c47a1780..1e1d83a3da41235850e62c09f39e904c7dee1c20 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 8de1e969a377e7297052be7c5c8ec5ecda4fc243..65afb6ca74484b1a6d76332787117dce81421afa 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 a5858a7453298b371578bcb4f4693a6c6c72bd1f..b592d8de890cb35c5a2adc729386ba50f962eadb 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 bc24cbb4a924337c18a626c3e7f0d32d1a9767c2..82c8e6c9600239b2fc0cc8536fa86d1eed545800 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 3c1c57ea9ec20995cf252422c00830be519a4175..2a2d79071a0f3b29d23b1459d37a3baebf47652b 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 abc9739b7f90bf7fa91972ea838d7bad44218206..4cc4e9b07b2c99db3684029cd4e9b2a400901fea 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 e9a217469ca180b22f5dcc23a656d46ab2a33477..6b9b75c448dae2f0e4272363f6264647394dbb8e 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 4e06eea1ae6881aa0f5647a05f1353362800353a..4c97267e55c680afe5245d60074dd563b84e3b9d 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 bb83340e08d0ad7c79b67fc20d7c4f5200b8c2bb..ac04dc1b8ee03dd28456529c921ffffb22c78e96 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 8606c619c88586f603b90140465f440f25892958..7ac4fd15ddfce0f41c8cece81f42a8cd1630ac79 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 5d16d044bec52c3897c6a64860272147e2824736..be35c014f56e72382c9e5e4ad2bc1883e65940b1 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 50342f10122daee4e6a8b65936a7db867c662939..e9fdd277b17632ec22a050d239436c9caa2b7c8f 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 1d83f54360e7aeba6b2ce7c2c710ce76ba166a90..43b7d64ddae34efd96931d3b4d8760553f50d15a 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 e5db8699f5c31d807fc69470bafa58648facbda5..332f6ce8610399a06243f6ab6db1b8f950bb0950 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 55724c9f107185e310924547170567318067140d..c219e2575830d4c74448e22273149d2899638df1 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 c0201eaa5dc07e0448565946fef1186f40d806d2..5f740e021ad87c15fa661e6c49324aebebf16e1c 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 5f50f77e2427b0ceb81eb1c00992c848190a25b5..0e3492b64d3c6a060beac7e22811d7148eaffbaa 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 9426d8ce04d6ae52978e0181ac9bd0d99aefa063..5aab431602703e227dfefe02cdef817b74742eb8 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 946439d1bc920bae8e394d63f7ee3b4d909143d0..26964f51108932da8205e4acb41bc028393e1ff4 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 abd7c1805984d308f8e8e6ab2ee5814c9c204cff..ae348fd7d5c1fc0d4207f4d0b035dac001e87fc8 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 aebeb662647b2376bbc562393b02e65ef601ecca..944f60e57130cb3dc6900fe8b73cbb1b84ccf6bc 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 6001e812972ce353adcfc095dae36d86008c6a18..fc3360698c40a7f972a0e45116f547689d0dcc88 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 583b1559122d36cfc21dd05eaf5d34ded033fee1..7ff534c1a1595ae7f7a6e950f9bfe54d6d45f8ad 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 4b804dc3e4ccfbbbaf3c6757f89d4682a5de39bc..246fea3f92cf2d20e885d4367756d18dc97ea56b 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 537e81ddfb8e0228c8675a0b50ba81b4e8981d4a..0a2df6627c603c0054c44ef2aa1ccc1ffac7bcd7 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 e51065f4a95790711455301d78b90ed76a55c4ba..4a3075a16eb158be72afc32de3f59ba12381a5e1 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 245cf6db252b260009f9811bee1e7a53922a592f..936d256eee32cdd3f3ae7b6bf07d40d0548f15f2 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 7436bd79fd769e0387ac1050b2a54d44e3e118d0..253fe12b8cc11f4838bdaf093fd8920bf8fee68a 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 360178fd40c2306db54873c1354cf8e71b73b7d6..bda256f433d66a68ea933a8427bddd32ca9f074a 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 8a83cacbddd93bf5a01e99307b49b8c1b6bf249b..ebb4f345f1bdf90e3af7ad3b876b3a37abdd8683 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 ae67e6ef6260bec639ad2c109254d3c0c3aa3256..f7666aedb6609a372af560677b6008f0072c8f8b 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 737d761ef19516a75aa7f395caa69e7ef1505de9..d7b34257bef4b6f8e6b5402dea992f87f43b7857 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 2ba4d7c3e20902105ad9d19f42e67d710c6e4a4b..ce5934fb0e582ee3825867b32ec2651f25deed0d 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):