[trac3982] Fix some typos and cut and paste errors

src/bin/dhcp6/dhcp6_messages.mes

@@ -216,8 +216,8 @@ This message is printed when DHCPv6 server disables an interface from being
 used to receive DHCPv6 traffic. Sockets on this interface will not be opened
 by the Interface Manager until interface is enabled.
 
-% DHCP6_DECLINE_PROCESS_IA Processing of IA (iaid: %1) from client %2 started.
-This debug message is printed when the server starts processing IA_NA option
+% DHCP6_DECLINE_PROCESS_IA Processing of IA (IAID: %1) from client %2 started.
+This debug message is printed when the server starts processing an IA_NA option
 received in Decline message. It's expected that the option will contain an
 address that is being declined. Specific information will be printed in a
 separate message.
@@ -226,7 +226,7 @@ separate message.
 This informational message is printed when a client attempts to decline
 a lease, but that lease belongs to a different client.
 
-% DHCP6_DECLINE_FAIL_IAID_MISMATCH Client %1 tries to decline address %2, but used a wrong IAID (%3), instead of expected %4
+% DHCP6_DECLINE_FAIL_IAID_MISMATCH Client %1 tried to decline address %2, but used a wrong IAID (%3), instead of expected %4
 This informational message is printed when a client attempts to decline
 a lease. The server has a lease for this address, it belongs to this client,
 but the recorded IAID does not match what client has sent. This means
@@ -240,19 +240,19 @@ lease is supposed to have a DUID, even if it is an empty one.
 This informational message is printed when a client tried to decline an address,
 but the server has no lease for said address. This means that the server's
 and client's perception of the leases are different. The likely causes
-of this could be: confused (e.g. skewed clock) or broken client (e.g. client
+of this could be: a confused (e.g. skewed clock) or broken client (e.g. client
 moved to a different location and didn't notice) or possibly an attack
 (a rogue client is trying to decline random addresses). The server will
 inform the client that his decline request was rejected and client should
 be able to recover from that.
 
-% DHCP6_DECLINE_LEASE Address %1 was declined by alient %2. The lease will be recovered in %3 seconds.
+% DHCP6_DECLINE_LEASE Address %1 was declined by client %2. The lease will be recovered in %3 seconds.
 This informational message indicates that the client leased an address, but
-discovered that it is used by some other devicea and reported this to the
+discovered that it is being used by some other devicea and reported this to the
 server by sending a Decline message. The server marked the lease as
 declined. This likely indicates a misconfiguration in the network. Either
-the server is configured with wrong pool or there are devices that have
-statically assigned address that is supposed to be assigned by the DHCP
+the server is configured with an incorrect pool or there are devices that have
+statically assigned addresses that are supposed to be assigned by the DHCP
 server. Both client (will request a different address) and server (will recover
 the lease after decline-probation-time elapses) will recover automatically.
 However, if the underlying problem is not solved, the conditions leading

src/bin/dhcp6/dhcp6_srv.cc

@@ -2616,13 +2616,13 @@ void
 Dhcpv6Srv::declineLeases(const Pkt6Ptr& decline, Pkt6Ptr& reply,
                          AllocEngine::ClientContext6& ctx) {
 
-    // We need to deline addresses for all IA_NA options in the client's
+    // We need to decline addresses for all IA_NA options in the client's
     // RELEASE message.
 
     // Let's set the status to be success by default. We can override it with
     // error status if needed. The important thing to understand here is that
     // the global status code may be set to success only if all IA options were
-    // handled properly. Therefore the releaseIA_NA and releaseIA_PD options
+    // handled properly. Therefore the declineIA  options
     // may turn the status code to some error, but can't turn it back to success.
     int general_status = STATUS_Success;
 
@@ -2652,12 +2652,12 @@ Dhcpv6Srv::declineIA(const Pkt6Ptr& decline, const DuidPtr& duid,
         .arg(decline->getLabel())
         .arg(ia->getIAID());
 
-    // Release can be done in one of two ways:
+    // Decline can be done in one of two ways:
     // Approach 1: extract address from client's IA_NA and see if it belongs
     // to this particular client.
     // Approach 2: find a subnet for this client, get a lease for
     // this subnet/duid/iaid and check if its content matches to what the
-    // client is asking us to release.
+    // client is asking us to decline.
     //
     // This method implements approach 1.
 
@@ -2753,7 +2753,7 @@ Dhcpv6Srv::declineIA(const Pkt6Ptr& decline, const DuidPtr& duid,
 
     if (total_addrs == 0) {
         setStatusCode(ia_rsp, createStatusCode(*decline, *ia_rsp, STATUS_NoBinding,
-                                               "Not addresses sent in IA_NA."));
+                                               "No addresses sent in IA_NA."));
         general_status = STATUS_NoBinding;
         return (ia_rsp);
     }