From: Roy Marples <roy@marples.name>
Date: Wed, 18 Nov 2015 22:57:48 +0000 (+0000)
Subject: Fix adding static routes via a gateway on BSD.
X-Git-Tag: v6.9.4~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95fb94b5d204c189a372a515a6b060df1f7b2eb7;p=thirdparty%2Fdhcpcd.git

Fix adding static routes via a gateway on BSD.
---

diff --git a/if-bsd.c b/if-bsd.c
index 06919504..c0c80693 100644
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -592,6 +592,8 @@ if_route(unsigned char cmd, const struct rt *rt)
 		rtm.hdr.rtm_addrs |= RTA_NETMASK;
 		if (rtm.hdr.rtm_flags & RTF_STATIC)
 			rtm.hdr.rtm_flags |= RTF_GATEWAY;
+		if (rt->net.s_addr == htonl(INADDR_BROADCAST))
+			rtm.hdr.rtm_flags |= RTF_HOST;
 	}
 	if ((cmd == RTM_ADD || cmd == RTM_CHANGE) &&
 	    !(rtm.hdr.rtm_flags & RTF_GATEWAY))
@@ -599,12 +601,11 @@ if_route(unsigned char cmd, const struct rt *rt)
 
 	ADDADDR(&rt->dest);
 	if (rtm.hdr.rtm_addrs & RTA_GATEWAY) {
-#ifdef RTF_CLONING
-		if ((rtm.hdr.rtm_flags & (RTF_HOST | RTF_CLONING) &&
-#else
 		if ((rtm.hdr.rtm_flags & RTF_HOST &&
+		    rt->gate.s_addr == htonl(INADDR_ANY)) ||
+#ifdef RTF_CLONING
+		    rtm.hdr.rtm_flags & RTF_CLONING ||
 #endif
-		    rt->gate.s_addr != htonl(INADDR_LOOPBACK)) ||
 		    !(rtm.hdr.rtm_flags & RTF_STATIC))
 		{
 			if_linkaddr(&su.sdl, rt->iface);