handle SIGHUP

Makefile

@@ -1,4 +1,4 @@
-VERSION = 0.1.0-beta.1
+VERSION = 0.1.0-beta.2
 CFLAGS = -Os $(and $(LUA_ROOT),-I$(LUA_ROOT)) $(MYCFLAGS)
 LDFLAGS = $(and $(LUA_ROOT),-L$(LUA_ROOT)) -llua -lm $(MYLDFLAGS)
 

src/options.c

@@ -203,5 +203,7 @@ int supRA_read_option(const char *path) {
     intvl->interval = htonl(val);
   }
 
+  // done
+  lua_close(L);
   return rc;
 }

src/ra.c

@@ -15,6 +15,7 @@ static uint8_t
   *ra_msg_buflim = NULL;
 
 void init_ra_msg_buf(size_t bufsize) {
+  free(ra_msg_buf); // free previous
   ra_msg_ptr = ra_msg_buf = malloc(bufsize);
   ra_msg_buflim = ra_msg_buf+bufsize;
 

src/supRA.c

@@ -15,8 +15,7 @@
 #include <sys/epoll.h>
 #include <sys/ioctl.h>
 #include <netinet/icmp6.h>
-#include <lua.h>
-#include <lauxlib.h>
+#include <signal.h>
 #include "icmpv6.h"
 #include "ra.h"
 #include "options.h"
@@ -39,6 +38,8 @@ static void init_ra_msg(int if_mtu, uint8_t if_macaddr[6]) {
   mtu->mtu = htonl(if_mtu);
 }
 
+static void empty_handler(int sig) {}
+
 #define PERROR_EXIT(msg) {perror(msg); exit(errno);}
 int main(int argc, char *argv[]) {
   if (argc <= 2) {
@@ -46,28 +47,28 @@ int main(int argc, char *argv[]) {
     return 1;
   }
 
+  signal(SIGHUP, empty_handler);
+  while (1) {
     const char *ifname = argv[1];
     int ifid = if_nametoindex(ifname);
     if (ifid == 0) PERROR_EXIT("Bad Interface");
 
     /** get link info (man netdevice) **/
-  int if_mtu;
-  uint8_t if_macaddr[6];
     struct ifreq ifr;
     strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
     int iofd = socket(AF_INET6, SOCK_DGRAM, 0);
     if (iofd < 0) PERROR_EXIT("Fail to create socket");
     // macaddr
+    uint8_t if_macaddr[6];
     if (ioctl(iofd, SIOCGIFHWADDR, &ifr)) PERROR_EXIT("Fail to ioctl(HWADDR)");
     memcpy(if_macaddr, &ifr.ifr_hwaddr.sa_data, sizeof(if_macaddr));
     // mtu
-  if (if_mtu <= 0) {
     if (ioctl(iofd, SIOCGIFMTU, &ifr)) PERROR_EXIT("Fail to ioctl(MTU)");
-    if_mtu = ifr.ifr_mtu;
-  }
+    int if_mtu = ifr.ifr_mtu;
     // clean
     close(iofd);
 
+    /* open icmpv6 socket */
     int sfd = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
     if (sfd < 0) PERROR_EXIT("Fail to create socket");
 
@@ -125,26 +126,35 @@ int main(int argc, char *argv[]) {
       if (now >= tnext) { // advertise right now
         send_ra(sfd, (struct sockaddr*)&bcaddr, bcaddrlen);
         tnext = now + 200 + 400*rand()/RAND_MAX; // TODO
-      puts("to ff02::1");
       }
 
+      // wait for message or timeout
       int evc = epoll_wait(epfd, evs, evcnt, tnext-now);
-    if (evc < 0) PERROR_EXIT("Fail to epoll_wait");
-    while (evc--) {
-      uint32_t fd = evs[evc].data.fd;
-      uint8_t buf[4096];
-      char caddr_p[INET6_ADDRSTRLEN];
+      if (evc < 0) {
+        // interrupt => reload settings
+        if (errno == EINTR) break;
+        // other error
+        PERROR_EXIT("Fail to epoll_wait");
+      }
+
+      // received message
+      if (evc) {
         struct sockaddr_in6 caddr;
         socklen_t caddrlen = sizeof(caddr);
-      ssize_t buflen = recvfrom(sfd, buf, sizeof(buf), 0, (struct sockaddr*)&caddr, &caddrlen);
-      if (buflen < 0) PERROR_EXIT("Fail to recvfrom()");
-      if (buflen < sizeof(struct icmpv6_head)) continue; // bad message
-      // if (caddr.sin6_scope_id != ifid) continue;
-      inet_ntop(AF_INET6, &caddr.sin6_addr, caddr_p, sizeof(caddr_p));
-      // struct icmpv6_head *h = (struct icmpv6_head*)buf;
+        struct icmpv6_head msg;
+        ssize_t msglen = recvfrom(sfd, &msg, sizeof msg, 0, (struct sockaddr*)&caddr, &caddrlen);
+        if (msglen < 0) PERROR_EXIT("Fail to recvfrom()");
+        // only response to RS
+        if (msglen == sizeof msg && msg.type == ICMPV6_RS) {
           send_ra(sfd, (struct sockaddr*)&caddr, caddrlen);
-      printf("to %s%%%d\n", caddr_p, caddr.sin6_scope_id);
         }
       }
+    }
+
+    // clean up
+    close(sfd);
+    close(epfd);
+    puts("Reloading...");
+  }
   return 0;
 }