dhcpv6: server unicast option support
[project/odhcp6c.git] / src / odhcp6c.c
index 506239d2205824b7ae70fc050f0f44f1843737b1..2fe41e5160158ed8501863e23a130a640b285034 100644 (file)
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2012-2014 Steven Barth <steven@midlink.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License v2 as published by
@@ -14,6 +14,7 @@
 
 #include <time.h>
 #include <errno.h>
+#include <ctype.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <syslog.h>
 #include <signal.h>
 #include <string.h>
+#include <strings.h>
 #include <stdbool.h>
 
 #include <net/if.h>
-#include <sys/wait.h>
 #include <sys/syscall.h>
 #include <arpa/inet.h>
+#include <linux/if_addr.h>
 
 #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);
 
 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 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[])
 {
@@ -54,15 +70,22 @@ 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_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 = 120;
+       int sol_timeout = DHCPV6_SOL_MAX_RT;
+       int verbosity = 0;
+
 
        bool help = false, daemonize = false;
        int logopt = LOG_PID;
-       int c, request_pd = 0;
-       while ((c = getopt(argc, argv, "S::N:P:Fc:i:r:s:kt:hedp:")) != -1) {
+       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:Lhedp:fav")) != -1) {
                switch (c) {
                case 'S':
                        allow_slaac_only = (optarg) ? atoi(optarg) : -1;
@@ -81,15 +104,42 @@ int main(_unused int argc, char* const argv[])
                        }
                        break;
 
+               case 'V':
+                       l = script_unhexlify(buf, sizeof(buf), optarg);
+                       if (!l)
+                               help=true;
+
+                       odhcp6c_add_state(STATE_VENDORCLASS, buf, l);
+
+                       break;
                case 'P':
+                       if (ia_pd_mode == IA_MODE_NONE)
+                               ia_pd_mode = IA_MODE_TRY;
+
                        if (allow_slaac_only >= 0 && allow_slaac_only < 10)
                                allow_slaac_only = 10;
 
-                       request_pd = strtoul(optarg, NULL, 10);
-                       if (request_pd == 0)
-                               request_pd = -1;
+                       char *iaid_begin;
+                       int iaid_len = 0;
+
+                       int prefix_length = strtoul(optarg, &iaid_begin, 10);
+
+                       if (*iaid_begin != '\0' && *iaid_begin != ',' && *iaid_begin != ':') {
+                               syslog(LOG_ERR, "invalid argument: '%s'", optarg);
+                               return 1;
+                       }
+
+                       struct odhcp6c_request_prefix prefix = { 0, prefix_length };
+
+                       if (*iaid_begin == ',' && (iaid_len = strlen(iaid_begin)) > 1)
+                               memcpy(&prefix.iaid, iaid_begin + 1, iaid_len > 4 ? 4 : iaid_len);
+                       else if (*iaid_begin == ':')
+                               prefix.iaid = htonl((uint32_t)strtoul(&iaid_begin[1], NULL, 16));
+                       else
+                               prefix.iaid = htonl(++ia_pd_iaid_index);
+
+                       odhcp6c_add_state(STATE_IA_PD_INIT, &prefix, sizeof(prefix));
 
-                       ia_pd_mode = IA_MODE_TRY;
                        break;
 
                case 'F':
@@ -127,6 +177,16 @@ int main(_unused int argc, char* const argv[])
                        }
                        break;
 
+               case 'R':
+                       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;
@@ -139,6 +199,14 @@ int main(_unused int argc, char* const argv[])
                        sol_timeout = atoi(optarg);
                        break;
 
+               case 'm':
+                       min_update_interval = atoi(optarg);
+                       break;
+
+               case 'L':
+                       ra_options &= ~RA_RDNSS_DEFAULT_LIFETIME;
+                       break;
+
                case 'e':
                        logopt |= LOG_PERROR;
                        break;
@@ -151,14 +219,32 @@ int main(_unused int argc, char* const argv[])
                        pidfile = optarg;
                        break;
 
+               case 'f':
+                       client_options &= ~DHCPV6_CLIENT_FQDN;
+                       break;
+
+               case 'a':
+                       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);
-       const char *ifname = argv[optind];
+       if (!verbosity)
+               setlogmask(LOG_UPTO(LOG_WARNING));
+
+       ifname = argv[optind];
 
        if (help || !ifname)
                return usage();
@@ -166,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, request_pd, sol_timeout) ||
-                       ra_init(ifname, &ifid) || script_init(script, ifname)) {
+                       init_dhcpv6(ifname, client_options, sol_timeout) ||
+                       ra_init(ifname, &ifid, ra_options) ||
+                       script_init(script, ifname)) {
                syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
                return 3;
        }
@@ -186,132 +272,149 @@ 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 (do_signal != SIGTERM) { // Main logic
+       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);
-               odhcp6c_clear_state(STATE_SNTP_FQDN);
+               odhcp6c_clear_state(STATE_NTP_IP);
+               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;
 
-               // Server candidates need deep-delete
-               size_t cand_len;
-               struct dhcpv6_server_cand *cand = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len);
-               for (size_t i = 0; i < cand_len / sizeof(*cand); ++i) {
-                       free(cand[i].ia_na);
-                       free(cand[i].ia_pd);
-               }
-               odhcp6c_clear_state(STATE_SERVER_CAND);
-
                syslog(LOG_NOTICE, "(re)starting transaction on %s", ifname);
 
-               do_signal = 0;
-               int res = dhcpv6_request(DHCPV6_MSG_SOLICIT);
+               signal_usr1 = signal_usr2 = false;
+               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 (res <= 0) {
-                       continue; // Might happen if we got a signal
-               } else if (res == DHCPV6_STATELESS) { // Stateless mode
-                       while (do_signal == 0 || do_signal == SIGUSR1) {
-                               do_signal = 0;
+               if (mode < 0)
+                       continue;
+
+               do {
+                       int res = dhcpv6_request(mode == DHCPV6_STATELESS ?
+                                       DHCPV6_MSG_INFO_REQ : DHCPV6_MSG_REQUEST);
+                       bool signalled = odhcp6c_signal_process();
+
+                       if (res > 0)
+                               break;
+                       else if (signalled) {
+                               mode = -1;
+                               break;
+                       }
+
+                       mode = dhcpv6_promote_server_cand();
+               } while (mode > DHCPV6_UNKNOWN);
+
+               if (mode < 0)
+                       continue;
+
+               switch (mode) {
+               case DHCPV6_STATELESS:
+                       bound = true;
+                       syslog(LOG_NOTICE, "entering stateless-mode on %s", ifname);
+
+                       while (!signal_usr2 && !signal_term) {
+                               signal_usr1 = false;
+                               script_call("informed", script_sync_delay, true);
+
+                               int res = dhcpv6_poll_reconfigure();
+                               odhcp6c_signal_process();
+
+                               if (res > 0)
+                                       continue;
+
+                               if (signal_usr1) {
+                                       signal_usr1 = false; // Acknowledged
+                                       continue;
+                               }
+                               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;
-                               else if (res > 0)
-                                       script_call("informed");
-
-                               bound = true;
-                               syslog(LOG_NOTICE, "entering stateless-mode on %s", ifname);
-
-                               if (dhcpv6_poll_reconfigure() > 0)
-                                       script_call("informed");
                        }
+                       break;
 
-                       continue;
-               }
+               case DHCPV6_STATEFUL:
+                       bound = true;
+                       script_call("bound", script_sync_delay, true);
+                       syslog(LOG_NOTICE, "entering stateful-mode on %s", ifname);
 
-               // Stateful mode
-               if (dhcpv6_request(DHCPV6_MSG_REQUEST) <= 0)
-                       continue;
+                       while (!signal_usr2 && !signal_term) {
+                               // Renew Cycle
+                               // Wait for T1 to expire or until we get a reconfigure
+                               int res = dhcpv6_poll_reconfigure();
+                               odhcp6c_signal_process();
+                               if (res > 0) {
+                                       script_call("updated", 0, false);
+                                       continue;
+                               }
 
-               odhcp6c_signal_process();
-               script_call("bound");
-               bound = true;
-               syslog(LOG_NOTICE, "entering stateful-mode on %s", ifname);
-
-               while (do_signal == 0 || do_signal == SIGUSR1) {
-                       // Renew Cycle
-                       // Wait for T1 to expire or until we get a reconfigure
-                       int res = dhcpv6_poll_reconfigure();
-                       odhcp6c_signal_process();
-                       if (res > 0) {
-                               script_call("updated");
-                               continue;
-                       }
+                               // Handle signal, if necessary
+                               if (signal_usr1)
+                                       signal_usr1 = false; // Acknowledged
+                               if (signal_usr2 || signal_term)
+                                       break; // Other signal type
 
-                       // Handle signal, if necessary
-                       if (do_signal == SIGUSR1)
-                               do_signal = 0; // Acknowledged
-                       else if (do_signal > 0)
-                               break; // Other signal type
+                               // Send renew as T1 expired
+                               res = dhcpv6_request(DHCPV6_MSG_RENEW);
+                               odhcp6c_signal_process();
+                               if (res > 0) { // Renew was succesfull
+                                       // Publish updates
+                                       script_call("updated", 0, false);
+                                       continue; // Renew was successful
+                               }
 
-                       size_t ia_pd_len, ia_na_len, ia_pd_new, ia_na_new;
-                       odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
-                       odhcp6c_get_state(STATE_IA_NA, &ia_na_len);
+                               odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding
+                               odhcp6c_clear_state(STATE_SERVER_ADDR);
 
-                       // If we have any IAs, send renew, otherwise request
-                       int r;
-                       if (ia_pd_len == 0 && ia_na_len == 0)
-                               r = dhcpv6_request(DHCPV6_MSG_REQUEST);
-                       else
-                               r = dhcpv6_request(DHCPV6_MSG_RENEW);
-                       odhcp6c_signal_process();
-                       if (r > 0) { // Renew was succesfull
-                               // Publish updates
-                               script_call("updated");
-                               continue; // Renew was successful
-                       }
+                               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;
 
-                       odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding
+                               // If we have IAs, try rebind otherwise restart
+                               res = dhcpv6_request(DHCPV6_MSG_REBIND);
+                               odhcp6c_signal_process();
 
-                       // If we have IAs, try rebind otherwise restart
-                       res = dhcpv6_request(DHCPV6_MSG_REBIND);
-                       odhcp6c_signal_process();
+                               if (res > 0)
+                                       script_call("rebound", 0, true);
+                               else {
+                                       break;
+                               }
+                       }
+                       break;
 
-                       odhcp6c_get_state(STATE_IA_PD, &ia_pd_new);
-                       odhcp6c_get_state(STATE_IA_NA, &ia_na_new);
-                       if (res <= 0 || (ia_pd_new == 0 && ia_pd_len) ||
-                                       (ia_na_new == 0 && ia_na_len))
-                               break; // We lost all our IAs, restart
-                       else if (res > 0)
-                               script_call("rebound");
+               default:
+                       break;
                }
 
+               odhcp6c_expire();
 
                size_t ia_pd_len, ia_na_len, server_id_len;
                odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
@@ -320,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);
@@ -329,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;
 }
 
@@ -343,19 +446,26 @@ static int usage(void)
        "       -N <mode>       Mode for requesting addresses [try|force|none]\n"
        "       -P <length>     Request IPv6-Prefix (0 = auto)\n"
        "       -F              Force IPv6-Prefix\n"
-       "       -c <clientid>   Override client-ID (base-16 encoded)\n"
+       "       -V <class>      Set vendor-class option (base-16 encoded)\n"
+       "       -u <user-class> Set user-class option string\n"
+       "       -c <clientid>   Override client-ID (base-16 encoded 16-bit type + value)\n"
        "       -i <iface-id>   Use a custom interface identifier for RA handling\n"
        "       -r <options>    Options to be requested (comma-separated)\n"
+       "       -R              Do not request any options except those specified with -r\n"
        "       -s <script>     Status update script (/usr/sbin/odhcp6c-update)\n"
+       "       -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 <seconds>    Maximum timeout for DHCPv6-SOLICIT (120)\n"
+       "       -m <seconds>    Minimum time between accepting updates (30)\n"
+       "       -L              Ignore default lifetime for RDNSS records\n"
        "\nInvocation options:\n"
-       "       -p <pidfile>    Set pidfile (/var/run/6relayd.pid)\n"
+       "       -p <pidfile>    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;
 }
 
@@ -365,7 +475,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;
 }
 
 
@@ -388,17 +498,24 @@ 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_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);
+               if (ra_link_up()) {
+                       signal_usr2 = true;
+                       ra = false;
+               }
+
+               if (ra_updated && (bound || allow_slaac_only >= 0)) {
+                       script_call("ra-updated", (!ra && !bound) ?
+                                       script_sync_delay : script_accu_delay, false);
+                       ra = true;
+               }
        }
 
-       return do_signal != 0;
+       return signal_usr1 || signal_usr2 || signal_term;
 }
 
 
@@ -415,6 +532,22 @@ void odhcp6c_add_state(enum odhcp6c_state state, const void *data, size_t len)
                memcpy(n, data, 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 -1;
+
+       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);
+       }
+
+       return 0;
+}
 
 size_t odhcp6c_remove_state(enum odhcp6c_state state, size_t offset, size_t len)
 {
@@ -447,62 +580,64 @@ 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;
 }
 
 
-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, 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;
 }
 
 
-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] &&
+                       (uint8_t*)odhcp6c_next_entry(c) <= &start[len];
+                       ) {
                if (c->t1 < elapsed)
                        c->t1 = 0;
                else if (c->t1 != UINT32_MAX)
@@ -523,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);
+               }
        }
 }
 
@@ -538,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);
 }
@@ -549,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)
@@ -559,16 +699,65 @@ 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;
+       if (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;
 }