system-linux: add functions for adding/removing ip tunnels (currently only sit supported)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index adb2c071432da9fc97a60d4855dc4a021ffb4ce2..2062d3ba3987feb4cd2b1d00009f5b4c02466c38 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ IF(APPLE)
 ENDIF()
 
 SET(SOURCES
-       main.c utils.c
+       main.c utils.c system.c
        interface.c interface-ip.c interface-event.c
        proto.c proto-static.c proto-shell.c
        config.c device.c bridge.c vlan.c ubus.c)

diff --git a/system-dummy.c b/system-dummy.c
index 71dad0e9c244cd7f189ce5ae15c2c5662aef6662..401a1a98746287ac41eadae68ba476d5700b8ccd 100644 (file)
--- a/system-dummy.c
+++ b/system-dummy.c
@@ -206,3 +206,13 @@ time_t system_get_rtime(void)
 
        return 0;
 }
+
+int system_del_ip_tunnel(const char *name)
+{
+       return 0;
+}
+
+int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
+{
+       return 0;
+}

diff --git a/system-linux.c b/system-linux.c
index 4a8c03df4bb5de55dcae9d2412ebeac04457ff7e..0e6ce5ac686570dc15de99b6f6b46c43225d6d4c 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -5,12 +5,19 @@
 #include <sys/stat.h>
 #include <sys/syscall.h>
 
+#include <net/if.h>
+#include <net/if_arp.h>
+
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
 #include <linux/rtnetlink.h>
 #include <linux/sockios.h>
+#include <linux/ip.h>
 #include <linux/if_vlan.h>
 #include <linux/if_bridge.h>
+#include <linux/if_tunnel.h>
 #include <linux/ethtool.h>
-#include <net/if_arp.h>
 
 #include <unistd.h>
 #include <string.h>
@@ -942,3 +949,87 @@ time_t system_get_rtime(void)
 
        return 0;
 }
+
+#ifndef IP_DF
+#define IP_DF       0x4000
+#endif
+
+static void tunnel_parm_init(struct ip_tunnel_parm *p)
+{
+       memset(p, 0, sizeof(*p));
+       p->iph.version = 4;
+       p->iph.ihl = 5;
+       p->iph.frag_off = htons(IP_DF);
+}
+
+static int tunnel_ioctl(const char *name, int cmd, void *p)
+{
+       struct ifreq ifr;
+
+       memset(&ifr, 0, sizeof(ifr));
+       strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
+       ifr.ifr_ifru.ifru_data = p;
+       return ioctl(sock_ioctl, cmd, &ifr);
+}
+
+int system_del_ip_tunnel(const char *name)
+{
+       struct ip_tunnel_parm p;
+
+       tunnel_parm_init(&p);
+       return tunnel_ioctl(name, SIOCDELTUNNEL, &p);
+}
+
+static int parse_ipaddr(struct blob_attr *attr, __be32 *addr)
+{
+       if (!attr)
+               return 1;
+
+       return inet_pton(AF_INET, blobmsg_data(attr), (void *) addr);
+}
+
+
+int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
+{
+       struct blob_attr *tb[__TUNNEL_ATTR_MAX];
+       struct blob_attr *cur;
+       struct ip_tunnel_parm p;
+       const char *base, *str;
+       int cmd = SIOCADDTUNNEL;
+
+       system_del_ip_tunnel(name);
+
+       tunnel_parm_init(&p);
+
+       blobmsg_parse(tunnel_attr_list.params, __TUNNEL_ATTR_MAX, tb,
+               blob_data(attr), blob_len(attr));
+
+       cur = tb[TUNNEL_ATTR_TYPE];
+       if (!cur)
+               return -EINVAL;
+
+       str = blobmsg_data(cur);
+       if (!strcmp(str, "sit")) {
+               p.iph.protocol = IPPROTO_IPV6;
+               base = "sit0";
+       } else
+               return -EINVAL;
+
+       if (!parse_ipaddr(tb[TUNNEL_ATTR_LOCAL], &p.iph.saddr))
+               return -EINVAL;
+
+       if (!parse_ipaddr(tb[TUNNEL_ATTR_REMOTE], &p.iph.daddr))
+               return -EINVAL;
+
+       if ((cur = tb[TUNNEL_ATTR_TTL])) {
+               unsigned int val = blobmsg_get_u32(cur);
+
+               if (val > 255)
+                       return -EINVAL;
+
+               p.iph.ttl = val;
+       }
+
+       strncpy(p.name, name, sizeof(p.name));
+       return tunnel_ioctl(base, cmd, &p);
+}

diff --git a/system.c b/system.c
new file mode 100644 (file)
index 0000000..d85f7eb
--- /dev/null
+++ b/system.c
@@ -0,0 +1,14 @@
+#include "netifd.h"
+#include "system.h"
+
+static const struct blobmsg_policy tunnel_attrs[__TUNNEL_ATTR_MAX] = {
+       [TUNNEL_ATTR_TYPE] = { "mode", BLOBMSG_TYPE_STRING },
+       [TUNNEL_ATTR_LOCAL] = { "local", BLOBMSG_TYPE_STRING },
+       [TUNNEL_ATTR_REMOTE] = { "remote", BLOBMSG_TYPE_STRING },
+       [TUNNEL_ATTR_TTL] = { "ttl", BLOBMSG_TYPE_INT32 },
+};
+
+const struct config_param_list tunnel_attr_list = {
+       .n_params = __TUNNEL_ATTR_MAX,
+       .params = tunnel_attrs,
+};

diff --git a/system.h b/system.h
index 6de6b0875bd8b8a35626caffcb26d9ba457e91e5..05fbcae8c4564df6e4a31cce99075f8480248a7e 100644 (file)
--- a/system.h
+++ b/system.h
@@ -6,6 +6,16 @@
 #include "device.h"
 #include "interface-ip.h"
 
+enum tunnel_param {
+       TUNNEL_ATTR_TYPE,
+       TUNNEL_ATTR_REMOTE,
+       TUNNEL_ATTR_LOCAL,
+       TUNNEL_ATTR_TTL,
+       __TUNNEL_ATTR_MAX
+};
+
+const struct config_param_list tunnel_attr_list;
+
 enum bridge_opt {
        /* stp and forward delay always set */
        BRIDGE_OPT_AGEING_TIME = (1 << 0),
@@ -49,6 +59,9 @@ int system_add_route(struct device *dev, struct device_route *route);
 int system_del_route(struct device *dev, struct device_route *route);
 int system_flush_routes(void);
 
+int system_del_ip_tunnel(const char *name);
+int system_add_ip_tunnel(const char *name, struct blob_attr *attr);
+
 time_t system_get_rtime(void);
 
 #endif