}
if (ok) {
- odhcp6c_update_entry(STATE_IA_PD, &entry, 0, false);
+ odhcp6c_update_entry(STATE_IA_PD, &entry, 0, 0);
parsed_ia++;
}
entry.length = 128;
entry.target = addr->addr;
- odhcp6c_update_entry(STATE_IA_NA, &entry, 0, false);
+ odhcp6c_update_entry(STATE_IA_NA, &entry, 0, 0);
parsed_ia++;
}
}
static time_t last_update = 0;
static char *ifname = NULL;
-static unsigned int min_update_interval = DEFAULT_MIN_UPDATE_INTERVAL;
static unsigned int script_sync_delay = 10;
static unsigned int script_accu_delay = 1;
int c;
unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE;
unsigned int ra_options = RA_RDNSS_DEFAULT_LIFETIME;
+ unsigned int ra_holdoff_interval = RA_MIN_ADV_INTERVAL;
while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:Lhedp:fav")) != -1) {
switch (c) {
break;
case 'm':
- min_update_interval = atoi(optarg);
+ ra_holdoff_interval = atoi(optarg);
break;
case 'L':
if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
init_dhcpv6(ifname, client_options, sol_timeout) ||
- ra_init(ifname, &ifid, ra_options) ||
+ ra_init(ifname, &ifid, ra_options, ra_holdoff_interval) ||
script_init(script, ifname)) {
syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
return 3;
" -f Don't send Client FQDN option\n"
" -k Don't send a RELEASE when stopping\n"
" -t <seconds> Maximum timeout for DHCPv6-SOLICIT (120)\n"
- " -m <seconds> Minimum time between accepting updates (30)\n"
+ " -m <seconds> Minimum time between accepting RA updates (3)\n"
" -L Ignore default lifetime for RDNSS records\n"
"\nInvocation options:\n"
" -p <pidfile> Set pidfile (/var/run/odhcp6c.pid)\n"
}
bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new,
- uint32_t safe, bool filterexcess)
+ uint32_t safe, unsigned int holdoff_interval)
{
size_t len;
struct odhcp6c_entry *x = odhcp6c_find_entry(state, new);
if (new->valid > 0) {
if (x) {
- if (filterexcess && new->valid >= x->valid &&
+ if (holdoff_interval && new->valid >= x->valid &&
new->valid != UINT32_MAX &&
- new->valid - x->valid < min_update_interval &&
+ new->valid - x->valid < holdoff_interval &&
new->preferred >= x->preferred &&
new->preferred != UINT32_MAX &&
- new->preferred - x->preferred < min_update_interval)
+ new->preferred - x->preferred < holdoff_interval)
return false;
x->valid = new->valid;
#define DHCPV6_REB_MAX_RT 600
#define DHCPV6_INF_MAX_RT 120
-#define DEFAULT_MIN_UPDATE_INTERVAL 30
+#define RA_MIN_ADV_INTERVAL 3 /* RFC 4861 paragraph 6.2.1 */
enum dhcvp6_opt {
DHCPV6_OPT_CLIENTID = 1,
void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len);
// Entry manipulation
-bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe, bool filterexcess);
+bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new,
+ uint32_t safe, unsigned int holdoff_interval);
void odhcp6c_expire(void);
uint32_t odhcp6c_elapsed(void);
static volatile int rs_attempt = 0;
static struct in6_addr lladdr = IN6ADDR_ANY_INIT;
static unsigned int ra_options = 0;
+static unsigned int ra_holdoff_interval = 0;
struct {
struct icmp6_hdr hdr;
static void ra_send_rs(int signal __attribute__((unused)));
-int ra_init(const char *ifname, const struct in6_addr *ifid, unsigned int options)
+int ra_init(const char *ifname, const struct in6_addr *ifid,
+ unsigned int options, unsigned int holdoff_interval)
{
ra_options = options;
+ ra_holdoff_interval = holdoff_interval;
const pid_t ourpid = getpid();
sock = socket(AF_INET6, SOCK_RAW | SOCK_CLOEXEC, IPPROTO_ICMPV6);
entry->valid = router_valid;
entry->preferred = entry->valid;
- changed |= odhcp6c_update_entry(STATE_RA_ROUTE, entry, 0, true);
+ changed |= odhcp6c_update_entry(STATE_RA_ROUTE, entry,
+ 0, ra_holdoff_interval);
// Parse hoplimit
ra_conf_hoplimit(adv->nd_ra_curhoplimit);
continue;
if (entry->priority > 0)
- changed |= odhcp6c_update_entry(STATE_RA_ROUTE, entry, 0, true);
+ changed |= odhcp6c_update_entry(STATE_RA_ROUTE, entry,
+ 0, ra_holdoff_interval);
} 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;
continue;
if (pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ONLINK)
- changed |= odhcp6c_update_entry(STATE_RA_ROUTE, entry, 7200, true);
+ changed |= odhcp6c_update_entry(STATE_RA_ROUTE, entry,
+ 7200, ra_holdoff_interval);
if (!(pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_AUTO) ||
pinfo->nd_opt_pi_prefix_len != 64)
entry->target.s6_addr32[2] = lladdr.s6_addr32[2];
entry->target.s6_addr32[3] = lladdr.s6_addr32[3];
- changed |= odhcp6c_update_entry(STATE_RA_PREFIX, entry, 7200, true);
+ changed |= odhcp6c_update_entry(STATE_RA_PREFIX, entry,
+ 7200, ra_holdoff_interval);
} else if (opt->type == ND_OPT_RECURSIVE_DNS && opt->len > 2) {
entry->router = from.sin6_addr;
entry->priority = 0;
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, 0, true);
+ changed |= odhcp6c_update_entry(STATE_RA_DNS, entry,
+ 0, ra_holdoff_interval);
}
} else if (opt->type == ND_OPT_DNSSL && opt->len > 1) {
uint32_t *valid = (uint32_t*)&opt->data[2];
if (entry->auxlen == 0)
continue;
- changed |= odhcp6c_update_entry(STATE_RA_SEARCH, entry, 0, true);
+ changed |= odhcp6c_update_entry(STATE_RA_SEARCH, entry,
+ 0, ra_holdoff_interval);
entry->auxlen = 0;
}
}
(void*)(opt + opt->len) <= (void*)(end); opt += opt->len)
-int ra_init(const char *ifname, const struct in6_addr *ifid, unsigned int options);
+int ra_init(const char *ifname, const struct in6_addr *ifid,
+ unsigned int options, unsigned int holdoff_interval);
bool ra_link_up(void);
bool ra_process(void);