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/ra.c | |
| parent | 0aff911e92043891dcb5ccd83b721ee748195175 (diff) | |
| download | odhcp6c-46ba6f6aeb8055e872c57dc2b90a383fb280f440.tar.gz | |
Don't apply excess filter to DHCPv6 and unify odhcp6c_update_entry
Diffstat (limited to 'src/ra.c')
| -rw-r--r-- | src/ra.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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); } } } |