X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.c;h=59f6390801152d82264e3a45516e8979a8ca5a4e;hp=2668d949bdedc9050572f3497ab06e62d04b9870;hb=d277ddb78abd034eb0e1c088ac969cdeef10d9e2;hpb=68300e0f9f318daf5495b5e5ee7d56ad9cff99cf diff --git a/src/odhcp6c.c b/src/odhcp6c.c index 2668d94..59f6390 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -25,16 +25,12 @@ #include #include -#include #include #include #include "odhcp6c.h" #include "ra.h" -#ifdef EXT_BFD_PING -#include "bfd.h" -#endif static void sighandler(int signal); @@ -49,9 +45,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 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[]) { // Allocate ressources @@ -61,22 +61,21 @@ int main(_unused int argc, char* const argv[]) uint8_t buf[134]; char *optpos; uint16_t opttype; + uint16_t optlen; enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY; enum odhcp6c_ia_mode ia_pd_mode = IA_MODE_NONE; int ia_pd_iaid_index = 0; static struct in6_addr ifid = IN6ADDR_ANY_INIT; int sol_timeout = DHCPV6_SOL_MAX_RT; + int verbosity = 0; -#ifdef EXT_BFD_PING - int bfd_interval = 0, bfd_loss = 3; -#endif bool help = false, daemonize = false; int logopt = LOG_PID; int c; unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE; - while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Rs:kt:hedp:fa")) != -1) { + while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:hedp:fav")) != -1) { switch (c) { case 'S': allow_slaac_only = (optarg) ? atoi(optarg) : -1; @@ -138,12 +137,6 @@ int main(_unused int argc, char* const argv[]) ia_pd_mode = IA_MODE_FORCE; break; -#ifdef EXT_BFD_PING - case 'B': - bfd_interval = atoi(optarg); - break; -#endif - case 'c': l = script_unhexlify(&buf[4], sizeof(buf) - 4, optarg); if (l > 0) { @@ -178,6 +171,12 @@ int main(_unused int argc, char* const argv[]) client_options |= DHCPV6_STRICT_OPTIONS; break; + case 'u': + optlen = htons(strlen(optarg)); + odhcp6c_add_state(STATE_USERCLASS, &optlen, 2); + odhcp6c_add_state(STATE_USERCLASS, optarg, strlen(optarg)); + break; + case 's': script = optarg; break; @@ -190,6 +189,10 @@ int main(_unused int argc, char* const argv[]) sol_timeout = atoi(optarg); break; + case 'm': + min_update_interval = atoi(optarg); + break; + case 'e': logopt |= LOG_PERROR; break; @@ -210,13 +213,23 @@ int main(_unused int argc, char* const argv[]) client_options &= ~DHCPV6_ACCEPT_RECONFIGURE; break; + case 'v': + ++verbosity; + break; + default: help = true; break; } } + 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]; if (help || !ifname) @@ -225,7 +238,6 @@ 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); @@ -245,26 +257,23 @@ int main(_unused int argc, char* const argv[]) return 4; } - char pidbuf[128]; if (!pidfile) { - snprintf(pidbuf, sizeof(pidbuf), - "/var/run/odhcp6c.%s.pid", ifname); - pidfile = pidbuf; + snprintf((char*)buf, sizeof(buf), "/var/run/odhcp6c.%s.pid", ifname); + pidfile = (char*)buf; } - int fd = open(pidfile, O_WRONLY | O_CREAT); - if (fd >= 0) { - char buf[8]; - int len = snprintf(buf, sizeof(buf), "%i\n", getpid()); - write(fd, buf, len); - close(fd); + FILE *fp = fopen(pidfile, "w"); + if (fp) { + fprintf(fp, "%i\n", getpid()); + fclose(fp); } } - script_call("started"); + script_call("started", 0, false); while (!signal_term) { // Main logic odhcp6c_clear_state(STATE_SERVER_ID); + odhcp6c_clear_state(STATE_SERVER_ADDR); odhcp6c_clear_state(STATE_IA_NA); odhcp6c_clear_state(STATE_IA_PD); odhcp6c_clear_state(STATE_SNTP_IP); @@ -272,13 +281,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) @@ -309,7 +319,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(); @@ -334,13 +344,9 @@ int main(_unused int argc, char* const argv[]) break; case DHCPV6_STATEFUL: - script_call("bound"); bound = true; + script_call("bound", script_sync_delay, true); syslog(LOG_NOTICE, "entering stateful-mode on %s", ifname); -#ifdef EXT_BFD_PING - if (bfd_interval > 0) - bfd_start(ifname, bfd_loss, bfd_interval); -#endif while (!signal_usr2 && !signal_term) { // Renew Cycle @@ -348,7 +354,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; } @@ -359,35 +365,31 @@ int main(_unused int argc, char* const argv[]) break; // Other signal type // Send renew as T1 expired - size_t ia_pd_len, ia_na_len; - odhcp6c_get_state(STATE_IA_PD, &ia_pd_len); - odhcp6c_get_state(STATE_IA_NA, &ia_na_len); - - // If we have any IAs, send renew, otherwise request - if (ia_pd_len == 0 && ia_na_len == 0) - res = dhcpv6_request(DHCPV6_MSG_REQUEST); - else - res = dhcpv6_request(DHCPV6_MSG_RENEW); - + res = dhcpv6_request(DHCPV6_MSG_RENEW); odhcp6c_signal_process(); if (res > 0) { // Renew was succesfull // Publish updates - script_call("updated"); + script_call("updated", 0, false); continue; // Renew was successful } odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding + odhcp6c_clear_state(STATE_SERVER_ADDR); + + size_t ia_pd_len, ia_na_len; + odhcp6c_get_state(STATE_IA_PD, &ia_pd_len); + odhcp6c_get_state(STATE_IA_NA, &ia_na_len); + + if (ia_pd_len == 0 && ia_na_len == 0) + break; // If we have IAs, try rebind otherwise restart res = dhcpv6_request(DHCPV6_MSG_REBIND); odhcp6c_signal_process(); if (res > 0) - script_call("rebound"); + script_call("rebound", 0, true); else { -#ifdef EXT_BFD_PING - bfd_stop(); -#endif break; } } @@ -397,6 +399,8 @@ int main(_unused int argc, char* const argv[]) break; } + odhcp6c_expire(); + size_t ia_pd_len, ia_na_len, server_id_len; odhcp6c_get_state(STATE_IA_PD, &ia_pd_len); odhcp6c_get_state(STATE_IA_NA, &ia_na_len); @@ -404,7 +408,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 +417,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; } @@ -427,11 +431,9 @@ static int usage(void) " -N Mode for requesting addresses [try|force|none]\n" " -P Request IPv6-Prefix (0 = auto)\n" " -F Force IPv6-Prefix\n" - " -V Set vendor-class option. string length must be a multiple of 2\n" -#ifdef EXT_BFD_PING - " -B Enable BFD ping check\n" -#endif - " -c Override client-ID (base-16 encoded)\n" + " -V Set vendor-class option (base-16 encoded)\n" + " -u Set user-class option string\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" @@ -440,13 +442,14 @@ static int usage(void) " -f Don't send Client FQDN option\n" " -k Don't send a RELEASE when stopping\n" " -t Maximum timeout for DHCPv6-SOLICIT (120)\n" + " -m Minimum time between accepting updates (30)\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" + " -v Increase logging verbosity\n" " -h Show this help\n\n"; - write(STDERR_FILENO, buf, sizeof(buf)); + fputs(buf, stderr); return 1; } @@ -456,7 +459,7 @@ uint64_t odhcp6c_get_milli_time(void) { struct timespec t = {0, 0}; syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &t); - return t.tv_sec * 1000 + t.tv_nsec / 1000000; + return ((uint64_t)t.tv_sec) * 1000 + ((uint64_t)t.tv_nsec) / 1000000; } @@ -484,17 +487,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 - else if (ra_updated && !bound && allow_slaac_only > 0) - script_delay_call("ra-updated", allow_slaac_only); - -#ifdef EXT_BFD_PING - bfd_receive(); -#endif + 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; @@ -514,11 +516,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) { @@ -527,6 +529,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) @@ -560,63 +564,62 @@ 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; + 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 = start; !x && c < &start[len/sizeof(*c)]; ++c) - if (!memcmp(c, new, cmplen)) + for (struct odhcp6c_entry *c = (struct odhcp6c_entry*)start; + (uint8_t*)c < &start[len] && &c->auxtarget[c->auxlen] <= &start[len]; + c = (struct odhcp6c_entry*)(&c->auxtarget[c->auxlen])) + if (!memcmp(c, new, cmplen) && !memcmp(c->auxtarget, new->auxtarget, new->auxlen)) return c; return NULL; } -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); - 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; if (new->valid > 0) { if (x) { - if (new->valid >= x->valid && new->valid - x->valid < 60 && + if (filterexcess && new->valid >= x->valid && + new->valid != UINT32_MAX && + new->valid - x->valid < min_update_interval && new->preferred >= x->preferred && - new->preferred - x->preferred < 60 && - x->class == new->class) + new->preferred != UINT32_MAX && + 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, sizeof(*new) + new->auxlen); } } else if (x) { - odhcp6c_remove_state(state, (x - start) * sizeof(*x), sizeof(*x)); + odhcp6c_remove_state(state, ((uint8_t*)x) - start, sizeof(*x) + x->auxlen); } return true; } -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; - 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] && &c->auxtarget[c->auxlen] <= &start[len]; + ) { if (c->t1 < elapsed) c->t1 = 0; else if (c->t1 != UINT32_MAX) @@ -637,8 +640,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, sizeof(*c) + c->auxlen); + start = odhcp6c_get_state(state, &len); + } else { + c = (struct odhcp6c_entry*)(&c->auxtarget[c->auxlen]); + } } } @@ -652,6 +659,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); } @@ -663,9 +671,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) @@ -675,9 +683,7 @@ bool odhcp6c_is_bound(void) 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;