changeset 1998:7237127655fc

Fix for broken ARP structure - from Arnaud Chataignier
author gthomas
date Thu, 23 Jun 2005 15:53:51 +0000
parents 10018fa77fed
children 21e6e977e7c2
files packages/net/bsd_tcpip/current/ChangeLog packages/net/bsd_tcpip/current/include/netinet/if_ether.h
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/packages/net/bsd_tcpip/current/ChangeLog
+++ b/packages/net/bsd_tcpip/current/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-23  Gary Thomas  <gary@mlbassoc.com>
+
+	* include/netinet/if_ether.h: Adjust size of struct sockaddr_inarp
+	which needs to match struct sockaddr.  This was broken when IPv6
+	was added and without this change, ARP can get confused.  Tracked
+	down by Arnaud Chataignier <achataignier@neotion.com>
+
 2005-06-17  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* src/sys/kern/uipc_socket.c (sodealloc): Fixed a race condition
--- a/packages/net/bsd_tcpip/current/include/netinet/if_ether.h
+++ b/packages/net/bsd_tcpip/current/include/netinet/if_ether.h
@@ -122,6 +122,7 @@ struct sockaddr_inarp {
 	struct	in_addr sin_srcaddr;
 	u_short	sin_tos;
 	u_short	sin_other;
+        u_char  _padding[16];    // So this matches in size with struct sockaddr
 #define SIN_PROXY 1
 };
 /*