Parcourir la source

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

Stephen Morris il y a 12 ans
Parent
commit
64e40094a7

+ 4 - 3
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.
 interpret. The reason why the packet is invalid is included in the message.
 
 
 % DHCP4_PACKET_RECEIVE_FAIL error on attempt to receive packet: %1
 % 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
 occured during this attempt. The reason for the error is included in
 the message.
 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).
 (e.g. it will report a received OFFER packet as UNKNOWN).
 
 
 % DHCP4_PACKET_SEND_FAIL failed to send DHCPv4 packet: %1
 % 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
 % DHCP4_PACK_FAIL failed to assemble response correctly
 This error is output if the server failed to assemble the data to be
 This error is output if the server failed to assemble the data to be

+ 4 - 3
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.
 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
 % 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
 occured during this attempt. The reason for the error is included in
 the message.
 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).
 a received OFFER packet as UNKNOWN).
 
 
 % DHCP6_PACKET_SEND_FAIL failed to send DHCPv6 packet: %1
 % 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
 % DHCP6_PACK_FAIL failed to assemble response correctly
 This error is output if the server failed to assemble the data to be
 This error is output if the server failed to assemble the data to be

+ 1 - 4
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
             // broadcast. This will return broadcast address, not
             // the address we are bound to.
             // 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;
             // to_addr = pktinfo->ipi_spec_dst;
         }
         }
         cmsg = CMSG_NXTHDR(&m, cmsg);
         cmsg = CMSG_NXTHDR(&m, cmsg);