From 2cac4f87c91b594dbc710e3caf736f683adcf12d Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 26 Jul 2016 19:12:21 +0000 Subject: [PATCH] Fix compile on BSD. --- if-bsd.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/if-bsd.c b/if-bsd.c index 636dcfd5..d99bc306 100644 --- a/if-bsd.c +++ b/if-bsd.c @@ -635,7 +635,6 @@ if_route(unsigned char cmd, const struct rt *rt) } rtm; char *bp = rtm.buffer; size_t l; - struct in_addr src_addr; if ((cmd == RTM_ADD || cmd == RTM_DELETE || cmd == RTM_CHANGE) && rt->iface->ctx->options & DHCPCD_DAEMONISE && @@ -740,9 +739,7 @@ if_route(unsigned char cmd, const struct rt *rt) if (rtm.hdr.rtm_addrs & RTA_NETMASK) ADDADDR(&rt->mask); - if ((cmd == RTM_ADD || cmd == RTM_CHANGE) && - (rtm.hdr.rtm_addrs & (RTA_IFP | RTA_IFA))) - { + if (cmd == RTM_ADD || cmd == RTM_CHANGE) { rtm.hdr.rtm_index = (unsigned short)rt->iface->index; if (rtm.hdr.rtm_addrs & RTA_IFP) { if_linkaddr(&su.sdl, rt->iface); @@ -750,7 +747,7 @@ if_route(unsigned char cmd, const struct rt *rt) } if (rtm.hdr.rtm_addrs & RTA_IFA) - ADDADDR(&src_addr); + ADDADDR(&rt->src); if (rt->mtu) { rtm.hdr.rtm_inits |= RTV_MTU; @@ -1095,7 +1092,7 @@ if_route6(unsigned char cmd, const struct rt6 *rt) if (rtm.hdr.rtm_addrs & RTA_NETMASK) ADDADDR(&rt->mask); - if (rtm.hdr.rtm_addrs & (RTA_IFP | RTA_IFA)) { + if (cmd == RTM_ADD || cmd == RTM_CHANGE) { rtm.hdr.rtm_index = (unsigned short)rt->iface->index; if (rtm.hdr.rtm_addrs & RTA_IFP) { if_linkaddr(&su.sdl, rt->iface); -- 2.47.3