Remove all acknoledgement stuff. Still doesn't work.
[l2tpns.git] / l2tpns.c
index af19f9a..3d53622 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -40,6 +40,7 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.176 2011/01/20 12:48:40 bodea Exp
 #include <sys/sysinfo.h>
 #include <libcli.h>
 #include <linux/netlink.h>
+#include <linux/rtnetlink.h>
 
 #include "md5.h"
 #include "l2tpns.h"
@@ -65,8 +66,6 @@ int clifd = -1;                       // Socket listening for CLI connections.
 int daefd = -1;                        // Socket listening for DAE connections.
 int snoopfd = -1;              // UDP file handle for sending out intercept data
 int *radfds = NULL;            // RADIUS requests file handles
-int ifrfd = -1;                        // File descriptor for routing, etc
-int ifr6fd = -1;               // File descriptor for IPv6 routing, etc
 int rand_fd = -1;              // Random data source
 int cluster_sockfd = -1;       // Intra-cluster communications socket.
 int epollfd = -1;              // event polling
@@ -525,17 +524,19 @@ static void initnetlink(void)
 
        nlfd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
        if (nlfd < 0)
-               return; // don't use netlink
+       {
+               LOG(0, 0, 0, "Can't create netlink socket: %s\n", strerror(errno));
+               exit(1);
+       }
 
        memset(&nladdr, 0, sizeof(nladdr));
        nladdr.nl_family = AF_NETLINK;
        nladdr.nl_pid = getpid();
 
-       if (bind(fd, (struct sockaddr *)&nladdr, sizeof(nladdr)) < 0)
+       if (bind(nlfd, (struct sockaddr *)&nladdr, sizeof(nladdr)) < 0)
        {
-               close(fd);
-               fd = -1;
-               return; // don't use netlink
+               LOG(0, 0, 0, "Can't bind netlink socket: %s\n", strerror(errno));
+               exit(1);
        }
 }
 
@@ -544,67 +545,43 @@ static ssize_t netlink_send(struct nlmsghdr *nh)
        struct sockaddr_nl nladdr;
        struct iovec iov;
        struct msghdr msg;
-       ssize_t len;
-       char buf[4096];
-       struct nlmsghdr *ack_nh;
 
        nh->nlmsg_pid = getpid();
        nh->nlmsg_seq = ++nlseqnum;
-       nh->nlmsg_flags |= NLM_F_ACK;
 
-       iov = { (void *)nh, nh->msg_len };
        // set kernel address
-       memset(nladdr, 0, sizeof(nladdr));
+       memset(&nladdr, 0, sizeof(nladdr));
        nladdr.nl_family = AF_NETLINK;
-       msg = { (void *)&nladdr, sizeof(nladdr), &iov, 1, NULL, 0, 0 };
 
-       if ((len = sendmsg(nlfd, &msg, 0)) < 0)
-               return len; // return error code
+       iov = (struct iovec){ (void *)nh, nh->nlmsg_len };
+       msg = (struct msghdr){ (void *)&nladdr, sizeof(nladdr), &iov, 1, NULL, 0, 0 };
 
-       // expect ack
-       iov = { buf, sizeof(buf) };
-       msg = { (void *)&nladdr, sizeof(nladdr), &iov, 1, NULL, 0, 0 };
-       if ((len = recvmsg(nlfd, &msg, 0)) < 0)
-               return len; // return error code
+       return sendmsg(nlfd, &msg, 0);
+}
 
-       for (ack_nh = (struct nlmsghdr *)buf; NLMSG_OK (ack_nh, len);
-                       ack_nh = NLMSG_NEXT (ack_nh, len))
-       {
-               if (ack_nh->nlmsg_type == NLMSG_DONE)
-                       return 1; // didn't get the ack
+static ssize_t netlink_recv(char *buf, ssize_t len)
+{
+       struct sockaddr_nl nladdr;
+       struct iovec iov;
+       struct msghdr msg;
 
-               if (ack_nh->nlmsg_type == NLMSG_ERROR)
-               {
-                       struct nlmsgerr *errmsg = NLMSG_DATA(ack_nh);
-                       if (errmsg->error)
-                               return errmsg->error; // got an error back
-                       if (errmsg->msg.nlmsg_seq == nh->nlmsg_seq)
-                               return 0; // ack received
-                       else
-                               return 2; // wrong seq number?!
-               }
-               // unknown message
-               LOG(3, 0, 0, "Got an unknown netlink message: type %d\n", ack_nh->nlmsg_type);
-       }
+       // set kernel address
+       memset(&nladdr, 0, sizeof(nladdr));
+       nladdr.nl_family = AF_NETLINK;
 
-       return 3; // no end message?!
-}
+       iov = (struct iovec){ buf, len };
+       msg = (struct msghdr){ (void *)&nladdr, sizeof(nladdr), &iov, 1, NULL, 0, 0 };
 
-// defined in linux/ipv6.h, but tricky to include from user-space
-// TODO: move routing to use netlink rather than ioctl
-struct in6_ifreq {
-       struct in6_addr ifr6_addr;
-       __u32 ifr6_prefixlen;
-       unsigned int ifr6_ifindex;
-};
+       return recvmsg(nlfd, &msg, 0);
+}
 
 //
 // Set up TUN interface
 static void inittun(void)
 {
+       struct ifinfomsg ifinfo;
        struct ifreq ifr;
-       struct in6_ifreq ifr6;
-       struct sockaddr_in sin = {0};
+
        memset(&ifr, 0, sizeof(ifr));
        ifr.ifr_flags = IFF_TUN;
 
@@ -625,79 +602,196 @@ static void inittun(void)
        }
        assert(strlen(ifr.ifr_name) < sizeof(config->tundevice));
        strncpy(config->tundevice, ifr.ifr_name, sizeof(config->tundevice) - 1);
+
        {
-               struct nlmsghdr nlh;
+               // 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];
+               } 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.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);
+
+               if(netlink_send(&req.nh) < 0 || (len = netlink_recv(buf, sizeof(buf))) < 0)
                {
-                       LOG(0, 0, 0, "Error setting up tun device: %s", strerror(errno));
+                       LOG(0, 0, 0, "Error getting tun ifindex: %s\n", strerror(errno));
                        exit(1);
                }
-       }
-       ifrfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
 
-       sin.sin_family = AF_INET;
-       sin.sin_addr.s_addr = config->bind_address ? config->bind_address : 0x01010101; // 1.1.1.1
-       memcpy(&ifr.ifr_addr, &sin, sizeof(struct sockaddr));
+               resp_nh = (struct nlmsghdr *)buf;
+               if (!NLMSG_OK (resp_nh, len))
+               {
+                       LOG(0, 0, 0, "Malformed answer getting tun ifindex %d\n", len);
+                       exit(1);
+               }
 
-       if (ioctl(ifrfd, SIOCSIFADDR, (void *) &ifr) < 0)
-       {
-               LOG(0, 0, 0, "Error setting tun address: %s\n", strerror(errno));
-               exit(1);
-       }
-       /* Bump up the qlen to deal with bursts from the network */
-       ifr.ifr_qlen = 1000;
-       if (ioctl(ifrfd, SIOCSIFTXQLEN, (void *) &ifr) < 0)
-       {
-               LOG(0, 0, 0, "Error setting tun queue length: %s\n", strerror(errno));
-               exit(1);
-       }
-       /* set MTU to modem MRU */
-       ifr.ifr_mtu = MRU;
-       if (ioctl(ifrfd, SIOCSIFMTU, (void *) &ifr) < 0)
-       {
-               LOG(0, 0, 0, "Error setting tun MTU: %s\n", strerror(errno));
-               exit(1);
-       }
-       ifr.ifr_flags = IFF_UP;
-       if (ioctl(ifrfd, SIOCSIFFLAGS, (void *) &ifr) < 0)
-       {
-               LOG(0, 0, 0, "Error setting tun flags: %s\n", strerror(errno));
-               exit(1);
-       }
-       if (ioctl(ifrfd, SIOCGIFINDEX, (void *) &ifr) < 0)
-       {
-               LOG(0, 0, 0, "Error getting tun ifindex: %s\n", strerror(errno));
-               exit(1);
-       }
-       tunidx = ifr.ifr_ifindex;
+               memcpy(&ifinfo, NLMSG_DATA(resp_nh), sizeof(ifinfo));
+               // got index
+               tunidx = ifinfo.ifi_index;
+       }
+       {
+               struct {
+                       // interface setting
+                       struct nlmsghdr nh;
+                       union {
+                               struct ifinfomsg ifinfo;
+                               struct ifaddrmsg ifaddr;
+                       } ifmsg __attribute__ ((aligned(NLMSG_ALIGNTO)));
+                       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;
+
+               memset(&req, 0, sizeof(req));
+
+               req.nh.nlmsg_type = RTM_SETLINK;
+               req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_MULTI;
+
+               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 */
+               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;
+               /* 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);
+
+               if (netlink_send(&req.nh) < 0)
+               {
+                       LOG(0, 0, 0, "Error setting up tun device interface: %s\n", strerror(errno));
+                       exit(1);
+               }
 
-       // Only setup IPv6 on the tun device if we have a configured prefix
-       if (config->ipv6_prefix.s6_addr[0]) {
-               ifr6fd = socket(PF_INET6, SOCK_DGRAM, 0);
+               memset(&req, 0, sizeof(req));
 
-               // Link local address is FE80::1
-               memset(&ifr6.ifr6_addr, 0, sizeof(ifr6.ifr6_addr));
-               ifr6.ifr6_addr.s6_addr[0] = 0xFE;
-               ifr6.ifr6_addr.s6_addr[1] = 0x80;
-               ifr6.ifr6_addr.s6_addr[15] = 1;
-               ifr6.ifr6_prefixlen = 64;
-               ifr6.ifr6_ifindex = ifr.ifr_ifindex;
-               if (ioctl(ifr6fd, SIOCSIFADDR, (void *) &ifr6) < 0)
+               req.nh.nlmsg_type = RTM_NEWADDR;
+               req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_MULTI;
+
+               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 (netlink_send(&req.nh) < 0)
                {
-                       LOG(0, 0, 0, "Error setting tun IPv6 link local address:"
-                               " %s\n", strerror(errno));
+                       LOG(0, 0, 0, "Error setting up tun device IPv4 address: %s\n", strerror(errno));
+                       exit(1);
                }
 
-               // Global address is prefix::1
-               memset(&ifr6.ifr6_addr, 0, sizeof(ifr6.ifr6_addr));
-               ifr6.ifr6_addr = config->ipv6_prefix;
-               ifr6.ifr6_addr.s6_addr[15] = 1;
-               ifr6.ifr6_prefixlen = 64;
-               ifr6.ifr6_ifindex = ifr.ifr_ifindex;
-               if (ioctl(ifr6fd, SIOCSIFADDR, (void *) &ifr6) < 0)
+               // Only setup IPv6 on the tun device if we have a configured prefix
+               if (config->ipv6_prefix.s6_addr[0]) {
+                       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.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
+                       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);
+
+                       if (netlink_send(&req.nh) < 0)
+                       {
+                               LOG(0, 0, 0, "Error setting up tun device IPv6 LL address: %s\n", strerror(errno));
+                               exit(1);
+                       }
+
+                       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.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
+                       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);
+
+                       if (netlink_send(&req.nh) < 0)
+                       {
+                               LOG(0, 0, 0, "Error setting up tun device IPv6 global address: %s\n", strerror(errno));
+                               exit(1);
+                       }
+               }
+
+               memset(&req, 0, sizeof(req));
+
+               req.nh.nlmsg_type = NLMSG_DONE;
+               req.nh.nlmsg_len = NLMSG_LENGTH(0);
+
+               if (netlink_send(&req.nh) < 0)
                {
-                       LOG(0, 0, 0, "Error setting tun IPv6 global address: %s\n",
-                               strerror(errno));
+                       LOG(0, 0, 0, "Error finishing setting up tun device: %s\n", strerror(errno));
+                       exit(1);
                }
        }
 }
@@ -4614,6 +4708,8 @@ int main(int argc, char *argv[])
                }
        }
 
+       initnetlink();
+
        /* Set up the cluster communications port. */
        if (cluster_init() < 0)
                exit(1);