diff options
author | Steven Barth <steven@midlink.org> | 2014-01-03 11:40:07 +0100 |
---|---|---|
committer | Steven Barth <steven@midlink.org> | 2014-01-03 11:40:07 +0100 |
commit | 9cd9c3ba82c341de1af091575e11cd3ddd433c8c (patch) | |
tree | cce6fdb62155cb24fef7406f6f33fc4d3b3aa2a7 /src/dhcpv6-ia.c | |
parent | 34330b9d564d706f38d01dd6608147bfe54f122d (diff) |
Remove ula_compat feature
Diffstat (limited to 'src/dhcpv6-ia.c')
-rw-r--r-- | src/dhcpv6-ia.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c index bdaa3da..3d6b786 100644 --- a/src/dhcpv6-ia.c +++ b/src/dhcpv6-ia.c @@ -552,10 +552,6 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status, if (a) { uint32_t pref = 3600; uint32_t valid = 3600; - bool have_non_ula = false; - for (size_t i = 0; i < iface->ia_addr_len; ++i) - if ((iface->ia_addr[i].addr.s6_addr[0] & 0xfe) != 0xfc) - have_non_ula = true; for (size_t i = 0; i < iface->ia_addr_len; ++i) { bool match = true; @@ -580,12 +576,6 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status, iface->ia_addr[i].preferred <= (uint32_t)now) continue; - // ULA-deprecation compatibility workaround - if ((iface->ia_addr[i].addr.s6_addr[0] & 0xfe) == 0xfc && - a->length == 128 && have_non_ula && - iface->deprecate_ula_if_public_avail) - continue; - if (prefix_pref > 86400) prefix_pref = 86400; |