From: Roy Marples <roy@marples.name>
Date: Sat, 21 Jul 2007 13:00:18 +0000 (+0000)
Subject: Add new socket code to try and support InfiniBand better.
X-Git-Tag: v3.2.3~230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dce6d87531fed636f2e36743ba2ef13754e5b08;p=thirdparty%2Fdhcpcd.git

Add new socket code to try and support InfiniBand better.
---

diff --git a/ChangeLog b/ChangeLog
index 62fbfa6b..f5493f3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+Add new socket code to try and support InfiniBand better.
 Support RFC 3361 SIP Servers.
 We now do ARP checking by default as recommended by RFC 2131.
 Add RFC 3927 (aka IPV4LL aka APIPA) support by default.
diff --git a/socket.c b/socket.c
index 6d344d17..b1b87cb2 100644
--- a/socket.c
+++ b/socket.c
@@ -419,7 +419,11 @@ int open_socket (interface_t *iface, bool arp)
 {
 	int fd;
 	int flags;
-	struct sockaddr_ll sll;
+	union sockunion {
+		struct sockaddr sa;
+		struct sockaddr_ll sll;
+		struct sockaddr_storage ss;
+	} su;
 
 	if ((fd = socket (PF_PACKET, SOCK_DGRAM, htons (ETH_P_IP))) == -1) {
 		logger (LOG_ERR, "socket: %s", strerror (errno));
@@ -434,21 +438,20 @@ int open_socket (interface_t *iface, bool arp)
 		return -1;
 	}
 
-	memset (&sll, 0, sizeof (struct sockaddr_ll));
-	sll.sll_family = AF_PACKET;
+	memset (&su, 0, sizeof (struct sockaddr_storage));
+	su.sll.sll_family = AF_PACKET;
 	if (arp)
-		sll.sll_protocol = htons (ETH_P_ARP);
+		su.sll.sll_protocol = htons (ETH_P_ARP);
 	else
-		sll.sll_protocol = htons (ETH_P_IP);
-	if (! (sll.sll_ifindex = if_nametoindex (iface->name))) {
+		su.sll.sll_protocol = htons (ETH_P_IP);
+	if (! (su.sll.sll_ifindex = if_nametoindex (iface->name))) {
 		logger (LOG_ERR, "if_nametoindex: Couldn't find index for interface `%s'",
 				iface->name);
 		close (fd);
 		return -1;
 	}
 
-	if (bind (fd, (struct sockaddr *) &sll,
-			  sizeof (struct sockaddr_ll)) == -1)
+	if (bind (fd, &su.sa, sizeof (struct sockaddr_storage)) == -1)
 	{
 		logger (LOG_ERR, "bind: %s", strerror (errno));
 		close (fd);
@@ -458,7 +461,7 @@ int open_socket (interface_t *iface, bool arp)
 	if (iface->fd > -1)
 		close (iface->fd);
 	iface->fd = fd;
-	iface->socket_protocol = ntohs (sll.sll_protocol);
+	iface->socket_protocol = ntohs (su.sll.sll_protocol);
 
 	iface->buffer_length = BUFFER_LENGTH;
 
@@ -468,25 +471,29 @@ int open_socket (interface_t *iface, bool arp)
 int send_packet (const interface_t *iface, const int type,
 				 const unsigned char *data, const int len)
 {
-	struct sockaddr_ll sll;
+	union sockunion {
+		struct sockaddr sa;
+		struct sockaddr_ll sll;
+		struct sockaddr_storage ss;
+	} su;
 	int retval;
 
 	if (! iface)
 		return -1;
 
-	memset (&sll, 0, sizeof (struct sockaddr_ll));
-	sll.sll_family = AF_PACKET;
-	sll.sll_protocol = htons (type);
-	if (! (sll.sll_ifindex = if_nametoindex (iface->name))) {
+	memset (&su, 0, sizeof (struct sockaddr_storage));
+	su.sll.sll_family = AF_PACKET;
+	su.sll.sll_protocol = htons (type);
+	if (! (su.sll.sll_ifindex = if_nametoindex (iface->name))) {
 		logger (LOG_ERR, "if_nametoindex: Couldn't find index for interface `%s'",
 				iface->name);
 		return -1;
 	}
-	sll.sll_halen = ETHER_ADDR_LEN;
-	memset(sll.sll_addr, 0xff, sizeof (sll.sll_addr));
+	su.sll.sll_halen = iface->hwlen;
+	memset(&su.sll.sll_addr, 0xff, iface->hwlen);
 
-	if ((retval = sendto (iface->fd, data, len, 0, (struct sockaddr *) &sll,
-						  sizeof (struct sockaddr_ll))) == -1) 
+	if ((retval = sendto (iface->fd, data, len, 0, &su.sa,
+						  sizeof (struct sockaddr_storage))) == -1)
 
 		logger (LOG_ERR, "sendto: %s", strerror (errno));
 	return retval;