Merge pull request #11 from NeoRaider/fixes

A few fixes for race conditions and similar problems

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 5a6fd8303646a8f1902ba9d8ff42c4e8642cef6b..9e3d6c437bf4785e3356490cfd068ae5e8ceb7a1 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -76,19 +76,19 @@ static int dhcpv6_commit_advert(void);
 // RFC 3315 - 5.5 Timeout and Delay values
 static struct dhcpv6_retx dhcpv6_retx[_DHCPV6_MSG_MAX] = {
        [DHCPV6_MSG_UNKNOWN] = {false, 1, 120, 0, "<POLL>",
-                       dhcpv6_handle_reconfigure, NULL},
+                       dhcpv6_handle_reconfigure, NULL},
        [DHCPV6_MSG_SOLICIT] = {true, 1, DHCPV6_SOL_MAX_RT, 0, "SOLICIT",
-                       dhcpv6_handle_advert, dhcpv6_commit_advert},
+                       dhcpv6_handle_advert, dhcpv6_commit_advert},
        [DHCPV6_MSG_REQUEST] = {true, 1, DHCPV6_REQ_MAX_RT, 10, "REQUEST",
-                       dhcpv6_handle_reply, NULL},
+                       dhcpv6_handle_reply, NULL},
        [DHCPV6_MSG_RENEW] = {false, 10, DHCPV6_REN_MAX_RT, 0, "RENEW",
-                       dhcpv6_handle_reply, NULL},
+                       dhcpv6_handle_reply, NULL},
        [DHCPV6_MSG_REBIND] = {false, 10, DHCPV6_REB_MAX_RT, 0, "REBIND",
-                       dhcpv6_handle_rebind_reply, NULL},
+                       dhcpv6_handle_rebind_reply, NULL},
        [DHCPV6_MSG_RELEASE] = {false, 1, 0, 5, "RELEASE", NULL, NULL},
        [DHCPV6_MSG_DECLINE] = {false, 1, 0, 5, "DECLINE", NULL, NULL},
        [DHCPV6_MSG_INFO_REQ] = {true, 1, DHCPV6_INF_MAX_RT, 0, "INFOREQ",
-                       dhcpv6_handle_reply, NULL},
+                       dhcpv6_handle_reply, NULL},
 };
 
 
@@ -688,12 +688,12 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig, const int rc,
                        cand.wants_reconfigure = true;
                } else if (otype == DHCPV6_OPT_SOL_MAX_RT && olen == 4) {
                        uint32_t sol_max_rt = ntohl(*((uint32_t *)odata));
-                       if (sol_max_rt >= DHCPV6_SOL_MAX_RT_MIN && 
+                       if (sol_max_rt >= DHCPV6_SOL_MAX_RT_MIN &&
                                        sol_max_rt <= DHCPV6_SOL_MAX_RT_MAX)
                                cand.sol_max_rt = sol_max_rt;
                } else if (otype == DHCPV6_OPT_INF_MAX_RT && olen == 4) {
                        uint32_t inf_max_rt = ntohl(*((uint32_t *)odata));
-                       if (inf_max_rt >= DHCPV6_INF_MAX_RT_MIN && 
+                       if (inf_max_rt >= DHCPV6_INF_MAX_RT_MIN &&
                                        inf_max_rt <= DHCPV6_INF_MAX_RT_MAX)
                                cand.inf_max_rt = inf_max_rt;
                } else if (otype == DHCPV6_OPT_IA_PD && request_prefix) {
@@ -717,8 +717,8 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig, const int rc,
 
        if ((!have_na && na_mode == IA_MODE_FORCE) ||
                        (!have_pd && pd_mode == IA_MODE_FORCE)) {
-               /* 
-                * RFC7083 states to process the SOL_MAX_RT and 
+               /*
+                * RFC7083 states to process the SOL_MAX_RT and
                 * INF_MAX_RT options even if the DHCPv6 server
                 * did not propose any IA_NA and/or IA_PD
                 */
@@ -899,12 +899,12 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
                                odhcp6c_add_state(STATE_AFTR_NAME, odata, olen);
                } else if (otype == DHCPV6_OPT_SOL_MAX_RT && olen == 4) {
                        uint32_t sol_max_rt = ntohl(*((uint32_t *)odata));
-                       if (sol_max_rt >= DHCPV6_SOL_MAX_RT_MIN && 
+                       if (sol_max_rt >= DHCPV6_SOL_MAX_RT_MIN &&
                                        sol_max_rt <= DHCPV6_SOL_MAX_RT_MAX)
                                dhcpv6_retx[DHCPV6_MSG_SOLICIT].max_timeo = sol_max_rt;
                } else if (otype == DHCPV6_OPT_INF_MAX_RT && olen == 4) {
                        uint32_t inf_max_rt = ntohl(*((uint32_t *)odata));
-                       if (inf_max_rt >= DHCPV6_INF_MAX_RT_MIN && 
+                       if (inf_max_rt >= DHCPV6_INF_MAX_RT_MIN &&
                                        inf_max_rt <= DHCPV6_INF_MAX_RT_MAX)
                                dhcpv6_retx[DHCPV6_MSG_INFO_REQ].max_timeo = inf_max_rt;
                }else if (otype != DHCPV6_OPT_CLIENTID &&
@@ -992,7 +992,7 @@ static int dhcpv6_parse_ia(void *opt, void *end)
                        uint8_t *sdata;
 
 #ifdef EXT_PREFIX_CLASS
-                        // Find prefix class, if any
+                       // Find prefix class, if any
                        dhcpv6_for_each_option(&prefix[1], odata + olen,
                                        stype, slen, sdata)
                                if (stype == DHCPV6_OPT_PREFIX_CLASS && slen == 2)
@@ -1295,7 +1295,7 @@ int dhcpv6_promote_server_cand(void)
 
        dhcpv6_retx[DHCPV6_MSG_SOLICIT].max_timeo = cand->sol_max_rt;
        dhcpv6_retx[DHCPV6_MSG_INFO_REQ].max_timeo = cand->inf_max_rt;
-       
+
        odhcp6c_remove_state(STATE_SERVER_CAND, 0, sizeof(*cand));
 
        return ret;

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index dbba60512c171ef8f5782ecd524d07baacfabc87..e9937ad633f9724495a679a1318ee78120117c7c 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -43,7 +43,11 @@ 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;
@@ -217,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);
@@ -230,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();
 
@@ -240,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;
                        }
@@ -260,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();
@@ -270,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;
@@ -294,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();
@@ -305,9 +310,9 @@ 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
@@ -327,7 +332,7 @@ int main(_unused int argc, char* const argv[])
                                        script_call("updated");
                                        continue; // Renew was successful
                                }
-                               
+
                                odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding
 
                                // If we have IAs, try rebind otherwise restart
@@ -427,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
@@ -444,7 +450,7 @@ bool odhcp6c_signal_process(void)
 #endif
        }
 
-       return do_signal != 0;
+       return signal_usr1 || signal_usr2 || signal_term;
 }
 
 
@@ -470,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);
        }
@@ -624,11 +630,11 @@ 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;
 }

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 85ebf2f11815b25fe08414184bcc085e41fb0f0a..d4458ffd04b3a8f37009df89131a7e114dcd7e84 100644 (file)
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -59,7 +59,7 @@ enum dhcvp6_opt {
        DHCPV6_OPT_SOL_MAX_RT = 82,
        DHCPV6_OPT_INF_MAX_RT = 83,
 #ifdef EXT_PREFIX_CLASS
-        /* draft-bhandari-dhc-class-based-prefix, not yet standardized */
+       /* draft-bhandari-dhc-class-based-prefix, not yet standardized */
        DHCPV6_OPT_PREFIX_CLASS = EXT_PREFIX_CLASS,
 #endif
 };

diff --git a/src/ra.c b/src/ra.c
index 58c87417e2929ca91ee0cd23403462b05d44c2db..d048e85d0419b67205c8203a4e10fff3f4f8da10 100644 (file)
--- a/src/ra.c
+++ b/src/ra.c
@@ -13,6 +13,7 @@
  */
 
 #include <fcntl.h>
+#include <ifaddrs.h>
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
@@ -24,6 +25,7 @@
 #include <net/if.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <netinet/icmp6.h>
 
@@ -214,7 +216,7 @@ static bool ra_icmpv6_valid(struct sockaddr_in6 *source, int hlim, uint8_t *data
        default:
                return false;
        }
-       
+
        icmpv6_for_each_option(opt, opt, end)
                ;
 
@@ -225,23 +227,36 @@ bool ra_process(void)
 {
        bool found = false;
        bool changed = false;
+       bool has_lladdr = !IN6_IS_ADDR_UNSPECIFIED(&lladdr);
        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, 0, 0};
        const struct in6_addr any = IN6ADDR_ANY_INIT;
 
-       if (IN6_IS_ADDR_UNSPECIFIED(&lladdr)) {
+       if (!has_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);
+               struct ifaddrs *ifaddr, *ifa;
+
+               if (getifaddrs(&ifaddr) == 0) {
+                       for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
+                               struct sockaddr_in6 *addr;
+
+                               if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET6)
+                                       continue;
+
+                               addr = (struct sockaddr_in6*)ifa->ifa_addr;
+
+                               if (!IN6_IS_ADDR_LINKLOCAL(&addr->sin6_addr))
+                                       continue;
+
+                               if (!strcmp(ifa->ifa_name, if_name)) {
+                                       lladdr = addr->sin6_addr;
+                                       has_lladdr = true;
                                        break;
                                }
                        }
-                       fclose(fp);
+
+                       freeifaddrs(ifaddr);
                }
        }
 
@@ -255,6 +270,9 @@ bool ra_process(void)
                if (len <= 0)
                        break;
 
+               if (!has_lladdr)
+                       continue;
+
                int hlim = 0;
                for (struct cmsghdr *ch = CMSG_FIRSTHDR(&msg); ch != NULL;
                                ch = CMSG_NXTHDR(&msg, ch))