diff options
| author |   florian <florian@openbsd.org> | 2017-08-23 10:45:35 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2017-08-23 10:45:35 +0000 |
| commit | c3a6ceb7c7ea413108e6598c9624ff898b2d02b0 (patch) | |
| tree | ec3ceed3ff887bfc5815bcd06d73949ff078d753 | |
| parent | Prevent trashing of the producer index and descriptor counter (diff) | |
| download | wireguard-openbsd-c3a6ceb7c7ea413108e6598c9624ff898b2d02b0.tar.xz wireguard-openbsd-c3a6ceb7c7ea413108e6598c9624ff898b2d02b0.zip | |
Extract timeout_from_lifetime(); to be used in more places.
| -rw-r--r-- | sbin/slaacd/engine.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/sbin/slaacd/engine.c b/sbin/slaacd/engine.c index 6c660943e83..01ed092a8e8 100644 --- a/sbin/slaacd/engine.c +++ b/sbin/slaacd/engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.c,v 1.13 2017/08/21 14:44:26 florian Exp $ */ +/* $OpenBSD: engine.c,v 1.14 2017/08/23 10:45:35 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser <florian@openbsd.org> @@ -230,6 +230,7 @@ void gen_addr(struct slaacd_iface *, struct radv_prefix *, void gen_address_proposal(struct slaacd_iface *, struct radv *, struct radv_prefix *, int); void free_address_proposal(struct address_proposal *); +void timeout_from_lifetime(struct address_proposal *); void configure_address(struct address_proposal *); void in6_prefixlen2mask(struct in6_addr *, int len); void gen_dfr_proposal(struct slaacd_iface *, struct @@ -1638,11 +1639,12 @@ void update_iface_ra(struct slaacd_iface *iface, struct radv *ra) } void -configure_address(struct address_proposal *addr_proposal) +timeout_from_lifetime(struct address_proposal *addr_proposal) { - struct imsg_configure_address address; - struct timeval tv; - time_t lifetime; + struct timeval tv; + time_t lifetime; + + addr_proposal->next_timeout = 0; if (addr_proposal->pltime > MAX_RTR_SOLICITATIONS * (RTR_SOLICITATION_INTERVAL + 1)) @@ -1659,8 +1661,13 @@ configure_address(struct address_proposal *addr_proposal) evtimer_add(&addr_proposal->timer, &tv); log_debug("%s: %d, scheduling new timeout in %llds.%06ld", __func__, addr_proposal->if_index, tv.tv_sec, tv.tv_usec); - } else - addr_proposal->next_timeout = 0; + } +} + +void +configure_address(struct address_proposal *addr_proposal) +{ + struct imsg_configure_address address; addr_proposal->state = PROPOSAL_CONFIGURED; |