From: Roy Marples <roy@marples.name>
Date: Tue, 31 Jul 2007 14:09:00 +0000 (+0000)
Subject: Fix link routes which broke in 3.1.2.
X-Git-Tag: v3.2.3~220
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d2cbde6d91548986ff3b5b6da6746cd568a79a2;p=thirdparty%2Fdhcpcd.git

Fix link routes which broke in 3.1.2.
---

diff --git a/ChangeLog b/ChangeLog
index 29c59279..e9f196eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+dhcpcd-3.1.3
+Fix link routes which broke in 3.1.2.
+
 dhcpcd-3.1.2
 Use a generic route logger.
 Fix static route netmask calculation and applicaton.
diff --git a/Makefile b/Makefile
index ef0fb73d..8f64812c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 3.1.2
+VERSION = 3.1.3
 CFLAGS ?= -O2 -pipe
 
 # Should work for both GNU make and BSD make
diff --git a/interface.c b/interface.c
index 3420b5de..4b74fefb 100644
--- a/interface.c
+++ b/interface.c
@@ -898,7 +898,8 @@ static int do_route (const char *ifname,
 	else {
 		nlm.hdr.nlmsg_flags |= NLM_F_CREATE | NLM_F_EXCL;
 		nlm.rt.rtm_protocol = RTPROT_BOOT;
-		if (netmask.s_addr == INADDR_BROADCAST)
+		if (netmask.s_addr == INADDR_BROADCAST ||
+			gateway.s_addr == INADDR_ANY)
 			nlm.rt.rtm_scope = RT_SCOPE_LINK;
 		else
 			nlm.rt.rtm_scope = RT_SCOPE_UNIVERSE;