Fix up ethernet address struct-vs-array bug

diff --git a/common/packet.c b/common/packet.c
index b010a357a5ca0a1fcb162c5e9f1202adeaed9c0d..9a688df6d9b852c8985f57a69ed5f915f4ebcfab 100644 (file)
--- 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 b010a357a5ca0a1fcb162c5e9f1202adeaed9c0d..9a688df6d9b852c8985f57a69ed5f915f4ebcfab 100644 (file)
--- 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;