Fix arp segfaulting and final 3.1.1

1 files changed, 11 insertions, 1 deletions

diff --git a/arp.c b/arp.c
index c770e268..ee2df40e 100644
--- a/arp.c
+++ b/arp.c
@@ -196,9 +196,19 @@ int arp_claim (interface_t *iface, struct in_addr address)
 
 			rp.c = (unsigned char *) ar_spa (reply);
 			rh.c = (unsigned char *) ar_sha (reply);
+			
+			/* Ensure the ARP reply is for the address we asked for */
+			if (rp.a->s_addr != address.s_addr)
+				continue;
+
+			/* Some systems send a reply back from our hwaddress - weird */
+			if (reply->ar_hln == iface->hwlen &&
+				memcmp (rh.c, iface->hwaddr, iface->hwlen) == 0)
+				continue;
+
 			logger (LOG_ERR, "ARPOP_REPLY received from %s (%s)",
 					inet_ntoa (*rp.a),
-					hwaddr_ntoa (rh.a, reply->ar_hln));
+					hwaddr_ntoa (rh.c, reply->ar_hln));
 			retval = -1;
 			goto eexit;
 		}