projects / l2tpns.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make routset()/route6set() use netlink.
[l2tpns.git] / l2tpns.c
diff --git a/l2tpns.c b/l2tpns.c
index 96c6b00..110029a 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -200,6 +200,8 @@ struct Tstats *_statistics = NULL;
 struct Tringbuffer *ringbuffer = NULL;
 #endif
 
 struct Tringbuffer *ringbuffer = NULL;
 #endif
 
+static ssize_t netlink_send(struct nlmsghdr *nh);
+static void netlink_addattr(struct nlmsghdr *nh, int type, const void *data, int alen);
 static void cache_ipmap(in_addr_t ip, sessionidt s);
 static void uncache_ipmap(in_addr_t ip);
 static void cache_ipv6map(struct in6_addr ip, int prefixlen, sessionidt s);
 static void cache_ipmap(in_addr_t ip, sessionidt s);
 static void uncache_ipmap(in_addr_t ip);
 static void cache_ipv6map(struct in6_addr ip, int prefixlen, sessionidt s);
@@ -419,43 +421,61 @@ void random_data(uint8_t *buf, int len)
 // via BGP if enabled, and stuffs it into the
 // 'sessionbyip' cache.
 //
 // via BGP if enabled, and stuffs it into the
 // 'sessionbyip' cache.
 //
-// 'ip' and 'mask' must be in _host_ order.
+// 'ip' must be in _host_ order.
 //
 //
-static void routeset(sessionidt s, in_addr_t ip, in_addr_t mask, in_addr_t gw, int add)
+static void routeset(sessionidt s, in_addr_t ip, int prefixlen, in_addr_t gw, int add)
 {
 {
-       struct rtentry r;
+       struct {
+               struct nlmsghdr nh;
+               struct rtmsg rt;
+               char buf[32];
+       } req;
        int i;
        int i;
+       in_addr_t n_ip;
 
 
-       if (!mask) mask = 0xffffffff;
+       if (!prefixlen) prefixlen = 32;
 
 
-       ip &= mask;             // Force the ip to be the first one in the route.
+       ip &= 0xffffffff << (32 - prefixlen);;  // Force the ip to be the first one in the route.
 
 
-       memset(&r, 0, sizeof(r));
-       r.rt_dev = config->tundevice;
-       r.rt_dst.sa_family = AF_INET;
-       *(uint32_t *) & (((struct sockaddr_in *) &r.rt_dst)->sin_addr.s_addr) = htonl(ip);
-       r.rt_gateway.sa_family = AF_INET;
-       *(uint32_t *) & (((struct sockaddr_in *) &r.rt_gateway)->sin_addr.s_addr) = htonl(gw);
-       r.rt_genmask.sa_family = AF_INET;
-       *(uint32_t *) & (((struct sockaddr_in *) &r.rt_genmask)->sin_addr.s_addr) = htonl(mask);
-       r.rt_flags = (RTF_UP | RTF_STATIC);
+       memset(&req, 0, sizeof(req));
+
+       if (add)
+       {
+               req.nh.nlmsg_type = RTM_NEWROUTE;
+               req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_REPLACE;
+       }
+       else
+               req.nh.nlmsg_type = RTM_DELROUTE;
+       req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.rt));
+
+       req.rt.rtm_family = AF_INET;
+       req.rt.rtm_dst_len = prefixlen;
+       req.rt.rtm_table = RT_TABLE_MAIN;
+       req.rt.rtm_protocol = RTPROT_BOOT; // XXX
+       req.rt.rtm_scope = RT_SCOPE_LINK;
+       req.rt.rtm_type = RTN_UNICAST;
+
+       netlink_addattr(&req.nh, RTA_OIF, &tunidx, sizeof(int));
+       n_ip = htonl(ip);
+       netlink_addattr(&req.nh, RTA_DST, &n_ip, sizeof(n_ip));
        if (gw)
        if (gw)
-               r.rt_flags |= RTF_GATEWAY;
-       else if (mask == 0xffffffff)
-               r.rt_flags |= RTF_HOST;
+       {
+               n_ip = htonl(gw);
+               netlink_addattr(&req.nh, RTA_GATEWAY, &n_ip, sizeof(n_ip));
+       }
 
 
-       LOG(1, s, 0, "Route %s %s/%s%s%s\n", add ? "add" : "del",
-           fmtaddr(htonl(ip), 0), fmtaddr(htonl(mask), 1),
+       LOG(1, s, 0, "Route %s %s/%d%s%s\n", add ? "add" : "del",
+           fmtaddr(htonl(ip), 0), prefixlen,
            gw ? " via" : "", gw ? fmtaddr(htonl(gw), 2) : "");
 
            gw ? " via" : "", gw ? fmtaddr(htonl(gw), 2) : "");
 
-       if (ioctl(ifrfd, add ? SIOCADDRT : SIOCDELRT, (void *) &r) < 0)
-               LOG(0, 0, 0, "routeset() error in ioctl: %s\n", strerror(errno));
+       if (netlink_send(&req.nh) < 0)
+               LOG(0, 0, 0, "routeset() error in sending netlink message: %s\n", strerror(errno));
 
 #ifdef BGP
        if (add)
 
 #ifdef BGP
        if (add)
-               bgp_add_route(htonl(ip), htonl(mask));
+               bgp_add_route(htonl(ip), prefixlen);
        else
        else
-               bgp_del_route(htonl(ip), htonl(mask));
+               bgp_del_route(htonl(ip), prefixlen);
 #endif /* BGP */
 
                // Add/Remove the IPs to the 'sessionbyip' cache.
 #endif /* BGP */
 
                // Add/Remove the IPs to the 'sessionbyip' cache.
@@ -471,38 +491,57 @@ static void routeset(sessionidt s, in_addr_t ip, in_addr_t mask, in_addr_t gw, i
                if (!add)       // Are we deleting a route?
                        s = 0;  // Caching the session as '0' is the same as uncaching.
 
                if (!add)       // Are we deleting a route?
                        s = 0;  // Caching the session as '0' is the same as uncaching.
 
-               for (i = ip; (i&mask) == (ip&mask) ; ++i)
+               for (i = ip; i < ip+(1<<(32-prefixlen)) ; ++i)
                        cache_ipmap(i, s);
        }
 }
 
 void route6set(sessionidt s, struct in6_addr ip, int prefixlen, int add)
 {
                        cache_ipmap(i, s);
        }
 }
 
 void route6set(sessionidt s, struct in6_addr ip, int prefixlen, int add)
 {
-       struct in6_rtmsg rt;
+       struct {
+               struct nlmsghdr nh;
+               struct rtmsg rt;
+               char buf[64];
+       } req;
+       int metric;
        char ipv6addr[INET6_ADDRSTRLEN];
 
        char ipv6addr[INET6_ADDRSTRLEN];
 
-       if (ifr6fd < 0)
+       if (!config->ipv6_prefix.s6_addr[0])
        {
                LOG(0, 0, 0, "Asked to set IPv6 route, but IPv6 not setup.\n");
                return;
        }
 
        {
                LOG(0, 0, 0, "Asked to set IPv6 route, but IPv6 not setup.\n");
                return;
        }
 
-       memset(&rt, 0, sizeof(rt));
+       memset(&req, 0, sizeof(req));
+
+       if (add)
+       {
+               req.nh.nlmsg_type = RTM_NEWROUTE;
+               req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_REPLACE;
+       }
+       else
+               req.nh.nlmsg_type = RTM_DELROUTE;
+       req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.rt));
+
+       req.rt.rtm_family = AF_INET6;
+       req.rt.rtm_dst_len = prefixlen;
+       req.rt.rtm_table = RT_TABLE_MAIN;
+       req.rt.rtm_protocol = RTPROT_BOOT; // XXX
+       req.rt.rtm_scope = RT_SCOPE_LINK;
+       req.rt.rtm_type = RTN_UNICAST;
 
 
-       memcpy(&rt.rtmsg_dst, &ip, sizeof(struct in6_addr));
-       rt.rtmsg_dst_len = prefixlen;
-       rt.rtmsg_metric = 1;
-       rt.rtmsg_flags = RTF_UP;
-       rt.rtmsg_ifindex = tunidx;
+       netlink_addattr(&req.nh, RTA_OIF, &tunidx, sizeof(int));
+       netlink_addattr(&req.nh, RTA_DST, &ip, sizeof(ip));
+       metric = 1;
+       netlink_addattr(&req.nh, RTA_METRICS, &metric, sizeof(metric));
 
        LOG(1, 0, 0, "Route %s %s/%d\n",
            add ? "add" : "del",
            inet_ntop(AF_INET6, &ip, ipv6addr, INET6_ADDRSTRLEN),
            prefixlen);
 
 
        LOG(1, 0, 0, "Route %s %s/%d\n",
            add ? "add" : "del",
            inet_ntop(AF_INET6, &ip, ipv6addr, INET6_ADDRSTRLEN),
            prefixlen);
 
-       if (ioctl(ifr6fd, add ? SIOCADDRT : SIOCDELRT, (void *) &rt) < 0)
-               LOG(0, 0, 0, "route6set() error in ioctl: %s\n",
-                               strerror(errno));
+       if (netlink_send(&req.nh) < 0)
+               LOG(0, 0, 0, "route6set() error in sending netlink message: %s\n", strerror(errno));
 
        // FIXME: need to add BGP routing (RFC2858)
 
 
        // FIXME: need to add BGP routing (RFC2858)
 
@@ -576,6 +615,19 @@ static ssize_t netlink_recv(void *buf, ssize_t len)
        return recvmsg(nlfd, &msg, 0);
 }
 
        return recvmsg(nlfd, &msg, 0);
 }
 
+/* adapted from iproute2 */
+static void netlink_addattr(struct nlmsghdr *nh, int type, const void *data, int alen)
+{
+       int len = RTA_LENGTH(alen);
+       struct rtattr *rta;
+
+       rta = (struct rtattr *)(((void *)nh) + NLMSG_ALIGN(nh->nlmsg_len));
+       rta->rta_type = type;
+       rta->rta_len = len;
+       memcpy(RTA_DATA(rta), data, alen);
+       nh->nlmsg_len = NLMSG_ALIGN(nh->nlmsg_len) + RTA_ALIGN(len);
+}
+
 // messages corresponding to different phases seq number
 static char *tun_nl_phase_msg[] = {
        "initialized",
 // messages corresponding to different phases seq number
 static char *tun_nl_phase_msg[] = {
        "initialized",
@@ -611,16 +663,14 @@ static void inittun(void)
                LOG(0, 0, 0, "Can't set tun interface: %s\n", strerror(errno));
                exit(1);
        }
                LOG(0, 0, 0, "Can't set tun interface: %s\n", strerror(errno));
                exit(1);
        }
-       assert(strlen(ifr.ifr_name) < sizeof(config->tundevice));
-       strncpy(config->tundevice, ifr.ifr_name, sizeof(config->tundevice) - 1);
+       assert(strlen(ifr.ifr_name) < sizeof(config->tundevice) - 1);
+       strncpy(config->tundevice, ifr.ifr_name, sizeof(config->tundevice));
 
        {
                // get the interface index
                struct {
                        struct nlmsghdr nh;
 
        {
                // get the interface index
                struct {
                        struct nlmsghdr nh;
-                       struct ifinfomsg ifinfo __attribute__ ((aligned(NLMSG_ALIGNTO)));
-                       struct rtattr ifname_rta __attribute__ ((aligned(RTA_ALIGNTO)));
-                       char ifname[IFNAMSIZ];
+                       struct ifinfomsg ifinfo;
                } req;
                char buf[4096];
                ssize_t len;
                } req;
                char buf[4096];
                ssize_t len;
@@ -628,15 +678,11 @@ static void inittun(void)
 
                req.nh.nlmsg_type = RTM_GETLINK;
                req.nh.nlmsg_flags = NLM_F_REQUEST;
 
                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
 
 
                req.ifinfo.ifi_family = AF_UNSPEC; // as the man says
 
-               req.ifname_rta.rta_len = RTA_LENGTH(strlen(config->tundevice)+1);
-               req.ifname_rta.rta_type = IFLA_IFNAME;
-               strncpy(req.ifname, config->tundevice, IFNAMSIZ-1);
-
-               req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.ifinfo)
-                               + req.ifname_rta.rta_len);
+               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)
                {
 
                if(netlink_send(&req.nh) < 0 || (len = netlink_recv(buf, sizeof(buf))) < 0)
                {
@@ -662,136 +708,94 @@ static void inittun(void)
                        union {
                                struct ifinfomsg ifinfo;
                                struct ifaddrmsg ifaddr;
                        union {
                                struct ifinfomsg ifinfo;
                                struct ifaddrmsg ifaddr;
-                       } ifmsg __attribute__ ((aligned(NLMSG_ALIGNTO)));
+                       } ifmsg;
                        char rtdata[32]; // 32 should be enough
                } req;
                        char rtdata[32]; // 32 should be enough
                } req;
-               struct {
-                       struct rtattr rta;
-                       uint32_t u32 __attribute__ ((aligned(RTA_ALIGNTO)));;
-               } u32_attr;
-               struct {
-                       struct rtattr rta;
-                       struct in_addr addr __attribute__ ((aligned(RTA_ALIGNTO)));;
-               } ipv4_attr;
-               struct {
-                       struct rtattr rta;
-                       struct in6_addr addr6 __attribute__ ((aligned(RTA_ALIGNTO)));;
-               } ipv6_attr;
-               char *buf_ptr;
+               uint32_t txqlen, mtu;
+               struct in_addr ip;
 
                memset(&req, 0, sizeof(req));
 
                req.nh.nlmsg_type = RTM_SETLINK;
                req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_MULTI;
 
                memset(&req, 0, sizeof(req));
 
                req.nh.nlmsg_type = RTM_SETLINK;
                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_flags |= IFF_UP; // set interface up
                req.ifmsg.ifinfo.ifi_change = IFF_UP; // only change this flag
 
 
                req.ifmsg.ifinfo = ifinfo;
                req.ifmsg.ifinfo.ifi_flags |= IFF_UP; // set interface up
                req.ifmsg.ifinfo.ifi_change = IFF_UP; // only change this flag
 
-               buf_ptr = NLMSG_DATA(&req.nh) + sizeof(req.ifmsg.ifinfo);
-
-               u32_attr.rta.rta_len = RTA_LENGTH(sizeof(u32_attr.u32));
-               u32_attr.rta.rta_type = IFLA_TXQLEN;
                /* Bump up the qlen to deal with bursts from the network */
                /* Bump up the qlen to deal with bursts from the network */
-               u32_attr.u32 = 1000;
-               memcpy(buf_ptr, &u32_attr, sizeof(u32_attr));
-
-               buf_ptr += RTA_ALIGN(u32_attr.rta.rta_len);
-
-               u32_attr.rta.rta_len = RTA_LENGTH(sizeof(u32_attr.u32));
-               u32_attr.rta.rta_type = IFLA_MTU;
+               txqlen = 1000;
+               netlink_addattr(&req.nh, IFLA_TXQLEN, &txqlen, sizeof(txqlen));
                /* set MTU to modem MRU */
                /* set MTU to modem MRU */
-               u32_attr.u32 = MRU;
-               memcpy(buf_ptr, &u32_attr, sizeof(u32_attr));
-
-               req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.ifmsg.ifinfo)
-                               + u32_attr.rta.rta_len * 2);
+               mtu = MRU;
+               netlink_addattr(&req.nh, IFLA_MTU, &mtu, sizeof(mtu));
 
                if (netlink_send(&req.nh) < 0)
 
                if (netlink_send(&req.nh) < 0)
-               {
-                       LOG(0, 0, 0, "Error setting up tun device interface: %s\n", strerror(errno));
-                       exit(1);
-               }
+                       goto senderror;
 
                memset(&req, 0, sizeof(req));
 
                req.nh.nlmsg_type = RTM_NEWADDR;
                req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_MULTI;
 
                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_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_family = AF_INET;
                req.ifmsg.ifaddr.ifa_prefixlen = 32;
                req.ifmsg.ifaddr.ifa_index = ifinfo.ifi_index;
 
-               ipv4_attr.rta.rta_len = RTA_LENGTH(sizeof(ipv4_attr.addr));
-               ipv4_attr.rta.rta_type = IFA_ADDRESS;
-               ipv4_attr.addr.s_addr = config->bind_address ?
-                       config->bind_address : 0x01010101; // 1.1.1.1
-               memcpy(NLMSG_DATA(&req.nh) + sizeof(req.ifmsg.ifaddr), &ipv4_attr, sizeof(ipv4_attr));
-
-               req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.ifmsg.ifaddr)
-                               + ipv4_attr.rta.rta_len);
+               if (config->bind_address)
+                       ip.s_addr = config->bind_address;
+               else
+                       ip.s_addr = 0x01010101, // 1.1.1.1
+               netlink_addattr(&req.nh, IFA_LOCAL, &ip, sizeof(ip));
 
                if (netlink_send(&req.nh) < 0)
 
                if (netlink_send(&req.nh) < 0)
-               {
-                       LOG(0, 0, 0, "Error setting up tun device IPv4 address: %s\n", strerror(errno));
-                       exit(1);
-               }
+                       goto senderror;
 
                // Only setup IPv6 on the tun device if we have a configured prefix
                if (config->ipv6_prefix.s6_addr[0]) {
 
                // Only setup IPv6 on the tun device if we have a configured prefix
                if (config->ipv6_prefix.s6_addr[0]) {
+                       struct in6_addr ip6;
+
                        memset(&req, 0, sizeof(req));
 
                        req.nh.nlmsg_type = RTM_NEWADDR;
                        req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_MULTI;
                        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_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_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;
 
-                       ipv6_attr.rta.rta_len = RTA_LENGTH(sizeof(ipv6_attr.addr6));
-                       ipv6_attr.rta.rta_type = IFA_LOCAL;
                        // Link local address is FE80::1
                        // Link local address is FE80::1
-                       memset(&ipv6_attr.addr6, 0, sizeof(ipv6_attr.addr6));
-                       ipv6_attr.addr6.s6_addr[0] = 0xFE;
-                       ipv6_attr.addr6.s6_addr[1] = 0x80;
-                       ipv6_attr.addr6.s6_addr[15] = 1;
-                       memcpy(NLMSG_DATA(&req.nh) + sizeof(req.ifmsg.ifaddr), &ipv6_attr, sizeof(ipv6_attr));
-
-                       req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.ifmsg.ifaddr)
-                                       + ipv6_attr.rta.rta_len);
+                       memset(&ip6, 0, sizeof(ip6));
+                       ip6.s6_addr[0] = 0xFE;
+                       ip6.s6_addr[1] = 0x80;
+                       ip6.s6_addr[15] = 1;
+                       netlink_addattr(&req.nh, IFA_LOCAL, &ip6, sizeof(ip6));
 
                        if (netlink_send(&req.nh) < 0)
 
                        if (netlink_send(&req.nh) < 0)
-                       {
-                               LOG(0, 0, 0, "Error setting up tun device IPv6 LL address: %s\n", strerror(errno));
-                               exit(1);
-                       }
+                               goto senderror;
 
                        memset(&req, 0, sizeof(req));
 
                        req.nh.nlmsg_type = RTM_NEWADDR;
                        req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_MULTI;
 
                        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_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_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;
 
-                       ipv6_attr.rta.rta_len = RTA_LENGTH(sizeof(ipv6_attr.addr6));
-                       ipv6_attr.rta.rta_type = IFA_LOCAL;
                        // Global address is prefix::1
                        // Global address is prefix::1
-                       ipv6_attr.addr6 = config->ipv6_prefix;
-                       ipv6_attr.addr6.s6_addr[15] = 1;
-                       memcpy(NLMSG_DATA(&req.nh) + sizeof(req.ifmsg.ifaddr), &ipv6_attr, sizeof(ipv6_attr));
-
-                       req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.ifmsg.ifaddr)
-                                       + ipv6_attr.rta.rta_len);
+                       ip6 = config->ipv6_prefix;
+                       ip6.s6_addr[15] = 1;
+                       netlink_addattr(&req.nh, IFA_LOCAL, &ip6, sizeof(ip6));
 
                        if (netlink_send(&req.nh) < 0)
 
                        if (netlink_send(&req.nh) < 0)
-                       {
-                               LOG(0, 0, 0, "Error setting up tun device IPv6 global address: %s\n", strerror(errno));
-                               exit(1);
-                       }
+                               goto senderror;
                }
 
                memset(&req, 0, sizeof(req));
                }
 
                memset(&req, 0, sizeof(req));
@@ -800,10 +804,7 @@ static void inittun(void)
                req.nh.nlmsg_len = NLMSG_LENGTH(0);
 
                if (netlink_send(&req.nh) < 0)
                req.nh.nlmsg_len = NLMSG_LENGTH(0);
 
                if (netlink_send(&req.nh) < 0)
-               {
-                       LOG(0, 0, 0, "Error finishing setting up tun device: %s\n", strerror(errno));
-                       exit(1);
-               }
+                       goto senderror;
 
                // if we get an error for seqnum < min_initok_nlseqnum,
                // we must exit as initialization went wrong
 
                // if we get an error for seqnum < min_initok_nlseqnum,
                // we must exit as initialization went wrong
@@ -812,6 +813,12 @@ static void inittun(void)
                else
                        min_initok_nlseqnum = 3 + 1; // idx + if + addr
        }
                else
                        min_initok_nlseqnum = 3 + 1; // idx + if + addr
        }
+
+       return;
+
+senderror:
+       LOG(0, 0, 0, "Error while setting up tun device: %s\n", strerror(errno));
+       exit(1);
 }
 
 // set up UDP ports
 }
 
 // set up UDP ports
@@ -1957,11 +1964,11 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
                int routed = 0;
                for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
                {
                int routed = 0;
                for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
                {
-                       if ((session[s].ip & session[s].route[r].mask) ==
-                           (session[s].route[r].ip & session[s].route[r].mask))
+                       if ((session[s].ip >> (32-session[s].route[r].prefixlen)) ==
+                           (session[s].route[r].ip >> (32-session[s].route[r].prefixlen)))
                                routed++;
 
                                routed++;
 
-                       if (del_routes) routeset(s, session[s].route[r].ip, session[s].route[r].mask, 0, 0);
+                       if (del_routes) routeset(s, session[s].route[r].ip, session[s].route[r].prefixlen, 0, 0);
                        session[s].route[r].ip = 0;
                }
 
                        session[s].route[r].ip = 0;
                }
 
@@ -4473,18 +4480,18 @@ static void fix_address_pool(int sid)
 //
 // Add a block of addresses to the IP pool to hand out.
 //
 //
 // Add a block of addresses to the IP pool to hand out.
 //
-static void add_to_ip_pool(in_addr_t addr, in_addr_t mask)
+static void add_to_ip_pool(in_addr_t addr, int prefixlen)
 {
        int i;
 {
        int i;
-       if (mask == 0)
-               mask = 0xffffffff;      // Host route only.
+       if (prefixlen == 0)
+               prefixlen = 32;         // Host route only.
 
 
-       addr &= mask;
+       addr &= 0xffffffff << (32 - prefixlen);
 
        if (ip_pool_size >= MAXIPPOOL)  // Pool is full!
                return ;
 
 
        if (ip_pool_size >= MAXIPPOOL)  // Pool is full!
                return ;
 
-       for (i = addr ;(i & mask) == addr; ++i)
+       for (i = addr ; i < addr+(1<<(32-prefixlen)); ++i)
        {
                if ((i & 0xff) == 0 || (i&0xff) == 255)
                        continue;       // Skip 0 and broadcast addresses.
        {
                if ((i & 0xff) == 0 || (i&0xff) == 255)
                        continue;       // Skip 0 and broadcast addresses.
@@ -4542,7 +4549,7 @@ static void initippool()
                {
                        // It's a range
                        int numbits = 0;
                {
                        // It's a range
                        int numbits = 0;
-                       in_addr_t start = 0, mask = 0;
+                       in_addr_t start = 0;
 
                        LOG(2, 0, 0, "Adding IP address range %s\n", buf);
                        *p++ = 0;
 
                        LOG(2, 0, 0, "Adding IP address range %s\n", buf);
                        *p++ = 0;
@@ -4552,15 +4559,14 @@ static void initippool()
                                continue;
                        }
                        start = ntohl(inet_addr(pool));
                                continue;
                        }
                        start = ntohl(inet_addr(pool));
-                       mask = (in_addr_t) (pow(2, numbits) - 1) << (32 - numbits);
 
                        // Add a static route for this pool
 
                        // Add a static route for this pool
-                       LOG(5, 0, 0, "Adding route for address pool %s/%u\n",
-                               fmtaddr(htonl(start), 0), 32 + mask);
+                       LOG(5, 0, 0, "Adding route for address pool %s/%d\n",
+                               fmtaddr(htonl(start), 0), numbits);
 
 
-                       routeset(0, start, mask, 0, 1);
+                       routeset(0, start, numbits, 0, 1);
 
 
-                       add_to_ip_pool(start, mask);
+                       add_to_ip_pool(start, numbits);
                }
                else
                {
                }
                else
                {
@@ -5209,11 +5215,11 @@ int sessionsetup(sessionidt s, tunnelidt t)
                // Add the route for this session.
                for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
                {
                // Add the route for this session.
                for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
                {
-                       if ((session[s].ip & session[s].route[r].mask) ==
-                           (session[s].route[r].ip & session[s].route[r].mask))
+                       if ((session[s].ip >> (32-session[s].route[r].prefixlen)) ==
+                           (session[s].route[r].ip >> (32-session[s].route[r].prefixlen)))
                                routed++;
 
                                routed++;
 
-                       routeset(s, session[s].route[r].ip, session[s].route[r].mask, 0, 1);
+                       routeset(s, session[s].route[r].ip, session[s].route[r].prefixlen, 0, 1);
                }
 
                // Static IPs need to be routed if not already
                }
 
                // Static IPs need to be routed if not already
@@ -5284,7 +5290,7 @@ int load_session(sessionidt s, sessiont *new)
 
        for (i = 0; !newip && i < MAXROUTE && (session[s].route[i].ip || new->route[i].ip); i++)
                if (new->route[i].ip != session[s].route[i].ip ||
 
        for (i = 0; !newip && i < MAXROUTE && (session[s].route[i].ip || new->route[i].ip); i++)
                if (new->route[i].ip != session[s].route[i].ip ||
-                   new->route[i].mask != session[s].route[i].mask)
+                   new->route[i].prefixlen != session[s].route[i].prefixlen)
                        newip++;
 
        // needs update
                        newip++;
 
        // needs update
@@ -5295,11 +5301,11 @@ int load_session(sessionidt s, sessiont *new)
                // remove old routes...
                for (i = 0; i < MAXROUTE && session[s].route[i].ip; i++)
                {
                // remove old routes...
                for (i = 0; i < MAXROUTE && session[s].route[i].ip; i++)
                {
-                       if ((session[s].ip & session[s].route[i].mask) ==
-                           (session[s].route[i].ip & session[s].route[i].mask))
+                       if ((session[s].ip >> (32-session[s].route[i].prefixlen)) ==
+                           (session[s].route[i].ip >> (32-session[s].route[i].prefixlen)))
                                routed++;
 
                                routed++;
 
-                       routeset(s, session[s].route[i].ip, session[s].route[i].mask, 0, 0);
+                       routeset(s, session[s].route[i].ip, session[s].route[i].prefixlen, 0, 0);
                }
 
                // ...ip
                }
 
                // ...ip
@@ -5318,11 +5324,11 @@ int load_session(sessionidt s, sessiont *new)
                // add new routes...
                for (i = 0; i < MAXROUTE && new->route[i].ip; i++)
                {
                // add new routes...
                for (i = 0; i < MAXROUTE && new->route[i].ip; i++)
                {
-                       if ((new->ip & new->route[i].mask) ==
-                           (new->route[i].ip & new->route[i].mask))
+                       if ((new->ip >> (32-new->route[i].prefixlen)) ==
+                           (new->route[i].ip >> (32-new->route[i].prefixlen)))
                                routed++;
 
                                routed++;
 
-                       routeset(s, new->route[i].ip, new->route[i].mask, 0, 1);
+                       routeset(s, new->route[i].ip, new->route[i].prefixlen, 0, 1);
                }
 
                // ...ip
                }
 
                // ...ip
for cloning use: "git clone git://git.sameswireless.fr/l2tpns.git" ; For add to your sources.list: "deb http://package.sameswifi.fr/ jessie main"