From: Roy Marples <roy@marples.name>
Date: Thu, 19 May 2016 15:07:52 +0000 (+0000)
Subject: Fix a compile issue adding loopback routes.
X-Git-Tag: v6.11.1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58153b6af284231c148f428521f9283575e5ac9a;p=thirdparty%2Fdhcpcd.git

Fix a compile issue adding loopback routes.
---

diff --git a/ipv4.c b/ipv4.c
index 844c84b7..cebda0b9 100644
--- a/ipv4.c
+++ b/ipv4.c
@@ -578,13 +578,13 @@ static struct rt_head *
 add_loopback_route(struct rt_head *rt, const struct interface *ifp)
 {
 	struct rt *r;
-	const struct dhcp_state *s;
+	const struct dhcp_state *state;
 
 	if (rt == NULL) /* earlier malloc failed */
 		return NULL;
 
-	s = D_CSTATE(ifp);
-	if (s->addr.s_addr == INADDR_ANY)
+	state = D_CSTATE(ifp);
+	if (state->addr == NULL)
 		return rt;
 
 	if ((r = calloc(1, sizeof(*r))) == NULL) {
@@ -592,11 +592,11 @@ add_loopback_route(struct rt_head *rt, const struct interface *ifp)
 		ipv4_freeroutes(rt);
 		return NULL;
 	}
-	r->dest = s->addr;
+	r->dest = state->addr->addr;
 	r->mask.s_addr = INADDR_BROADCAST;
 	r->gate.s_addr = htonl(INADDR_LOOPBACK);
 	r->mtu = dhcp_get_mtu(ifp);
-	r->src = s->addr;
+	r->src = state->addr->addr;
 	TAILQ_INSERT_HEAD(rt, r, next);
 	return rt;
 }