Ensure signal-safety of signal handlers

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index c76c81316fc8e917099bfbdc6dad70ce24ffbe00..7cdf09e47c25b62f1125c5c81efc17e2b97c6847 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -480,11 +480,8 @@ bool odhcp6c_signal_process(void)
                if (ra_link_up())
                        signal_usr2 = true;
 
-               if (ra_updated && (bound || allow_slaac_only == 0))
+               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);
-
        }
 
        return signal_usr1 || signal_usr2 || signal_term;

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index a4343b19216ec8293388922da74b6eb30da30e3a..f2924b061d9d7719aeced09ab7b8aecf3a0c4d00 100644 (file)
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -325,7 +325,6 @@ int set_rtnetlink_addr(int ifindex, const struct in6_addr *addr,
 int script_init(const char *path, const char *ifname);
 ssize_t script_unhexlify(uint8_t *dst, size_t len, const char *src);
 void script_call(const char *status);
-void script_delay_call(const char *status, int timeout);
 
 bool odhcp6c_signal_process(void);
 uint64_t odhcp6c_get_milli_time(void);

diff --git a/src/ra.c b/src/ra.c
index baaee9bcb6c410d21edf2368a7aeda9989f209f5..9c5eb220897552b629e66df8fb5bb3d7eda2ff6a 100644 (file)
--- a/src/ra.c
+++ b/src/ra.c
@@ -26,7 +26,6 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <netinet/icmp6.h>
 
@@ -56,6 +55,15 @@ static char if_name[IF_NAMESIZE] = {0};
 static volatile int rs_attempt = 0;
 static struct in6_addr lladdr = IN6ADDR_ANY_INIT;
 
+struct {
+       struct icmp6_hdr hdr;
+       struct icmpv6_opt lladdr;
+} rs = {
+       .hdr = {ND_ROUTER_SOLICIT, 0, 0, {{0}}},
+       .lladdr = {ND_OPT_SOURCE_LINKADDR, 1, {0}},
+};
+
+
 static void ra_send_rs(int signal __attribute__((unused)));
 
 int ra_init(const char *ifname, const struct in6_addr *ifid)
@@ -93,6 +101,7 @@ int ra_init(const char *ifname, const struct in6_addr *ifid)
                .ifi = {.ifi_index = if_index}
        };
        send(rtnl, &req, sizeof(req), 0);
+       ra_link_up();
 
        // Filter ICMPv6 package types
        struct icmp6_filter filt;
@@ -133,22 +142,12 @@ int ra_init(const char *ifname, const struct in6_addr *ifid)
 
 static void ra_send_rs(int signal __attribute__((unused)))
 {
-       struct {
-               struct icmp6_hdr hdr;
-               struct icmpv6_opt lladdr;
-       } rs = {
-               .hdr = {ND_ROUTER_SOLICIT, 0, 0, {{0}}},
-               .lladdr = {ND_OPT_SOURCE_LINKADDR, 1, {0}},
-       };
        const struct sockaddr_in6 dest = {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, if_index};
-       size_t len = sizeof(rs);
-
-       struct ifreq ifr;
-       memset(&ifr, 0, sizeof(ifr));
-       strncpy(ifr.ifr_name, if_name, sizeof(ifr.ifr_name));
-       if ((rs_attempt % 2 == 0) && !ioctl(sock, SIOCGIFHWADDR, &ifr)
-                       && memcmp(rs.lladdr.data, ifr.ifr_hwaddr.sa_data, 6))
-               memcpy(rs.lladdr.data, ifr.ifr_hwaddr.sa_data, 6);
+       const struct icmpv6_opt llnull = {ND_OPT_SOURCE_LINKADDR, 1, {0}};
+       size_t len;
+
+       if ((rs_attempt % 2 == 0) && memcmp(&rs.lladdr, &llnull, sizeof(llnull)))
+               len = sizeof(rs);
        else
                len = sizeof(struct icmp6_hdr);
 
@@ -197,6 +196,14 @@ bool ra_link_up(void)
                                resp.msg.ifi_index != if_index)
                        continue;
 
+               ssize_t alen = NLMSG_PAYLOAD(&resp.hdr, sizeof(resp.msg));
+               for (struct rtattr *rta = (struct rtattr*)(resp.pad);
+                               RTA_OK(rta, alen); rta = RTA_NEXT(rta, alen)) {
+                       if (rta->rta_type == IFLA_ADDRESS &&
+                                       RTA_PAYLOAD(rta) >= sizeof(rs.lladdr.data))
+                               memcpy(rs.lladdr.data, RTA_DATA(rta), sizeof(rs.lladdr.data));
+               }
+
                bool hascarrier = resp.msg.ifi_flags & IFF_LOWER_UP;
                if (!firstcall && nocarrier != !hascarrier)
                        ret = true;

diff --git a/src/script.c b/src/script.c
index e389cc933640afe364b379b0ffbef15ee62d91de..644f61f8a697921a2a21da98c1b67ccc045ab4a1 100644 (file)
--- a/src/script.c
+++ b/src/script.c
@@ -41,8 +41,6 @@ static const int8_t hexvals[] = {
 
 
 static char *argv[4] = {NULL, NULL, NULL, NULL};
-static volatile char *delayed_call = NULL;
-static bool dont_delay = false;
 
 
 int script_init(const char *path, const char *ifname)
@@ -332,25 +330,6 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len
 }
 
 
-static void script_call_delayed(int signal __attribute__((unused)))
-{
-       if (delayed_call)
-               script_call((char*)delayed_call);
-}
-
-
-void script_delay_call(const char *status, int timeout)
-{
-       if (dont_delay) {
-               script_call(status);
-       } else if (!delayed_call) {
-               delayed_call = strdup(status);
-               signal(SIGALRM, script_call_delayed);
-               alarm(timeout);
-       }
-}
-
-
 void script_call(const char *status)
 {
        size_t dns_len, search_len, custom_len, sntp_ip_len, ntp_ip_len, ntp_dns_len;
@@ -358,10 +337,6 @@ void script_call(const char *status)
        size_t s46_mapt_len, s46_mape_len, s46_lw_len, passthru_len;
 
        odhcp6c_expire();
-       if (delayed_call) {
-               alarm(0);
-               dont_delay = true;
-       }
 
        struct in6_addr *addr = odhcp6c_get_state(STATE_SERVER_ADDR, &addr_len);
        struct in6_addr *dns = odhcp6c_get_state(STATE_DNS, &dns_len);