[klibc] [PATCH 1/2] ipconfig: Fix missing dhcp_end field

[Louis Rilling]

Commit b4bad5be5fa41416bf67fa1fba0624a0c541ea39
    Author: Aron Griffis <agriffis at n01se.net>
    Date:   Sun Jun 21 22:40:17 2009 -0400

    ipconfig: omit zero-length DHCP vendor_class_identifier

made the call to dhcp_send()->packet_send() take a variable iov_len, which was
unfortunately truncated by one.

Fix this and the mis-leading comment of packet_send().

Signed-off-by: Louis Rilling <louis.rilling at kerlabs.com>
---
 usr/kinit/ipconfig/dhcp_proto.c |    2 +-
 usr/kinit/ipconfig/packet.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/kinit/ipconfig/dhcp_proto.c b/usr/kinit/ipconfig/dhcp_proto.c
index f3cfd52..d6990ac 100644
--- a/usr/kinit/ipconfig/dhcp_proto.c
+++ b/usr/kinit/ipconfig/dhcp_proto.c
@@ -212,7 +212,7 @@ static int dhcp_send(struct netdev *dev, struct iovec *vec)
 	vec[i].iov_base = dhcp_end;
 	vec[i].iov_len  = sizeof(dhcp_end);
 
-	return packet_send(dev, vec, i);
+	return packet_send(dev, vec, i + 1);
 }
 
 /*
diff --git a/usr/kinit/ipconfig/packet.c b/usr/kinit/ipconfig/packet.c
index 283cf02..aedf51a 100644
--- a/usr/kinit/ipconfig/packet.c
+++ b/usr/kinit/ipconfig/packet.c
@@ -108,7 +108,7 @@ static char *ntoa(uint32_t addr)
 #endif
 
 /*
- * Send a packet.  The options are listed in iov[1...iov_len].
+ * Send a packet.  The options are listed in iov[1...iov_len-1].
  * iov[0] is reserved for the bootp packet header.
  */
 int packet_send(struct netdev *dev, struct iovec *iov, int iov_len)
-- 
1.5.6.5