From: Roy Marples <roy@marples.name>
Date: Tue, 29 Jan 2008 10:53:59 +0000 (+0000)
Subject: Better to use the size of the packet.
X-Git-Tag: v3.2.3~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2051a07288fb6fe5c07dd6b239e914482efa20ed;p=thirdparty%2Fdhcpcd.git

Better to use the size of the packet.
---

diff --git a/socket.c b/socket.c
index a3af6d24..830a41f2 100644
--- a/socket.c
+++ b/socket.c
@@ -235,14 +235,14 @@ static int valid_dhcp_packet (unsigned char *data)
 		goto eexit;
 	}
 
-	memcpy (&source, &d.packet->ip.ip_src, sizeof (source));
-	memcpy (&dest, &d.packet->ip.ip_dst, sizeof (dest));
+	memcpy (&source, &d.packet->ip.ip_src, sizeof (d.packet->ip.ip_src));
+	memcpy (&dest, &d.packet->ip.ip_dst, sizeof (d.packet->ip.ip_dst));
 	memset (&d.packet->ip, 0, sizeof (d.packet->ip));
 	d.packet->udp.uh_sum = 0;
 
 	d.packet->ip.ip_p = IPPROTO_UDP;
-	memcpy (&d.packet->ip.ip_src, &source, sizeof (source));
-	memcpy (&d.packet->ip.ip_dst, &dest, sizeof (dest));
+	memcpy (&d.packet->ip.ip_src, &source, sizeof (d.packet->ip.ip_src));
+	memcpy (&d.packet->ip.ip_dst, &dest, sizeof (d.packet->ip.ip_dst));
 	d.packet->ip.ip_len = d.packet->udp.uh_ulen;
 	if (udpsum && udpsum != checksum (d.data, bytes)) {
 		logger (LOG_ERR, "bad UDP checksum, ignoring");