projects
/
project
/
odhcpd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fall through in error case to clear congestion
[project/odhcpd.git]
/
src
/
router.c
diff --git
a/src/router.c
b/src/router.c
index
a23b530
..
9907824
100644
(file)
--- a/
src/router.c
+++ b/
src/router.c
@@
-34,7
+34,7
@@
static void handle_icmpv6(void *addr, void *data, size_t len,
static void trigger_router_advert(struct uloop_timeout *event);
static void sigusr1_refresh(int signal);
static void trigger_router_advert(struct uloop_timeout *event);
static void sigusr1_refresh(int signal);
-static struct odhcpd_event router_event = {{.fd = -1}, handle_icmpv6};
+static struct odhcpd_event router_event = {{.fd = -1}, handle_icmpv6
, NULL
};
static FILE *fp_route = NULL;
#define RA_IOV_LEN 6
static FILE *fp_route = NULL;
#define RA_IOV_LEN 6
@@
-292,10
+292,13
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
minvalid > 1000LL * TIME_LEFT(addr->valid, now))
minvalid = 1000LL * TIME_LEFT(addr->valid, now);
minvalid > 1000LL * TIME_LEFT(addr->valid, now))
minvalid = 1000LL * TIME_LEFT(addr->valid, now);
+ uint32_t this_lifetime = TIME_LEFT(addr->valid, now);
+ if (this_lifetime > UINT16_MAX)
+ this_lifetime = UINT16_MAX;
if (((addr->addr.s6_addr[0] & 0xfe) != 0xfc || iface->default_router)
&& adv.h.nd_ra_router_lifetime
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)
);
+ && ntohs(adv.h.nd_ra_router_lifetime) <
this_lifetime
)
+ adv.h.nd_ra_router_lifetime = htons(
this_lifetime
);
odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr,
(iface->ra_advrouter) ? 128 : addr->prefix);
odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr,
(iface->ra_advrouter) ? 128 : addr->prefix);
@@
-430,7
+433,7
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
minival = (maxival * 3) / 4;
minival = (maxival * 3) / 4;
- search->lifetime =
maxival / 100
;
+ search->lifetime =
htonl(maxival / 100)
;
dns.lifetime = search->lifetime;
odhcpd_urandom(&msecs, sizeof(msecs));
dns.lifetime = search->lifetime;
odhcpd_urandom(&msecs, sizeof(msecs));