summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2015-09-07 11:48:05 +0200
committerSteven Barth <steven@midlink.org>2015-09-07 11:48:05 +0200
commita3d1f5148222174f12ea8df0c20a554fc5eaabab (patch)
tree1b1ba37d4584bfc768aafa914f8fa6919be5ba46
parent01c1163b979cb3872aba9274ecbf0b38f822f950 (diff)
downloadodhcpd-a3d1f5148222174f12ea8df0c20a554fc5eaabab.tar.gz
router: don't announce as default router if we aren't
-rw-r--r--src/router.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/router.c b/src/router.c
index 3fbf590..a23b530 100644
--- a/src/router.c
+++ b/src/router.c
@@ -293,6 +293,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
minvalid = 1000LL * TIME_LEFT(addr->valid, now);
if (((addr->addr.s6_addr[0] & 0xfe) != 0xfc || iface->default_router)
+ && adv.h.nd_ra_router_lifetime
&& ntohs(adv.h.nd_ra_router_lifetime) < TIME_LEFT(addr->valid, now))
adv.h.nd_ra_router_lifetime = htons(TIME_LEFT(addr->valid, now));
@@ -315,7 +316,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
p->nd_opt_pi_valid_time = 0;
}
- if (!iface->default_router && ntohs(adv.h.nd_ra_router_lifetime) == 1) {
+ if (!iface->default_router && adv.h.nd_ra_router_lifetime == htons(1)) {
syslog(LOG_WARNING, "A default route is present but there is no public prefix "
"on %s thus we don't announce a default route!", iface->ifname);
adv.h.nd_ra_router_lifetime = 0;