diff options
author | Steven Barth <steven@midlink.org> | 2014-12-10 11:38:20 +0100 |
---|---|---|
committer | Steven Barth <steven@midlink.org> | 2014-12-10 11:38:20 +0100 |
commit | 46ba6f6aeb8055e872c57dc2b90a383fb280f440 (patch) | |
tree | 86939da06f7248757456f23f1688e08207cd17f5 /src | |
parent | 0aff911e92043891dcb5ccd83b721ee748195175 (diff) | |
download | odhcp6c-46ba6f6aeb8055e872c57dc2b90a383fb280f440.tar.gz |
Don't apply excess filter to DHCPv6 and unify odhcp6c_update_entry
Diffstat (limited to 'src')
-rw-r--r-- | src/dhcpv6.c | 4 | ||||
-rw-r--r-- | src/odhcp6c.c | 12 | ||||
-rw-r--r-- | src/odhcp6c.h | 3 | ||||
-rw-r--r-- | src/ra.c | 10 |
4 files changed, 12 insertions, 17 deletions
diff --git a/src/dhcpv6.c b/src/dhcpv6.c index 597d239..5cda153 100644 --- a/src/dhcpv6.c +++ b/src/dhcpv6.c @@ -1213,7 +1213,7 @@ static int dhcpv6_parse_ia(void *opt, void *end) } if (ok) { - odhcp6c_update_entry(STATE_IA_PD, &entry); + odhcp6c_update_entry(STATE_IA_PD, &entry, 0, false); parsed_ia++; } @@ -1248,7 +1248,7 @@ static int dhcpv6_parse_ia(void *opt, void *end) entry.class = sdata[0] << 8 | sdata[1]; #endif - odhcp6c_update_entry(STATE_IA_NA, &entry); + odhcp6c_update_entry(STATE_IA_NA, &entry, 0, false); parsed_ia++; } } diff --git a/src/odhcp6c.c b/src/odhcp6c.c index 8149738..3712830 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -565,7 +565,8 @@ struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct } -bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe) +bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new, + uint32_t safe, bool filterexcess) { size_t len; struct odhcp6c_entry *x = odhcp6c_find_entry(state, new); @@ -576,7 +577,8 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n if (new->valid > 0) { if (x) { - if (new->valid >= x->valid && new->valid != UINT32_MAX && + if (filterexcess && new->valid >= x->valid && + new->valid != UINT32_MAX && new->valid - x->valid < min_update_interval && new->preferred >= x->preferred && new->preferred != UINT32_MAX && @@ -599,12 +601,6 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n } -bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new) -{ - return odhcp6c_update_entry_safe(state, new, 0); -} - - static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed) { size_t len; diff --git a/src/odhcp6c.h b/src/odhcp6c.h index 0efae10..1fda72a 100644 --- a/src/odhcp6c.h +++ b/src/odhcp6c.h @@ -339,8 +339,7 @@ void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len); // Entry manipulation struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new); -bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new); -bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe); +bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe, bool filterexcess); void odhcp6c_expire(void); uint32_t odhcp6c_elapsed(void); @@ -329,7 +329,7 @@ bool ra_process(void) entry.priority = pref_to_priority(0); entry.valid = router_valid; entry.preferred = entry.valid; - changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry); + changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry, 0, true); // Parse hoplimit if (adv->nd_ra_curhoplimit) @@ -367,7 +367,7 @@ bool ra_process(void) continue; if (entry.priority > 0) - changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry); + changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry, 0, true); } else if (opt->type == ND_OPT_PREFIX_INFORMATION && opt->len == 4) { struct nd_opt_prefix_info *pinfo = (struct nd_opt_prefix_info*)opt; entry.router = any; @@ -384,7 +384,7 @@ bool ra_process(void) continue; if (pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ONLINK) - changed |= odhcp6c_update_entry_safe(STATE_RA_ROUTE, &entry, 7200); + changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry, 7200, true); if (!(pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_AUTO) || pinfo->nd_opt_pi_prefix_len != 64) @@ -393,7 +393,7 @@ bool ra_process(void) entry.target.s6_addr32[2] = lladdr.s6_addr32[2]; entry.target.s6_addr32[3] = lladdr.s6_addr32[3]; - changed |= odhcp6c_update_entry_safe(STATE_RA_PREFIX, &entry, 7200); + changed |= odhcp6c_update_entry(STATE_RA_PREFIX, &entry, 7200, true); } else if (opt->type == ND_OPT_RECURSIVE_DNS && opt->len > 2) { entry.router = from.sin6_addr; entry.priority = 0; @@ -405,7 +405,7 @@ bool ra_process(void) for (ssize_t i = 0; i < (opt->len - 1) / 2; ++i) { memcpy(&entry.target, &opt->data[6 + i * sizeof(entry.target)], sizeof(entry.target)); - changed |= odhcp6c_update_entry(STATE_RA_DNS, &entry); + changed |= odhcp6c_update_entry(STATE_RA_DNS, &entry, 0, true); } } } |