X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fodhcp6c.c;h=e9937ad633f9724495a679a1318ee78120117c7c;hb=8152153cb9c5b09862bf0c8a0d1005fa8dfdf262;hp=c8d40f63b84641d85abbb0bec40d096c68e94c0e;hpb=3d85fddacbbb0eebd33997382997af442b408b04;p=odhcp6c.git diff --git a/src/odhcp6c.c b/src/odhcp6c.c index c8d40f6..e9937ad 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -14,7 +14,6 @@ #include #include -#include #include #include #include @@ -23,14 +22,12 @@ #include #include #include -#include #include #include #include #include #include -#include #include "odhcp6c.h" #include "ra.h" @@ -39,11 +36,6 @@ #include "bfd.h" #endif -#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); @@ -51,11 +43,15 @@ static int usage(void); static uint8_t *state_data[_STATE_MAX] = {NULL}; static size_t state_len[_STATE_MAX] = {0}; -static volatile int do_signal = 0; +static volatile bool signal_io = false; +static volatile bool signal_usr1 = false; +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 time_t last_update = 0; -static char *ifname = NULL; + int main(_unused int argc, char* const argv[]) { @@ -69,7 +65,7 @@ int main(_unused int argc, char* const argv[]) enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY; enum odhcp6c_ia_mode ia_pd_mode = IA_MODE_TRY; static struct in6_addr ifid = IN6ADDR_ANY_INIT; - int sol_timeout = 120; + int sol_timeout = DHCPV6_SOL_MAX_RT; #ifdef EXT_BFD_PING int bfd_interval = 0, bfd_loss = 3; @@ -179,7 +175,7 @@ int main(_unused int argc, char* const argv[]) } openlog("odhcp6c", logopt, LOG_DAEMON); - ifname = argv[optind]; + const char *ifname = argv[optind]; if (help || !ifname) return usage(); @@ -225,7 +221,7 @@ int main(_unused int argc, char* const argv[]) script_call("started"); - while (do_signal != SIGTERM) { // Main logic + while (!signal_term) { // Main logic odhcp6c_clear_state(STATE_SERVER_ID); odhcp6c_clear_state(STATE_IA_NA); odhcp6c_clear_state(STATE_IA_PD); @@ -238,7 +234,7 @@ int main(_unused int argc, char* const argv[]) syslog(LOG_NOTICE, "(re)starting transaction on %s", ifname); - do_signal = 0; + signal_usr1 = signal_usr2 = false; int mode = dhcpv6_request(DHCPV6_MSG_SOLICIT); odhcp6c_signal_process(); @@ -248,11 +244,11 @@ int main(_unused int argc, char* const argv[]) do { int res = dhcpv6_request(mode == DHCPV6_STATELESS ? DHCPV6_MSG_INFO_REQ : DHCPV6_MSG_REQUEST); + bool signalled = odhcp6c_signal_process(); - odhcp6c_signal_process(); if (res > 0) break; - else if (do_signal > 0) { + else if (signalled) { mode = -1; break; } @@ -268,9 +264,9 @@ int main(_unused int argc, char* const argv[]) bound = true; syslog(LOG_NOTICE, "entering stateless-mode on %s", ifname); - while (do_signal == 0 || do_signal == SIGUSR1) { - do_signal = 0; - script_call("informed"); + while (!signal_usr2 && !signal_term) { + signal_usr1 = false; + script_call("informed"); int res = dhcpv6_poll_reconfigure(); odhcp6c_signal_process(); @@ -278,15 +274,16 @@ int main(_unused int argc, char* const argv[]) if (res > 0) continue; - if (do_signal == SIGUSR1) { - do_signal = 0; // Acknowledged + if (signal_usr1) { + signal_usr1 = false; // Acknowledged continue; - } else if (do_signal > 0) + } + if (signal_usr2 || signal_term) break; res = dhcpv6_request(DHCPV6_MSG_INFO_REQ); odhcp6c_signal_process(); - if (do_signal == SIGUSR1) + if (signal_usr1) continue; else if (res < 0) break; @@ -302,7 +299,7 @@ int main(_unused int argc, char* const argv[]) bfd_start(ifname, bfd_loss, bfd_interval); #endif - while (do_signal == 0 || do_signal == SIGUSR1) { + while (!signal_usr2 && !signal_term) { // Renew Cycle // Wait for T1 to expire or until we get a reconfigure int res = dhcpv6_poll_reconfigure(); @@ -313,20 +310,29 @@ int main(_unused int argc, char* const argv[]) } // Handle signal, if necessary - if (do_signal == SIGUSR1) - do_signal = 0; // Acknowledged - else if (do_signal > 0) + if (signal_usr1) + signal_usr1 = false; // Acknowledged + if (signal_usr2 || signal_term) 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 - res = dhcpv6_request(DHCPV6_MSG_RENEW); + if (ia_pd_len == 0 && ia_na_len == 0) + res = dhcpv6_request(DHCPV6_MSG_REQUEST); + else + res = dhcpv6_request(DHCPV6_MSG_RENEW); + odhcp6c_signal_process(); if (res > 0) { // Renew was succesfull // Publish updates script_call("updated"); continue; // Renew was successful } - + odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding // If we have IAs, try rebind otherwise restart @@ -426,12 +432,13 @@ static uint8_t* odhcp6c_resize_state(enum odhcp6c_state state, ssize_t len) bool odhcp6c_signal_process(void) { - if (do_signal == SIGIO) { - do_signal = 0; + while (signal_io) { + signal_io = false; + bool ra_updated = ra_process(); if (ra_link_up()) - do_signal = SIGUSR2; + signal_usr2 = true; if (ra_updated && (bound || allow_slaac_only == 0)) script_call("ra-updated"); // Immediate process urgent events @@ -443,7 +450,7 @@ bool odhcp6c_signal_process(void) #endif } - return do_signal != 0; + return signal_usr1 || signal_usr2 || signal_term; } @@ -469,7 +476,7 @@ void odhcp6c_insert_state(enum odhcp6c_state state, size_t offset, const void *d uint8_t *n = odhcp6c_resize_state(state, len); if (n) { uint8_t *sdata = state_data[state]; - + memmove(sdata + offset + len, sdata + offset, len_after); memcpy(sdata + offset, data, len); } @@ -613,74 +620,21 @@ void odhcp6c_random(void *buf, size_t len) read(urandom_fd, buf, len); } - 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) - do_signal = SIGUSR1; + signal_usr1 = true; else if (signal == SIGUSR2) - do_signal = SIGUSR2; + signal_usr2 = true; else if (signal == SIGIO) - do_signal = SIGIO; + signal_io = true; else - do_signal = SIGTERM; + signal_term = true; }