BIND 10 trac2187, updated. 64e40094a730e99da4b24bbe97cb346af7b8fbcd [2187] Corrected the text of a few messages and removed a comment

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Sep 26 14:34:04 UTC 2012


The branch, trac2187 has been updated
       via  64e40094a730e99da4b24bbe97cb346af7b8fbcd (commit)
      from  02dd6ed0dd458e7627e06bcab6a5168354e929d6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 64e40094a730e99da4b24bbe97cb346af7b8fbcd
Author: Stephen Morris <stephen at isc.org>
Date:   Wed Sep 26 14:45:39 2012 +0100

    [2187] Corrected the text of a few messages and removed a comment

-----------------------------------------------------------------------

Summary of changes:
 src/bin/dhcp4/dhcp4_messages.mes |    7 ++++---
 src/bin/dhcp6/dhcp6_messages.mes |    7 ++++---
 src/lib/dhcp/iface_mgr_linux.cc  |    5 +----
 3 files changed, 9 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 2ff8f53..63ddbfc 100644
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -43,7 +43,7 @@ The IPv4 DHCP server has received a packet that it is unable to
 interpret. The reason why the packet is invalid is included in the message.
 
 % DHCP4_PACKET_RECEIVE_FAIL error on attempt to receive packet: %1
-The IPv4 DHCP server tried to receive a packet but unexpected error
+The IPv4 DHCP server tried to receive a packet but an error
 occured during this attempt. The reason for the error is included in
 the message.
 
@@ -54,8 +54,9 @@ may well be a valid DHCP packet, just a type not expected by the server
 (e.g. it will report a received OFFER packet as UNKNOWN).
 
 % DHCP4_PACKET_SEND_FAIL failed to send DHCPv4 packet: %1
-This error is output if IPv6 DHCP server fails to send assembled DHCP
-message to a client. The reason for the error is included in the message.
+This error is output if the IPv4 DHCP server fails to send an assembled
+DHCP message to a client. The reason for the error is included in the
+message.
 
 % DHCP4_PACK_FAIL failed to assemble response correctly
 This error is output if the server failed to assemble the data to be
diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index 424e253..1564940 100644
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -46,7 +46,7 @@ server is about to open sockets on the specified port.
 The IPv6 DHCP server has received a packet that it is unable to interpret.
 
 % DHCP6_PACKET_RECEIVE_FAIL error on attempt to receive packet: %1
-The IPv6 DHCP server tried to receive a packet but unexpected error
+The IPv6 DHCP server tried to receive a packet but an error
 occured during this attempt. The reason for the error is included in
 the message.
 
@@ -57,8 +57,9 @@ DHCP packet, just a type not expected by the server (e.g. it will report
 a received OFFER packet as UNKNOWN).
 
 % DHCP6_PACKET_SEND_FAIL failed to send DHCPv6 packet: %1
-This error is output if IPv6 DHCP server fails to send assembled DHCP
-message to a client. The reason fo the error is included in the message.
+This error is output if the IPv6 DHCP server fails to send an assembled
+DHCP message to a client. The reason for the error is included in the
+message.
 
 % DHCP6_PACK_FAIL failed to assemble response correctly
 This error is output if the server failed to assemble the data to be
diff --git a/src/lib/dhcp/iface_mgr_linux.cc b/src/lib/dhcp/iface_mgr_linux.cc
index 581ce5f..189fe90 100644
--- a/src/lib/dhcp/iface_mgr_linux.cc
+++ b/src/lib/dhcp/iface_mgr_linux.cc
@@ -554,10 +554,7 @@ bool IfaceMgr::os_receive4(struct msghdr& m, Pkt4Ptr& pkt) {
             // broadcast. This will return broadcast address, not
             // the address we are bound to.
 
-            // IOAddress tmp(htonl(pktinfo->ipi_spec_dst.s_addr));
-            // cout << "The other addr is: " << tmp.toText() << endl;
-
-            // Perhaps we should uncomment this:
+            // XXX: Perhaps we should uncomment this:
             // to_addr = pktinfo->ipi_spec_dst;
         }
         cmsg = CMSG_NXTHDR(&m, cmsg);



More information about the bind10-changes mailing list