fcntl(sock, F_SETOWN, ourpid);
fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_ASYNC);
- if (IN6_IS_ADDR_UNSPECIFIED(&lladdr)) {
- // Autodetect interface-id if not specified
- FILE *fp = fopen("/proc/net/if_inet6", "r");
- if (fp) {
- char addrbuf[33], ifbuf[16];
- while (fscanf(fp, "%32s %*x %*x %*x %*x %15s", addrbuf, ifbuf) == 2) {
- if (!strcmp(ifbuf, if_name)) {
- script_unhexlify((uint8_t*)&lladdr, sizeof(lladdr), addrbuf);
- break;
- }
- }
- fclose(fp);
- }
- }
-
// Send RS
signal(SIGALRM, ra_send_rs);
ra_send_rs(SIGALRM);
bool ra_process(void)
{
bool found = false;
+ bool changed = false;
uint8_t buf[1500], cmsg_buf[128];
struct nd_router_advert *adv = (struct nd_router_advert*)buf;
- struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0, 0};
+ struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0, 0, 0, 0};
const struct in6_addr any = IN6ADDR_ANY_INIT;
+ if (IN6_IS_ADDR_UNSPECIFIED(&lladdr)) {
+ // Autodetect interface-id if not specified
+ FILE *fp = fopen("/proc/net/if_inet6", "r");
+ if (fp) {
+ char addrbuf[33], ifbuf[16];
+ while (fscanf(fp, "%32s %*x %*x %*x %*x %15s", addrbuf, ifbuf) == 2) {
+ if (!strcmp(ifbuf, if_name)) {
+ script_unhexlify((uint8_t*)&lladdr, sizeof(lladdr), addrbuf);
+ break;
+ }
+ }
+ fclose(fp);
+ }
+ }
+
while (true) {
struct sockaddr_in6 from;
struct iovec iov = {buf, sizeof(buf)};
entry.priority = pref_to_priority(0);
entry.valid = router_valid;
entry.preferred = entry.valid;
- odhcp6c_update_entry(STATE_RA_ROUTE, &entry);
+ changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry);
// Parse ND parameters
if (ntohl(adv->nd_ra_reachable) <= 3600000)
continue;
if (entry.priority > 0)
- odhcp6c_update_entry(STATE_RA_ROUTE, &entry);
+ changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry);
} 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)
- odhcp6c_update_entry_safe(STATE_RA_ROUTE, &entry, 7200);
+ changed |= odhcp6c_update_entry_safe(STATE_RA_ROUTE, &entry, 7200);
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];
- odhcp6c_update_entry_safe(STATE_RA_PREFIX, &entry, 7200);
+ changed |= odhcp6c_update_entry_safe(STATE_RA_PREFIX, &entry, 7200);
} 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));
- odhcp6c_update_entry(STATE_RA_DNS, &entry);
+ changed |= odhcp6c_update_entry(STATE_RA_DNS, &entry);
}
}
}
if (found)
odhcp6c_expire();
- return found;
+ return found && changed;
}