Browse Source

[2326] Message log about wrong IAID fixed in DHCPv6

Tomek Mrugalski 12 years ago
parent
commit
8679b40530
2 changed files with 5 additions and 5 deletions
  1. 2 2
      src/bin/dhcp6/dhcp6_messages.mes
  2. 3 3
      src/bin/dhcp6/dhcp6_srv.cc

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

@@ -105,14 +105,14 @@ intervention (e.g. check if DHCP process has sufficient privileges to
 update the database). It may also be triggered if a lease was manually
 removed from the database during RELEASE message processing.
 
-% DHCP6_RELEASE_FAIL_WRONG_DUID client (duid=%2) tried to release address %2, but it belongs to client (duid=%3)
+% DHCP6_RELEASE_FAIL_WRONG_DUID client (duid=%1) tried to release address %2, but it belongs to client (duid=%3)
 This warning message indicates that client tried to release an address
 that belongs to a different client. This should not happen in normal
 circumstances and may indicate a misconfiguration of the client.  However,
 since the client releasing the address will stop using it anyway, there
 is a good chance that the situation will correct itself.
 
-% DHCP6_RELEASE_FAIL_WRONG_IAID client (duid=%2) tried to release address %2, but it used wrong IAID (expected %4, but got %3)
+% DHCP6_RELEASE_FAIL_WRONG_IAID client (duid=%1) tried to release address %2, but it used wrong IAID (expected %3, but got %4)
 This warning message indicates that client tried to release an address
 that does belong to it, but the address was expected to be in a different
 IA (identity association) container. This probably means that the client's

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

@@ -809,8 +809,8 @@ OptionPtr Dhcpv6Srv::releaseIA_NA(const DuidPtr& duid, Pkt6Ptr question,
         // Sorry, it's not your address. You can't release it.
 
         LOG_WARN(dhcp6_logger, DHCP6_RELEASE_FAIL_WRONG_DUID)
-            .arg(release_addr->getAddress().toText())
             .arg(duid->toText())
+            .arg(release_addr->getAddress().toText())
             .arg(lease->duid_->toText());
 
         general_status = STATUS_NoBinding;
@@ -822,10 +822,10 @@ OptionPtr Dhcpv6Srv::releaseIA_NA(const DuidPtr& duid, Pkt6Ptr question,
     if (ia->getIAID() != lease->iaid_) {
         // This address belongs to this client, but to a different IA
         LOG_WARN(dhcp6_logger, DHCP6_RELEASE_FAIL_WRONG_IAID)
-            .arg(release_addr->getAddress().toText())
             .arg(duid->toText())
-            .arg(ia->getIAID())
+            .arg(release_addr->getAddress().toText())
             .arg(lease->iaid_);
+            .arg(ia->getIAID())
         ia_rsp->addOption(createStatusCode(STATUS_NoBinding,
                           "This is your address, but you used wrong IAID"));
         general_status = STATUS_NoBinding;