Correctly form the delete route/route6 request.

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 110029a..bab453f 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -14,7 +14,6 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.176 2011/01/20 12:48:40 bodea Exp
 #define SYSLOG_NAMES
 #include <syslog.h>
 #include <malloc.h>
-#include <math.h>
 #include <net/route.h>
 #include <sys/mman.h>
 #include <netdb.h>
@@ -31,7 +30,7 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.176 2011/01/20 12:48:40 bodea Exp
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/wait.h>
-#include <linux/if.h>
+#include <net/if.h>
 #include <stddef.h>
 #include <time.h>
 #include <dlfcn.h>
@@ -445,7 +444,11 @@ static void routeset(sessionidt s, in_addr_t ip, int prefixlen, in_addr_t gw, in
                req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_REPLACE;
        }
        else
+       {
                req.nh.nlmsg_type = RTM_DELROUTE;
+               req.nh.nlmsg_flags = NLM_F_REQUEST;
+       }
+
        req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.rt));
 
        req.rt.rtm_family = AF_INET;
@@ -520,7 +523,11 @@ void route6set(sessionidt s, struct in6_addr ip, int prefixlen, int add)
                req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_REPLACE;
        }
        else
+       {
                req.nh.nlmsg_type = RTM_DELROUTE;
+               req.nh.nlmsg_flags = NLM_F_REQUEST;
+       }
+
        req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.rt));
 
        req.rt.rtm_family = AF_INET6;
@@ -642,7 +649,6 @@ static char *tun_nl_phase_msg[] = {
 // Set up TUN interface
 static void inittun(void)
 {
-       struct ifinfomsg ifinfo;
        struct ifreq ifr;
 
        memset(&ifr, 0, sizeof(ifr));
@@ -666,41 +672,13 @@ static void inittun(void)
        assert(strlen(ifr.ifr_name) < sizeof(config->tundevice) - 1);
        strncpy(config->tundevice, ifr.ifr_name, sizeof(config->tundevice));
 
+       tunidx = if_nametoindex(config->tundevice);
+       if (tunidx == 0)
        {
-               // get the interface index
-               struct {
-                       struct nlmsghdr nh;
-                       struct ifinfomsg ifinfo;
-               } req;
-               char buf[4096];
-               ssize_t len;
-               struct nlmsghdr *resp_nh;
-
-               req.nh.nlmsg_type = RTM_GETLINK;
-               req.nh.nlmsg_flags = NLM_F_REQUEST;
-               req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.ifinfo));
-
-               req.ifinfo.ifi_family = AF_UNSPEC; // as the man says
-
-               netlink_addattr(&req.nh, IFLA_IFNAME, config->tundevice, strlen(config->tundevice)+1);
-
-               if(netlink_send(&req.nh) < 0 || (len = netlink_recv(buf, sizeof(buf))) < 0)
-               {
-                       LOG(0, 0, 0, "Error getting tun ifindex: %s\n", strerror(errno));
-                       exit(1);
-               }
-
-               resp_nh = (struct nlmsghdr *)buf;
-               if (!NLMSG_OK (resp_nh, len))
-               {
-                       LOG(0, 0, 0, "Malformed answer getting tun ifindex %ld\n", len);
-                       exit(1);
-               }
-
-               memcpy(&ifinfo, NLMSG_DATA(resp_nh), sizeof(ifinfo));
-               // got index
-               tunidx = ifinfo.ifi_index;
+               LOG(0, 0, 0, "Can't get tun interface index\n");
+               exit(1);
        }
+
        {
                struct {
                        // interface setting
@@ -712,15 +690,16 @@ static void inittun(void)
                        char rtdata[32]; // 32 should be enough
                } req;
                uint32_t txqlen, mtu;
-               struct in_addr ip;
+               in_addr_t ip;
 
                memset(&req, 0, sizeof(req));
 
-               req.nh.nlmsg_type = RTM_SETLINK;
+               req.nh.nlmsg_type = RTM_NEWLINK;
                req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_MULTI;
                req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.ifmsg.ifinfo));
 
-               req.ifmsg.ifinfo = ifinfo;
+               req.ifmsg.ifinfo.ifi_family = AF_UNSPEC;
+               req.ifmsg.ifinfo.ifi_index = tunidx;
                req.ifmsg.ifinfo.ifi_flags |= IFF_UP; // set interface up
                req.ifmsg.ifinfo.ifi_change = IFF_UP; // only change this flag
 
@@ -737,17 +716,18 @@ static void inittun(void)
                memset(&req, 0, sizeof(req));
 
                req.nh.nlmsg_type = RTM_NEWADDR;
-               req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_MULTI;
+               req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_REPLACE | NLM_F_MULTI;
                req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.ifmsg.ifaddr));
 
                req.ifmsg.ifaddr.ifa_family = AF_INET;
                req.ifmsg.ifaddr.ifa_prefixlen = 32;
-               req.ifmsg.ifaddr.ifa_index = ifinfo.ifi_index;
+               req.ifmsg.ifaddr.ifa_scope = RT_SCOPE_UNIVERSE;
+               req.ifmsg.ifaddr.ifa_index = tunidx;
 
                if (config->bind_address)
-                       ip.s_addr = config->bind_address;
+                       ip = config->bind_address;
                else
-                       ip.s_addr = 0x01010101, // 1.1.1.1
+                       ip = 0x01010101; // 1.1.1.1
                netlink_addattr(&req.nh, IFA_LOCAL, &ip, sizeof(ip));
 
                if (netlink_send(&req.nh) < 0)
@@ -760,13 +740,13 @@ static void inittun(void)
                        memset(&req, 0, sizeof(req));
 
                        req.nh.nlmsg_type = RTM_NEWADDR;
-                       req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_MULTI;
+                       req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_REPLACE | NLM_F_MULTI;
                        req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.ifmsg.ifaddr));
 
                        req.ifmsg.ifaddr.ifa_family = AF_INET6;
                        req.ifmsg.ifaddr.ifa_prefixlen = 64;
                        req.ifmsg.ifaddr.ifa_scope = RT_SCOPE_LINK;
-                       req.ifmsg.ifaddr.ifa_index = ifinfo.ifi_index;
+                       req.ifmsg.ifaddr.ifa_index = tunidx;
 
                        // Link local address is FE80::1
                        memset(&ip6, 0, sizeof(ip6));
@@ -781,13 +761,13 @@ static void inittun(void)
                        memset(&req, 0, sizeof(req));
 
                        req.nh.nlmsg_type = RTM_NEWADDR;
-                       req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_MULTI;
+                       req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_REPLACE | NLM_F_MULTI;
                        req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.ifmsg.ifaddr));
 
                        req.ifmsg.ifaddr.ifa_family = AF_INET6;
                        req.ifmsg.ifaddr.ifa_prefixlen = 64;
                        req.ifmsg.ifaddr.ifa_scope = RT_SCOPE_UNIVERSE;
-                       req.ifmsg.ifaddr.ifa_index = ifinfo.ifi_index;
+                       req.ifmsg.ifaddr.ifa_index = tunidx;
 
                        // Global address is prefix::1
                        ip6 = config->ipv6_prefix;