From: Ted Lemon <source@isc.org>
Date: Thu, 16 May 1996 23:13:07 +0000 (+0000)
Subject: Fix up ethernet address struct-vs-array bug
X-Git-Tag: BETA-2~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9029cbeea8d64405c40939e0aa6bda9204c61310;p=thirdparty%2Fdhcp.git

Fix up ethernet address struct-vs-array bug
---

diff --git a/common/packet.c b/common/packet.c
index b010a357a..9a688df6d 100644
--- a/common/packet.c
+++ b/common/packet.c
@@ -157,7 +157,7 @@ size_t decode_hw_header (interface, buf, bufix, from)
   if (ntohs (eh.ether_type) != ETHERTYPE_IP)
 	  return -1;
 #endif
-  memcpy (from -> haddr, eh.ether_shost, sizeof (eh.ether_shost));
+  memcpy (from -> haddr, ETHER_SRC (&eh), sizeof (eh.ether_shost));
   from -> htype = ARPHRD_ETHER;
   from -> hlen = sizeof eh.ether_shost;
 
diff --git a/packet.c b/packet.c
index b010a357a..9a688df6d 100644
--- a/packet.c
+++ b/packet.c
@@ -157,7 +157,7 @@ size_t decode_hw_header (interface, buf, bufix, from)
   if (ntohs (eh.ether_type) != ETHERTYPE_IP)
 	  return -1;
 #endif
-  memcpy (from -> haddr, eh.ether_shost, sizeof (eh.ether_shost));
+  memcpy (from -> haddr, ETHER_SRC (&eh), sizeof (eh.ether_shost));
   from -> htype = ARPHRD_ETHER;
   from -> hlen = sizeof eh.ether_shost;