Cancel pending timeouts before freeing hosts

[project/relayd.git] / route.c

diff --git a/route.c b/route.c
index f436691..3be2a97 100644 (file)
--- a/route.c
+++ b/route.c
@@ -20,12 +20,25 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #include "relayd.h"
 
 static struct uloop_fd rtnl_sock;
 static unsigned int rtnl_seq, rtnl_dump_seq;
 
+static void rtnl_flush(void)
+{
+       int fd;
+
+       fd = open("/proc/sys/net/ipv4/route/flush", O_WRONLY);
+       if (fd < 0)
+               return;
+
+       write(fd, "-1", 2);
+       close(fd);
+}
+
 static void rtnl_route_set(struct relayd_host *host, bool add)
 {
        static struct {
@@ -39,24 +52,29 @@ static void rtnl_route_set(struct relayd_host *host, bool add)
                        struct rtattr rta;
                        int ifindex;
                } __packed dev;
-       } __packed req;
-
-       memset(&req, 0, sizeof(req));
-
-       req.nl.nlmsg_len = sizeof(req);
-       req.rt.rtm_family = AF_INET;
-       req.rt.rtm_dst_len = 32;
+       } __packed req = {
+               .nl = {
+                       .nlmsg_len = sizeof(req),
+               },
+               .rt = {
+                       .rtm_family = AF_INET,
+                       .rtm_dst_len = 32,
+                       .rtm_table = RT_TABLE_MAIN,
+               },
+               .dst.rta = {
+                       .rta_type = RTA_DST,
+                       .rta_len = sizeof(req.dst),
+               },
+               .dev.rta = {
+                       .rta_type = RTA_OIF,
+                       .rta_len = sizeof(req.dev),
+               },
+       };
 
-       req.dst.rta.rta_type = RTA_DST;
-       req.dst.rta.rta_len = sizeof(req.dst);
        memcpy(req.dst.ipaddr, host->ipaddr, sizeof(req.dst.ipaddr));
-
-       req.dev.rta.rta_type = RTA_OIF;
-       req.dev.rta.rta_len = sizeof(req.dev);
        req.dev.ifindex = host->rif->sll.sll_ifindex;
 
        req.nl.nlmsg_flags = NLM_F_REQUEST;
-       req.rt.rtm_table = RT_TABLE_MAIN;
        if (add) {
                req.nl.nlmsg_type = RTM_NEWROUTE;
                req.nl.nlmsg_flags |= NLM_F_CREATE | NLM_F_REPLACE;
@@ -70,6 +88,7 @@ static void rtnl_route_set(struct relayd_host *host, bool add)
        }
 
        send(rtnl_sock.fd, &req, sizeof(req), 0);
+       rtnl_flush();
 }
 
 void relayd_add_route(struct relayd_host *host)