[trac4097] Fix some typos

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 0a75ccb92cc04715a5d8f3d7da6f893937fe5dbc..17a3e6b66e7859ba379fde5e220a3576c2530a5f 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -84,7 +84,7 @@ The first argument specifies the client and transaction identification
 information. The second argument includes all classes to which the
 packet has been assigned.
 
-% DHCP4_CLASS_UNCONFIGURED %1: client packet belongs an unconfigured class: %2
+% DHCP4_CLASS_UNCONFIGURED %1: client packet belongs to an unconfigured class: %2
 This debug message informs that incoming packet belongs to a class
 which cannot be found in the configuration. Either a hook written
 before the classification was added to Kea is used, or class naming is

diff --git a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
index 1166f6d0af7b48bf7a2925879be12e8ef72a4d2d..6636b12c4e0f60726eb9e20b0f48b7d5030fea4d 100644 (file)
--- a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
@@ -1743,7 +1743,7 @@ TEST_F(Dhcpv4SrvTest, matchClassification) {
     srv.classifyPacket(query2);
     srv.classifyPacket(query3);
 
-    // Packets at the exception of the second should be in the router class
+    // Packets with the exception of the second should be in the router class
     EXPECT_TRUE(query1->inClass("router"));
     EXPECT_FALSE(query2->inClass("router"));
     EXPECT_TRUE(query3->inClass("router"));
@@ -1757,11 +1757,11 @@ TEST_F(Dhcpv4SrvTest, matchClassification) {
     OptionPtr opt1 = response1->getOption(DHO_IP_FORWARDING);
     EXPECT_TRUE(opt1);
 
-    // But only for the first exchange: second was not classified
+    // But only for the first query: second was not classified
     OptionPtr opt2 = response2->getOption(DHO_IP_FORWARDING);
     EXPECT_FALSE(opt2);
 
-    // But only for the first exchange: third has no PRL
+    // But only for the first query: third has no PRL
     OptionPtr opt3 = response3->getOption(DHO_IP_FORWARDING);
     EXPECT_FALSE(opt3);
 }
@@ -1834,7 +1834,7 @@ TEST_F(Dhcpv4SrvTest, subnetClassPriority) {
     // Process the query
     Pkt4Ptr response = srv.processDiscover(query);
 
-    // A processing should add an ip-forwarding option
+    // Processing should add an ip-forwarding option
     OptionPtr opt = response->getOption(DHO_IP_FORWARDING);
     ASSERT_TRUE(opt);
     ASSERT_GT(opt->len(), opt->getHeaderLen());
@@ -1911,7 +1911,7 @@ TEST_F(Dhcpv4SrvTest, classGlobalPriority) {
     // Process the query
     Pkt4Ptr response = srv.processDiscover(query);
 
-    // A processing should add an ip-forwarding option
+    // Processing should add an ip-forwarding option
     OptionPtr opt = response->getOption(DHO_IP_FORWARDING);
     ASSERT_TRUE(opt);
     ASSERT_GT(opt->len(), opt->getHeaderLen());
@@ -1933,7 +1933,7 @@ TEST_F(Dhcpv4SrvTest, clientClassify) {
 
     // The second subnet does not play any role here. The client's
     // IP address belongs to the first subnet, so only that first
-    // subnet it being tested.
+    // subnet is being tested.
     string config = "{ \"interfaces-config\": {"
         "    \"interfaces\": [ \"*\" ]"
         "},"

diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index 20e6c8e40b3f82a7f457f2f3b4be894663500ba7..e4d77488c543bb0ea8c5bd97d41388c538e44948 100644 (file)
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -88,7 +88,7 @@ to establish a session with the Kea control channel.
 This debug message informs that incoming packet has been assigned to specified
 class or classes.
 
-% DHCP6_CLASS_UNCONFIGURED client packet belongs an unconfigured class: %1
+% DHCP6_CLASS_UNCONFIGURED client packet belongs to an unconfigured class: %1
 This debug message informs that incoming packet belongs to a class
 which cannot be found in the configuration. Either a hook written
 before the classification was added to Kea is used, or class naming is

diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index edf377391525db29976f441d3cedd25f527c7b72..bc3f891437aefa7d34e5dcca1aa4fcfc67b78139 100644 (file)
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -1905,7 +1905,7 @@ TEST_F(Dhcpv6SrvTest, matchClassification) {
     srv.classifyPacket(query2);
     srv.classifyPacket(query3);
 
-    // Packets at the exception of the second should be in the router class
+    // Packets with the exception of the second should be in the router class
     EXPECT_TRUE(query1->inClass("router"));
     EXPECT_FALSE(query2->inClass("router"));
     EXPECT_TRUE(query3->inClass("router"));
@@ -1919,11 +1919,11 @@ TEST_F(Dhcpv6SrvTest, matchClassification) {
     OptionPtr opt1 = response1->getOption(2345);
     EXPECT_TRUE(opt1);
 
-    // But only for the first exchange: second was not classified
+    // But only for the first query: second was not classified
     OptionPtr opt2 = response2->getOption(2345);
     EXPECT_FALSE(opt2);
 
-    // But only for the first exchange: third has no ORO
+    // But only for the first query: third has no ORO
     OptionPtr opt3 = response3->getOption(2345);
     EXPECT_FALSE(opt3);
 }
@@ -1974,7 +1974,7 @@ TEST_F(Dhcpv6SrvTest, subnetClassPriority) {
     query->setIface("eth1");
     query->addOption(generateIA(D6O_IA_NA, 123, 1500, 3000));
 
-    // Create and add a ORO option to the query
+    // Create and add an ORO option to the query
     OptionUint16ArrayPtr oro(new OptionUint16Array(Option::V6, D6O_ORO));
     ASSERT_TRUE(oro);
     oro->addValue(2345);
@@ -1994,7 +1994,7 @@ TEST_F(Dhcpv6SrvTest, subnetClassPriority) {
     // Process the query
     Pkt6Ptr response = srv.processSolicit(query);
 
-    // A processing should add an ip-forwarding option
+    // Processing should add an ip-forwarding option
     OptionPtr opt = response->getOption(2345);
     ASSERT_TRUE(opt);
     ASSERT_GT(opt->len(), opt->getHeaderLen());
@@ -2049,7 +2049,7 @@ TEST_F(Dhcpv6SrvTest, classGlobalPriority) {
     query->setIface("eth1");
     query->addOption(generateIA(D6O_IA_NA, 123, 1500, 3000));
 
-    // Create and add a ORO option to the query
+    // Create and add an ORO option to the query
     OptionUint16ArrayPtr oro(new OptionUint16Array(Option::V6, D6O_ORO));
     ASSERT_TRUE(oro);
     oro->addValue(2345);
@@ -2069,7 +2069,7 @@ TEST_F(Dhcpv6SrvTest, classGlobalPriority) {
     // Process the query
     Pkt6Ptr response = srv.processSolicit(query);
 
-    // A processing should add an ip-forwarding option
+    // Processing should add an ip-forwarding option
     OptionPtr opt = response->getOption(2345);
     ASSERT_TRUE(opt);
     ASSERT_GT(opt->len(), opt->getHeaderLen());
@@ -2091,7 +2091,7 @@ TEST_F(Dhcpv6SrvTest, clientClassifySubnet) {
 
     // The second subnet does not play any role here. The client's
     // IP address belongs to the first subnet, so only that first
-    // subnet it being tested.
+    // subnet is being tested.
     string config = "{ \"interfaces-config\": {"
         "  \"interfaces\": [ \"*\" ]"
         "},"

diff --git a/src/lib/dhcpsrv/option_space_container.h b/src/lib/dhcpsrv/option_space_container.h
index 98285f9920a946b680dc5d1ba88944b8571d8bad..70aa12656bd0d6879892b143f42f0f6f039a0431 100644 (file)
--- a/src/lib/dhcpsrv/option_space_container.h
+++ b/src/lib/dhcpsrv/option_space_container.h
@@ -41,7 +41,7 @@ public:
 
     /// @brief Indicates the container is empty
     ///
-    /// @return true when the confainer is empty
+    /// @return true when the container is empty
     bool empty() const {
         return (option_space_map_.empty());
     }

diff --git a/src/lib/dhcpsrv/parsers/dhcp_parsers.cc b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc
index 8a581f821226b1635242c416ca997120d7cd57e2..819fb6bb98a919b25eb9c20f9eb494bf97e45b5f 100644 (file)
--- a/src/lib/dhcpsrv/parsers/dhcp_parsers.cc
+++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc
@@ -1263,7 +1263,7 @@ SubnetConfigParser::createSubnet() {
     }
 
     // Here globally defined options were merged to the subnet specific
-    // options but it is no longer the case (they have a different
+    // options but this is no longer the case (they have a different
     // and not consecutive priority).
 
     // Copy options to the subnet configuration.