From: Roy Marples <roy@marples.name>
Date: Tue, 25 Nov 2008 11:37:55 +0000 (+0000)
Subject: Backport route code from trunk so we correctly handle adding routes via local link.
X-Git-Tag: v4.0.6~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2372a5d787f6666db7e3af2df71543b571c7681d;p=thirdparty%2Fdhcpcd.git

Backport route code from trunk so we correctly handle adding routes via local link.
---

diff --git a/if-bsd.c b/if-bsd.c
index bbf1a95d..5be10c1e 100644
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -116,14 +116,23 @@ if_route(const char *ifname, const struct in_addr *destination,
 	struct rtm 
 	{
 		struct rt_msghdr hdr;
-		char buffer[sizeof(su) * 3];
+		char buffer[sizeof(su) * 4];
 	} rtm;
-	char *bp = rtm.buffer;
+	char *bp = rtm.buffer, *p;
 	size_t l;
-	unsigned char *hwaddr;
-	size_t hwlen = 0;
 	int retval = 0;
 
+#define ADDSU(_su) \
+	l = SA_SIZE(&(_su.sa)); \
+	memcpy(bp, &(_su), l); \
+	bp += l;
+#define ADDADDR(_addr) \
+	memset (&su, 0, sizeof(su)); \
+	su.sin.sin_family = AF_INET; \
+	su.sin.sin_len = sizeof(su.sin); \
+	memcpy (&su.sin.sin_addr, _addr, sizeof(su.sin.sin_addr)); \
+	ADDSU(su);
+
 	if ((s = socket(PF_ROUTE, SOCK_RAW, 0)) == -1)
 		return -1;
 
@@ -139,45 +148,32 @@ if_route(const char *ifname, const struct in_addr *destination,
 	rtm.hdr.rtm_flags = RTF_UP | RTF_STATIC;
 	if (netmask->s_addr == INADDR_BROADCAST)
 		rtm.hdr.rtm_flags |= RTF_HOST;
-
-	/* This order is important */
-	rtm.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY | RTA_NETMASK;
-
-#define ADDADDR(_addr) \
-	memset (&su, 0, sizeof(su)); \
-	su.sin.sin_family = AF_INET; \
-	su.sin.sin_len = sizeof(su.sin); \
-	memcpy (&su.sin.sin_addr, _addr, sizeof(su.sin.sin_addr)); \
-	l = SA_SIZE (&(su.sa)); \
-	memcpy (bp, &(su), l); \
-	bp += l;
-
-	ADDADDR(destination);
-
-	if (gateway->s_addr == INADDR_ANY) {
-		/* Make us a link layer socket */
-		hwaddr = xmalloc(sizeof(unsigned char) * HWADDR_LEN);
-		do_interface(ifname, hwaddr, &hwlen, NULL, 0, 0);
-		memset(&su, 0, sizeof(su));
-		su.sdl.sdl_len = sizeof(su.sdl);
-		su.sdl.sdl_family = AF_LINK;
-		su.sdl.sdl_nlen = strlen(ifname);
-		memcpy(&su.sdl.sdl_data, ifname, (size_t)su.sdl.sdl_nlen);
-		su.sdl.sdl_alen = hwlen;
-		memcpy(((unsigned char *)&su.sdl.sdl_data) + su.sdl.sdl_nlen,
-		       hwaddr, (size_t)su.sdl.sdl_alen);
-
-		l = SA_SIZE(&(su.sa));
-		memcpy(bp, &su, l);
-		bp += l;
-		free(hwaddr);
-	} else {
+	if (gateway->s_addr != INADDR_ANY)	
 		rtm.hdr.rtm_flags |= RTF_GATEWAY;
-		ADDADDR(gateway);
-	}
+	rtm.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY | RTA_NETMASK | RTA_IFP;
 
-	ADDADDR(netmask);
-#undef ADDADDR
+	ADDADDR(destination);
+	ADDADDR(gateway);
+
+	/* Ensure that netmask is set correctly */
+	memset(&su, 0, sizeof(su));
+	su.sin.sin_family = AF_INET;
+	su.sin.sin_len = sizeof(su.sin);
+	memcpy(&su.sin.sin_addr, &netmask->s_addr, sizeof(su.sin.sin_addr));
+	p = su.sa.sa_len + (char *)&su;
+	for (su.sa.sa_len = 0; p > (char *)&su; )
+		if (*--p != 0) {
+			su.sa.sa_len = 1 + p - (char *)&su;
+			break;
+		}
+	ADDSU(su);
+
+	/* Make us a link layer socket for IFP */
+	memset(&su, 0, sizeof(su));
+	su.sdl.sdl_family = AF_LINK;
+	su.sdl.sdl_len = sizeof(su.sdl);
+	link_addr(ifname, &su.sdl);
+	ADDSU(su);
 
 	rtm.hdr.rtm_msglen = l = bp - (char *)&rtm;
 	if (write(s, &rtm, l) == -1)