diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2020-01-14 21:16:48 +0100 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2020-01-16 20:29:53 +0100 |
| commit | 6db312a698e920ff61505ef1f42469880829774d (patch) | |
| tree | d127942181b46c8c4efc6ff7dcc63acbef6731c7 /src/dhcpv6-ia.c | |
| parent | 2520c483781339f6c7feae617b7e5c0137e3534d (diff) | |
dhcpv6-ia: use dhcp leasetime to set preferred/valid statefull lifetimes
Allow to set the preferred/valid lifetimes of IA_NA/IA_PD options based
on the configured dhcp leasetime.
DHCP leqasetime will be used to set the preferred/valid lifetimes in the
IA_NA/IA_PD options unless the preferred/valid lifetimes of the IPv6
address are smaller then the DHCP leasetime.
This will avoid IA_NA/IA_PD options being sent with infinite lifetimes
due to the IPv6 address having infinite preferred/valid lifetimes
like IPv6 ULA addresses.
While at it rename dhcpv4_leasetime into dhcp_leasetime as the leasetime
is used both for DHCPv4 and DHCPv6
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'src/dhcpv6-ia.c')
| -rw-r--r-- | src/dhcpv6-ia.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c index ee0acaf..d8187ff 100644 --- a/src/dhcpv6-ia.c +++ b/src/dhcpv6-ia.c @@ -823,7 +823,7 @@ static size_t build_ia(uint8_t *buf, size_t buflen, uint16_t status, if (a->leasetime) leasetime = a->leasetime; else - leasetime = iface->dhcpv4_leasetime; + leasetime = iface->dhcp_leasetime; uint32_t pref = leasetime; uint32_t valid = leasetime; @@ -842,9 +842,15 @@ static size_t build_ia(uint8_t *buf, size_t buflen, uint16_t status, if (prefix_pref != UINT32_MAX) prefix_pref -= now; + if (prefix_pref > leasetime) + prefix_pref = leasetime; + if (prefix_valid != UINT32_MAX) prefix_valid -= now; + if (prefix_valid > leasetime) + prefix_valid = leasetime; + if (a->flags & OAF_DHCPV6_PD) { struct dhcpv6_ia_prefix o_ia_p = { .type = htons(DHCPV6_OPT_IA_PREFIX), |