Parcourir la source

[trac3070] Fix some typos as part of the review

Shawn Routhier il y a 10 ans
Parent
commit
add8d5a36a

+ 3 - 3
src/bin/dhcp6/dhcp6_messages.mes

@@ -436,9 +436,9 @@ mandatory client-id option. This is most likely caused by a buggy client
 processed and a response with error status code will be sent back.
 processed and a response with error status code will be sent back.
 
 
 % DHCP6_RAPID_COMMIT %1: Rapid Commit option received, following 2-way exchange
 % DHCP6_RAPID_COMMIT %1: Rapid Commit option received, following 2-way exchange
-This debug messgage is issued when the server found Rapid Commit option
-in the client's message and the 2-way exchanges are supported by the
-server for the subnet, which the client is connected to. The argument
+This debug messgage is issued when the server found a Rapid Commit option
+in the client's message and 2-way exchanges are supported by the
+server for the subnet on which the client is connected. The argument
 specifies the client and transaction identification information.
 specifies the client and transaction identification information.
 
 
 % DHCP6_RELEASE_NA address %1 belonging to client duid=%2, iaid=%3 was released properly
 % DHCP6_RELEASE_NA address %1 belonging to client duid=%2, iaid=%3 was released properly

+ 5 - 5
src/bin/dhcp6/dhcp6_srv.cc

@@ -1281,7 +1281,7 @@ Dhcpv6Srv::assignIA_NA(const Pkt6Ptr& query, const Pkt6Ptr& answer,
     const Subnet6Ptr& subnet = orig_ctx.subnet_;
     const Subnet6Ptr& subnet = orig_ctx.subnet_;
     const DuidPtr& duid = orig_ctx.duid_;
     const DuidPtr& duid = orig_ctx.duid_;
 
 
-    // If there is no subnet selected for handling this IA_NA, the only thing to do left is
+    // If there is no subnet selected for handling this IA_NA, the only thing left to do is
     // to say that we are sorry, but the user won't get an address. As a convenience, we
     // to say that we are sorry, but the user won't get an address. As a convenience, we
     // use a different status text to indicate that (compare to the same status code,
     // use a different status text to indicate that (compare to the same status code,
     // but different wording below)
     // but different wording below)
@@ -1441,8 +1441,8 @@ Dhcpv6Srv::assignIA_PD(const Pkt6Ptr& query, const Pkt6Ptr& answer,
     // as we can initialize IAID using a constructor.
     // as we can initialize IAID using a constructor.
     boost::shared_ptr<Option6IA> ia_rsp(new Option6IA(D6O_IA_PD, ia->getIAID()));
     boost::shared_ptr<Option6IA> ia_rsp(new Option6IA(D6O_IA_PD, ia->getIAID()));
 
 
-    // If there is no subnet selected for handling this IA_PD, the only thing to
-    // do left is to say that we are sorry, but the user won't get an address.
+    // If there is no subnet selected for handling this IA_PD, the only thing
+    // left to do is to say that we are sorry, but the user won't get an address.
     // As a convenience, we use a different status text to indicate that
     // As a convenience, we use a different status text to indicate that
     // (compare to the same status code, but different wording below)
     // (compare to the same status code, but different wording below)
     if (!subnet) {
     if (!subnet) {
@@ -1454,7 +1454,7 @@ Dhcpv6Srv::assignIA_PD(const Pkt6Ptr& query, const Pkt6Ptr& answer,
     }
     }
 
 
     // Check if the client sent us a hint in his IA_PD. Clients may send an
     // Check if the client sent us a hint in his IA_PD. Clients may send an
-    // address in their IA_NA options as a suggestion (e.g. the last address
+    // address in their IA_PD options as a suggestion (e.g. the last address
     // they used before).
     // they used before).
     boost::shared_ptr<Option6IAPrefix> hint_opt =
     boost::shared_ptr<Option6IAPrefix> hint_opt =
       boost::dynamic_pointer_cast<Option6IAPrefix>(ia->getOption(D6O_IAPREFIX));
       boost::dynamic_pointer_cast<Option6IAPrefix>(ia->getOption(D6O_IAPREFIX));
@@ -2317,7 +2317,7 @@ Dhcpv6Srv::processSolicit(const Pkt6Ptr& solicit) {
 
 
     Pkt6Ptr response(new Pkt6(DHCPV6_ADVERTISE, solicit->getTransid()));
     Pkt6Ptr response(new Pkt6(DHCPV6_ADVERTISE, solicit->getTransid()));
 
 
-    // Handle Rapid Commit option, if prsent.
+    // Handle Rapid Commit option, if present.
     if (ctx.subnet_ && ctx.subnet_->getRapidCommit()) {
     if (ctx.subnet_ && ctx.subnet_->getRapidCommit()) {
         OptionPtr opt_rapid_commit = solicit->getOption(D6O_RAPID_COMMIT);
         OptionPtr opt_rapid_commit = solicit->getOption(D6O_RAPID_COMMIT);
         if (opt_rapid_commit) {
         if (opt_rapid_commit) {

+ 1 - 1
src/bin/dhcp6/tests/config_parser_unittest.cc

@@ -495,7 +495,7 @@ public:
         CfgMgr::instance().clear();
         CfgMgr::instance().clear();
     }
     }
 
 
-    /// @brief Tests teh Rapid Commit configuration for a subnet.
+    /// @brief Tests the Rapid Commit configuration for a subnet.
     ///
     ///
     /// This test configures the server with a given configuration and
     /// This test configures the server with a given configuration and
     /// verifies if the Rapid Commit has been configured successfully
     /// verifies if the Rapid Commit has been configured successfully

+ 1 - 1
src/lib/dhcpsrv/tests/subnet_unittest.cc

@@ -1042,7 +1042,7 @@ TEST(Subnet6Test, interfaceId) {
 }
 }
 
 
 // This test checks that the Rapid Commit support can be enabled or
 // This test checks that the Rapid Commit support can be enabled or
-// disabled for a subnet. It also checks that the Rapid Commit is
+// disabled for a subnet. It also checks that the Rapid Commit
 // support is disabled by default.
 // support is disabled by default.
 TEST(Subnet6Test, rapidCommit) {
 TEST(Subnet6Test, rapidCommit) {
     Subnet6 subnet(IOAddress("2001:db8:1::"), 56, 1, 2, 3, 4);
     Subnet6 subnet(IOAddress("2001:db8:1::"), 56, 1, 2, 3, 4);