X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fodhcp6c.c;h=2fe41e5160158ed8501863e23a130a640b285034;hb=c7122ecef30af3570fe6484309db1b23325a7356;hp=a37de913a7c722a2ed11e110428a0d93d5c57374;hpb=722226c4f1d45c8bf4ac9189523738abcf7d648f;p=oweals%2Fodhcp6c.git diff --git a/src/odhcp6c.c b/src/odhcp6c.c index a37de91..2fe41e5 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -22,17 +23,23 @@ #include #include #include +#include #include #include -#include #include #include +#include #include "odhcp6c.h" #include "ra.h" +#ifndef IN6_IS_ADDR_UNIQUELOCAL +#define IN6_IS_ADDR_UNIQUELOCAL(a) \ + ((((__const uint32_t *) (a))[0] & htonl (0xfe000000)) \ + == htonl (0xfc000000)) +#endif static void sighandler(int signal); static int usage(void); @@ -46,10 +53,13 @@ static volatile bool signal_usr2 = false; static volatile bool signal_term = false; static int urandom_fd = -1, allow_slaac_only = 0; -static bool bound = false, release = true; +static bool bound = false, release = true, ra = false; 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 main(_unused int argc, char* const argv[]) { @@ -73,8 +83,9 @@ int main(_unused int argc, char* const argv[]) int logopt = LOG_PID; int c; unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE; + unsigned int ra_options = RA_RDNSS_DEFAULT_LIFETIME; - while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:hedp:fav")) != -1) { + while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:Lhedp:fav")) != -1) { switch (c) { case 'S': allow_slaac_only = (optarg) ? atoi(optarg) : -1; @@ -192,6 +203,10 @@ int main(_unused int argc, char* const argv[]) min_update_interval = atoi(optarg); break; + case 'L': + ra_options &= ~RA_RDNSS_DEFAULT_LIFETIME; + break; + case 'e': logopt |= LOG_PERROR; break; @@ -222,11 +237,14 @@ int main(_unused int argc, char* const argv[]) } } + if (allow_slaac_only > 0) + script_sync_delay = allow_slaac_only; + openlog("odhcp6c", logopt, LOG_DAEMON); if (!verbosity) setlogmask(LOG_UPTO(LOG_WARNING)); - const char *ifname = argv[optind]; + ifname = argv[optind]; if (help || !ifname) return usage(); @@ -234,14 +252,14 @@ int main(_unused int argc, char* const argv[]) signal(SIGIO, sighandler); signal(SIGHUP, sighandler); signal(SIGINT, sighandler); - signal(SIGCHLD, sighandler); signal(SIGTERM, sighandler); signal(SIGUSR1, sighandler); signal(SIGUSR2, sighandler); if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 || init_dhcpv6(ifname, client_options, sol_timeout) || - ra_init(ifname, &ifid) || script_init(script, ifname)) { + ra_init(ifname, &ifid, ra_options) || + script_init(script, ifname)) { syslog(LOG_ERR, "failed to initialize: %s", strerror(errno)); return 3; } @@ -266,7 +284,7 @@ int main(_unused int argc, char* const argv[]) } } - script_call("started"); + script_call("started", 0, false); while (!signal_term) { // Main logic odhcp6c_clear_state(STATE_SERVER_ID); @@ -278,13 +296,14 @@ int main(_unused int argc, char* const argv[]) odhcp6c_clear_state(STATE_NTP_FQDN); odhcp6c_clear_state(STATE_SIP_IP); odhcp6c_clear_state(STATE_SIP_FQDN); - dhcpv6_set_ia_mode(ia_na_mode, ia_pd_mode); bound = false; syslog(LOG_NOTICE, "(re)starting transaction on %s", ifname); signal_usr1 = signal_usr2 = false; - int mode = dhcpv6_request(DHCPV6_MSG_SOLICIT); + int mode = dhcpv6_set_ia_mode(ia_na_mode, ia_pd_mode); + if (mode != DHCPV6_STATELESS) + mode = dhcpv6_request(DHCPV6_MSG_SOLICIT); odhcp6c_signal_process(); if (mode < 0) @@ -315,7 +334,7 @@ int main(_unused int argc, char* const argv[]) while (!signal_usr2 && !signal_term) { signal_usr1 = false; - script_call("informed"); + script_call("informed", script_sync_delay, true); int res = dhcpv6_poll_reconfigure(); odhcp6c_signal_process(); @@ -341,7 +360,7 @@ int main(_unused int argc, char* const argv[]) case DHCPV6_STATEFUL: bound = true; - script_call("bound"); + script_call("bound", script_sync_delay, true); syslog(LOG_NOTICE, "entering stateful-mode on %s", ifname); while (!signal_usr2 && !signal_term) { @@ -350,7 +369,7 @@ int main(_unused int argc, char* const argv[]) int res = dhcpv6_poll_reconfigure(); odhcp6c_signal_process(); if (res > 0) { - script_call("updated"); + script_call("updated", 0, false); continue; } @@ -365,7 +384,7 @@ int main(_unused int argc, char* const argv[]) odhcp6c_signal_process(); if (res > 0) { // Renew was succesfull // Publish updates - script_call("updated"); + script_call("updated", 0, false); continue; // Renew was successful } @@ -384,7 +403,7 @@ int main(_unused int argc, char* const argv[]) odhcp6c_signal_process(); if (res > 0) - script_call("rebound"); + script_call("rebound", 0, true); else { break; } @@ -404,7 +423,7 @@ int main(_unused int argc, char* const argv[]) // Add all prefixes to lost prefixes bound = false; - script_call("unbound"); + script_call("unbound", 0, true); if (server_id_len > 0 && (ia_pd_len > 0 || ia_na_len > 0) && release) dhcpv6_request(DHCPV6_MSG_RELEASE); @@ -413,7 +432,7 @@ int main(_unused int argc, char* const argv[]) odhcp6c_clear_state(STATE_IA_PD); } - script_call("stopped"); + script_call("stopped", 0, true); return 0; } @@ -429,7 +448,7 @@ static int usage(void) " -F Force IPv6-Prefix\n" " -V Set vendor-class option (base-16 encoded)\n" " -u Set user-class option string\n" - " -c Override client-ID (base-16 encoded)\n" + " -c Override client-ID (base-16 encoded 16-bit type + value)\n" " -i Use a custom interface identifier for RA handling\n" " -r Options to be requested (comma-separated)\n" " -R Do not request any options except those specified with -r\n" @@ -437,15 +456,16 @@ static int usage(void) " -a Don't send Accept Reconfigure option\n" " -f Don't send Client FQDN option\n" " -k Don't send a RELEASE when stopping\n" - " -t Maximum timeout for DHCPv6-SOLICIT (3600)\n" + " -t Maximum timeout for DHCPv6-SOLICIT (120)\n" " -m Minimum time between accepting updates (30)\n" + " -L Ignore default lifetime for RDNSS records\n" "\nInvocation options:\n" " -p Set pidfile (/var/run/odhcp6c.pid)\n" " -d Daemonize\n" " -e Write logmessages to stderr\n" " -v Increase logging verbosity\n" " -h Show this help\n\n"; - write(STDERR_FILENO, buf, sizeof(buf)); + fputs(buf, stderr); return 1; } @@ -483,11 +503,16 @@ bool odhcp6c_signal_process(void) bool ra_updated = ra_process(); - if (ra_link_up()) + if (ra_link_up()) { signal_usr2 = true; + ra = false; + } - if (ra_updated && (bound || allow_slaac_only >= 0)) - script_call("ra-updated"); // Immediate process urgent events + if (ra_updated && (bound || allow_slaac_only >= 0)) { + script_call("ra-updated", (!ra && !bound) ? + script_sync_delay : script_accu_delay, false); + ra = true; + } } return signal_usr1 || signal_usr2 || signal_term; @@ -507,11 +532,11 @@ void odhcp6c_add_state(enum odhcp6c_state state, const void *data, size_t len) memcpy(n, data, len); } -void odhcp6c_insert_state(enum odhcp6c_state state, size_t offset, const void *data, size_t len) +int odhcp6c_insert_state(enum odhcp6c_state state, size_t offset, const void *data, size_t len) { ssize_t len_after = state_len[state] - offset; if (len_after < 0) - return; + return -1; uint8_t *n = odhcp6c_resize_state(state, len); if (n) { @@ -520,6 +545,8 @@ void odhcp6c_insert_state(enum odhcp6c_state state, size_t offset, const void *d memmove(sdata + offset + len, sdata + offset, len_after); memcpy(sdata + offset, data, len); } + + return 0; } size_t odhcp6c_remove_state(enum odhcp6c_state state, size_t offset, size_t len) @@ -553,14 +580,16 @@ void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len) } -struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new) +static struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new) { - size_t len, cmplen = offsetof(struct odhcp6c_entry, target) + new->length / 8; - struct odhcp6c_entry *start = odhcp6c_get_state(state, &len); - struct odhcp6c_entry *x = NULL; - - for (struct odhcp6c_entry *c = start; !x && c < &start[len/sizeof(*c)]; ++c) - if (!memcmp(c, new, cmplen)) + size_t len, cmplen = offsetof(struct odhcp6c_entry, target) + ((new->length + 7) / 8); + uint8_t *start = odhcp6c_get_state(state, &len); + + for (struct odhcp6c_entry *c = (struct odhcp6c_entry*)start; + (uint8_t*)c < &start[len] && + (uint8_t*)odhcp6c_next_entry(c) <= &start[len]; + c = odhcp6c_next_entry(c)) + if (!memcmp(c, new, cmplen) && !memcmp(c->auxtarget, new->auxtarget, new->auxlen)) return c; return NULL; @@ -572,7 +601,7 @@ bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new, { size_t len; struct odhcp6c_entry *x = odhcp6c_find_entry(state, new); - struct odhcp6c_entry *start = odhcp6c_get_state(state, &len); + uint8_t *start = odhcp6c_get_state(state, &len); if (x && x->valid > new->valid && new->valid < safe) new->valid = safe; @@ -584,20 +613,18 @@ bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new, new->valid - x->valid < min_update_interval && new->preferred >= x->preferred && new->preferred != UINT32_MAX && - new->preferred - x->preferred < min_update_interval && - x->class == new->class) + new->preferred - x->preferred < min_update_interval) return false; x->valid = new->valid; x->preferred = new->preferred; x->t1 = new->t1; x->t2 = new->t2; - x->class = new->class; x->iaid = new->iaid; } else { - odhcp6c_add_state(state, new, sizeof(*new)); + odhcp6c_add_state(state, new, odhcp6c_entry_size(new)); } } else if (x) { - odhcp6c_remove_state(state, (x - start) * sizeof(*x), sizeof(*x)); + odhcp6c_remove_state(state, ((uint8_t*)x) - start, odhcp6c_entry_size(x)); } return true; } @@ -606,8 +633,11 @@ bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new, static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed) { size_t len; - struct odhcp6c_entry *start = odhcp6c_get_state(state, &len); - for (struct odhcp6c_entry *c = start; c < &start[len / sizeof(*c)]; ++c) { + uint8_t *start = odhcp6c_get_state(state, &len); + for (struct odhcp6c_entry *c = (struct odhcp6c_entry*)start; + (uint8_t*)c < &start[len] && + (uint8_t*)odhcp6c_next_entry(c) <= &start[len]; + ) { if (c->t1 < elapsed) c->t1 = 0; else if (c->t1 != UINT32_MAX) @@ -628,8 +658,12 @@ static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed) else if (c->valid != UINT32_MAX) c->valid -= elapsed; - if (!c->valid) - odhcp6c_remove_state(state, (c - start) * sizeof(*c), sizeof(*c)); + if (!c->valid) { + odhcp6c_remove_state(state, ((uint8_t*)c) - start, odhcp6c_entry_size(c)); + start = odhcp6c_get_state(state, &len); + } else { + c = odhcp6c_next_entry(c); + } } } @@ -643,6 +677,7 @@ void odhcp6c_expire(void) odhcp6c_expire_list(STATE_RA_PREFIX, elapsed); odhcp6c_expire_list(STATE_RA_ROUTE, elapsed); odhcp6c_expire_list(STATE_RA_DNS, elapsed); + odhcp6c_expire_list(STATE_RA_SEARCH, elapsed); odhcp6c_expire_list(STATE_IA_NA, elapsed); odhcp6c_expire_list(STATE_IA_PD, elapsed); } @@ -654,9 +689,9 @@ uint32_t odhcp6c_elapsed(void) } -void odhcp6c_random(void *buf, size_t len) +int odhcp6c_random(void *buf, size_t len) { - read(urandom_fd, buf, len); + return read(urandom_fd, buf, len); } bool odhcp6c_is_bound(void) @@ -664,11 +699,60 @@ bool odhcp6c_is_bound(void) return bound; } +bool odhcp6c_addr_in_scope(const struct in6_addr *addr) +{ + FILE *fd = fopen("/proc/net/if_inet6", "r"); + int len; + char buf[256]; + + if (fd == NULL) + return false; + + while (fgets(buf, sizeof(buf), fd)) { + struct in6_addr inet6_addr; + uint32_t flags, dummy; + unsigned int i; + char name[8], addr_buf[32]; + + len = strlen(buf); + + if ((len <= 0) || buf[len - 1] != '\n') + return false; + + buf[--len] = '\0'; + + if (sscanf(buf, "%s %x %x %x %x %s", + addr_buf, &dummy, &dummy, &dummy, &flags, name) != 6) + return false; + + if (strcmp(name, ifname) || + (flags & (IFA_F_DADFAILED | IFA_F_TENTATIVE | IFA_F_DEPRECATED))) + continue; + + for (i = 0; i < sizeof(addr_buf); i++) { + if (!isxdigit(addr_buf[i]) || isupper(addr_buf[i])) + return false; + } + + memset(&inet6_addr, 0, sizeof(inet6_addr)); + for (i = 0; i < (sizeof(addr_buf) / 2); i++) { + unsigned char byte; + static const char hex[] = "0123456789abcdef"; + byte = ((index(hex, addr_buf[i * 2]) - hex) << 4) | + (index(hex, addr_buf[i * 2 + 1]) - hex); + inet6_addr.s6_addr[i] = byte; + } + + if ((IN6_IS_ADDR_LINKLOCAL(&inet6_addr) == IN6_IS_ADDR_LINKLOCAL(addr)) && + (IN6_IS_ADDR_UNIQUELOCAL(&inet6_addr) == IN6_IS_ADDR_UNIQUELOCAL(addr))) + return true; + } + return false; +} + static void sighandler(int signal) { - if (signal == SIGCHLD) - while (waitpid(-1, NULL, WNOHANG) > 0); - else if (signal == SIGUSR1) + if (signal == SIGUSR1) signal_usr1 = true; else if (signal == SIGUSR2) signal_usr2 = true;