allow setting rps/xps defualt values via uci
[project/netifd.git] / system-linux.c
index 8888047..0bf071e 100644 (file)
@@ -81,6 +81,9 @@ static struct nl_sock *sock_rtnl = NULL;
 
 static int cb_rtnl_event(struct nl_msg *msg, void *arg);
 static void handle_hotplug_event(struct uloop_fd *u, unsigned int events);
+static int system_add_proto_tunnel(const char *name, const uint8_t proto,
+                                       const unsigned int link, struct blob_attr **tb);
+static int __system_del_ip_tunnel(const char *name, struct blob_attr **tb);
 
 static char dev_buf[256];
 
@@ -705,7 +708,7 @@ int system_bridge_addif(struct device *bridge, struct device *dev)
                system_bridge_set_wireless(bridge, dev);
 
        if (dev->settings.flags & DEV_OPT_MULTICAST_ROUTER) {
-               snprintf(buf, sizeof(buf), "%i", dev->settings.multicast_router);
+               snprintf(buf, sizeof(buf), "%u", dev->settings.multicast_router);
                system_bridge_set_multicast_router(dev, buf, false);
        }
 
@@ -992,7 +995,7 @@ static void system_bridge_conf_multicast(struct device *bridge,
                bridge->ifname, buf);
 
        if (bridge->settings.flags & DEV_OPT_MULTICAST_ROUTER) {
-               snprintf(buf, buf_len, "%i", bridge->settings.multicast_router);
+               snprintf(buf, buf_len, "%u", bridge->settings.multicast_router);
                system_bridge_set_multicast_router(bridge, buf, true);
        }
 
@@ -1359,7 +1362,7 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
        }
 
        if (!system_get_neigh4locktime(dev, buf, sizeof(buf))) {
-               s->neigh4locktime = strtoul(buf, NULL, 0);
+               s->neigh4locktime = strtol(buf, NULL, 0);
                s->flags |= DEV_OPT_NEIGHLOCKTIME;
        }
 
@@ -1385,7 +1388,7 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
 }
 
 static void
-system_if_set_rps_xps_val(const char *path, int val)
+system_if_set_rps_xps_val(const char *path, char *fmt, int val)
 {
        char val_buf[8];
        glob_t gl;
@@ -1394,7 +1397,7 @@ system_if_set_rps_xps_val(const char *path, int val)
        if (glob(path, 0, NULL, &gl))
                return;
 
-       snprintf(val_buf, sizeof(val_buf), "%x", val);
+       snprintf(val_buf, sizeof(val_buf), fmt, val);
        for (i = 0; i < gl.gl_pathc; i++)
                system_set_sysctl(gl.gl_pathv[i], val_buf);
 
@@ -1405,17 +1408,23 @@ static void
 system_if_apply_rps_xps(struct device *dev, struct device_settings *s)
 {
        long n_cpus = sysconf(_SC_NPROCESSORS_ONLN);
-       int val;
+       int val, rps_val, rps_flow_cnt, xps_val;
 
        if (n_cpus < 2)
                return;
 
        val = (1 << n_cpus) - 1;
+       rps_val = s->rps_val ? s->rps_val : val;
        snprintf(dev_buf, sizeof(dev_buf), "/sys/class/net/%s/queues/*/rps_cpus", dev->ifname);
-       system_if_set_rps_xps_val(dev_buf, s->rps ? val : 0);
+       system_if_set_rps_xps_val(dev_buf, "%x", s->rps ? rps_val : 0);
+
+       rps_flow_cnt = s->rps_flow_cnt ? s->rps_flow_cnt : 0;
+       snprintf(dev_buf, sizeof(dev_buf), "/sys/class/net/%s/queues/*/rps_flow_cnt", dev->ifname);
+       system_if_set_rps_xps_val(dev_buf, "%d", s->rps ? rps_flow_cnt : 0);
 
+       xps_val = s->xps_val ? s->xps_val : val;
        snprintf(dev_buf, sizeof(dev_buf), "/sys/class/net/%s/queues/*/xps_cpus", dev->ifname);
-       system_if_set_rps_xps_val(dev_buf, s->xps ? val : 0);
+       system_if_set_rps_xps_val(dev_buf, "%x", s->xps ? xps_val : 0);
 }
 
 void
@@ -1453,23 +1462,23 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
                        s->flags &= ~DEV_OPT_PROMISC;
        }
        if (s->flags & DEV_OPT_RPFILTER & apply_mask) {
-               snprintf(buf, sizeof(buf), "%d", s->rpfilter);
+               snprintf(buf, sizeof(buf), "%u", s->rpfilter);
                system_set_rpfilter(dev, buf);
        }
        if (s->flags & DEV_OPT_ACCEPTLOCAL & apply_mask)
                system_set_acceptlocal(dev, s->acceptlocal ? "1" : "0");
        if (s->flags & DEV_OPT_IGMPVERSION & apply_mask) {
-               snprintf(buf, sizeof(buf), "%d", s->igmpversion);
+               snprintf(buf, sizeof(buf), "%u", s->igmpversion);
                system_set_igmpversion(dev, buf);
        }
        if (s->flags & DEV_OPT_MLDVERSION & apply_mask) {
-               snprintf(buf, sizeof(buf), "%d", s->mldversion);
+               snprintf(buf, sizeof(buf), "%u", s->mldversion);
                system_set_mldversion(dev, buf);
        }
        if (s->flags & DEV_OPT_NEIGHREACHABLETIME & apply_mask) {
-               snprintf(buf, sizeof(buf), "%d", s->neigh4reachabletime);
+               snprintf(buf, sizeof(buf), "%u", s->neigh4reachabletime);
                system_set_neigh4reachabletime(dev, buf);
-               snprintf(buf, sizeof(buf), "%d", s->neigh6reachabletime);
+               snprintf(buf, sizeof(buf), "%u", s->neigh6reachabletime);
                system_set_neigh6reachabletime(dev, buf);
        }
        if (s->flags & DEV_OPT_NEIGHLOCKTIME & apply_mask) {
@@ -1477,13 +1486,13 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
                system_set_neigh4locktime(dev, buf);
        }
        if (s->flags & DEV_OPT_NEIGHGCSTALETIME & apply_mask) {
-               snprintf(buf, sizeof(buf), "%d", s->neigh4gcstaletime);
+               snprintf(buf, sizeof(buf), "%u", s->neigh4gcstaletime);
                system_set_neigh4gcstaletime(dev, buf);
-               snprintf(buf, sizeof(buf), "%d", s->neigh6gcstaletime);
+               snprintf(buf, sizeof(buf), "%u", s->neigh6gcstaletime);
                system_set_neigh6gcstaletime(dev, buf);
        }
        if (s->flags & DEV_OPT_DADTRANSMITS & apply_mask) {
-               snprintf(buf, sizeof(buf), "%d", s->dadtransmits);
+               snprintf(buf, sizeof(buf), "%u", s->dadtransmits);
                system_set_dadtransmits(dev, buf);
        }
        if (s->flags & DEV_OPT_MULTICAST & apply_mask) {
@@ -1896,7 +1905,8 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
                                rtm.rtm_type == RTN_ANYCAST) {
                        rtm.rtm_scope = RT_SCOPE_LINK;
                } else if (rtm.rtm_type == RTN_BLACKHOLE || rtm.rtm_type == RTN_UNREACHABLE ||
-                               rtm.rtm_type == RTN_PROHIBIT || rtm.rtm_type == RTN_FAILED_POLICY) {
+                               rtm.rtm_type == RTN_PROHIBIT || rtm.rtm_type == RTN_FAILED_POLICY ||
+                               rtm.rtm_type == RTN_THROW) {
                        rtm.rtm_scope = RT_SCOPE_UNIVERSE;
                        dev = NULL;
                }
@@ -1987,8 +1997,8 @@ bool system_resolve_rt_proto(const char *type, unsigned int *id)
        FILE *f;
        char *e, buf[128];
        unsigned int n, proto = 256;
-
-       if ((n = strtoul(type, &e, 0)) >= 0 && !*e && e != type)
+       n = strtoul(type, &e, 0);
+       if (!*e && e != type)
                proto = n;
        else if (!strcmp(type, "unspec"))
                proto = RTPROT_UNSPEC;
@@ -2167,6 +2177,9 @@ static int system_iprule(struct iprule *rule, int cmd)
                        nla_put_u32(msg, FRA_TABLE, rule->lookup);
        }
 
+       if (rule->flags & IPRULE_SUP_PREFIXLEN)
+               nla_put_u32(msg, FRA_SUPPRESS_PREFIXLEN, rule->sup_prefixlen);
+
        if (rule->flags & IPRULE_GOTO)
                nla_put_u32(msg, FRA_GOTO, rule->gotoid);
 
@@ -2256,6 +2269,120 @@ static int tunnel_ioctl(const char *name, int cmd, void *p)
 }
 
 #ifdef IFLA_IPTUN_MAX
+static int system_add_ip6_tunnel(const char *name, const unsigned int link,
+                                struct blob_attr **tb)
+{
+       struct nl_msg *nlm = nlmsg_alloc_simple(RTM_NEWLINK,
+                               NLM_F_REQUEST | NLM_F_REPLACE | NLM_F_CREATE);
+       struct ifinfomsg ifi = { .ifi_family = AF_UNSPEC };
+       struct blob_attr *cur;
+       int ret = 0, ttl = 0;
+
+       if (!nlm)
+               return -1;
+
+       nlmsg_append(nlm, &ifi, sizeof(ifi), 0);
+       nla_put_string(nlm, IFLA_IFNAME, name);
+
+       if (link)
+               nla_put_u32(nlm, IFLA_LINK, link);
+
+       struct nlattr *linkinfo = nla_nest_start(nlm, IFLA_LINKINFO);
+       if (!linkinfo) {
+               ret = -ENOMEM;
+               goto failure;
+       }
+
+       nla_put_string(nlm, IFLA_INFO_KIND, "ip6tnl");
+       struct nlattr *infodata = nla_nest_start(nlm, IFLA_INFO_DATA);
+       if (!infodata) {
+               ret = -ENOMEM;
+               goto failure;
+       }
+
+       if (link)
+               nla_put_u32(nlm, IFLA_IPTUN_LINK, link);
+
+       if ((cur = tb[TUNNEL_ATTR_TTL]))
+               ttl = blobmsg_get_u32(cur);
+
+       nla_put_u8(nlm, IFLA_IPTUN_PROTO, IPPROTO_IPIP);
+       nla_put_u8(nlm, IFLA_IPTUN_TTL, (ttl) ? ttl : 64);
+       nla_put_u8(nlm, IFLA_IPTUN_ENCAP_LIMIT, 4);
+
+       struct in6_addr in6buf;
+       if ((cur = tb[TUNNEL_ATTR_LOCAL])) {
+               if (inet_pton(AF_INET6, blobmsg_data(cur), &in6buf) < 1) {
+                       ret = -EINVAL;
+                       goto failure;
+               }
+               nla_put(nlm, IFLA_IPTUN_LOCAL, sizeof(in6buf), &in6buf);
+       }
+
+       if ((cur = tb[TUNNEL_ATTR_REMOTE])) {
+               if (inet_pton(AF_INET6, blobmsg_data(cur), &in6buf) < 1) {
+                       ret = -EINVAL;
+                       goto failure;
+               }
+               nla_put(nlm, IFLA_IPTUN_REMOTE, sizeof(in6buf), &in6buf);
+       }
+
+#ifdef IFLA_IPTUN_FMR_MAX
+       if ((cur = tb[TUNNEL_ATTR_FMRS])) {
+               struct nlattr *fmrs = nla_nest_start(nlm, IFLA_IPTUN_FMRS);
+
+               struct blob_attr *fmr;
+               unsigned rem, fmrcnt = 0;
+               blobmsg_for_each_attr(fmr, cur, rem) {
+                       if (blobmsg_type(fmr) != BLOBMSG_TYPE_STRING)
+                               continue;
+
+                       unsigned ip4len, ip6len, ealen, offset = 6;
+                       char ip6buf[48];
+                       char ip4buf[16];
+
+                       if (sscanf(blobmsg_get_string(fmr), "%47[^/]/%u,%15[^/]/%u,%u,%u",
+                                       ip6buf, &ip6len, ip4buf, &ip4len, &ealen, &offset) < 5) {
+                               ret = -EINVAL;
+                               goto failure;
+                       }
+
+                       struct in6_addr ip6prefix;
+                       struct in_addr ip4prefix;
+                       if (inet_pton(AF_INET6, ip6buf, &ip6prefix) != 1 ||
+                                       inet_pton(AF_INET, ip4buf, &ip4prefix) != 1) {
+                               ret = -EINVAL;
+                               goto failure;
+                       }
+
+                       struct nlattr *rule = nla_nest_start(nlm, ++fmrcnt);
+
+                       nla_put(nlm, IFLA_IPTUN_FMR_IP6_PREFIX, sizeof(ip6prefix), &ip6prefix);
+                       nla_put(nlm, IFLA_IPTUN_FMR_IP4_PREFIX, sizeof(ip4prefix), &ip4prefix);
+                       nla_put_u8(nlm, IFLA_IPTUN_FMR_IP6_PREFIX_LEN, ip6len);
+                       nla_put_u8(nlm, IFLA_IPTUN_FMR_IP4_PREFIX_LEN, ip4len);
+                       nla_put_u8(nlm, IFLA_IPTUN_FMR_EA_LEN, ealen);
+                       nla_put_u8(nlm, IFLA_IPTUN_FMR_OFFSET, offset);
+
+                       nla_nest_end(nlm, rule);
+               }
+
+               nla_nest_end(nlm, fmrs);
+       }
+#endif
+
+       nla_nest_end(nlm, infodata);
+       nla_nest_end(nlm, linkinfo);
+
+       return system_rtnl_call(nlm);
+
+failure:
+       nlmsg_free(nlm);
+       return ret;
+}
+#endif
+
+#ifdef IFLA_IPTUN_MAX
 #define IP6_FLOWINFO_TCLASS    htonl(0x0FF00000)
 static int system_add_gre_tunnel(const char *name, const char *kind,
                                 const unsigned int link, struct blob_attr **tb, bool v6)
@@ -2316,31 +2443,41 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
                }
        }
 
-       if ((cur = tb[TUNNEL_ATTR_INFO]) && (blobmsg_type(cur) == BLOBMSG_TYPE_STRING)) {
-               uint8_t icsum, ocsum, iseqno, oseqno;
-               if (sscanf(blobmsg_get_string(cur), "%u,%u,%hhu,%hhu,%hhu,%hhu",
-                       &ikey, &okey, &icsum, &ocsum, &iseqno, &oseqno) < 6) {
-                       ret = -EINVAL;
-                       goto failure;
-               }
+       if ((cur = tb[TUNNEL_ATTR_DATA])) {
+               struct blob_attr *tb_data[__GRE_DATA_ATTR_MAX];
+
+               blobmsg_parse(gre_data_attr_list.params, __GRE_DATA_ATTR_MAX, tb_data,
+                       blobmsg_data(cur), blobmsg_len(cur));
 
-               if (ikey)
-                       iflags |= GRE_KEY;
+               if ((cur = tb_data[GRE_DATA_IKEY])) {
+                       if ((ikey = blobmsg_get_u32(cur)))
+                               iflags |= GRE_KEY;
+               }
 
-               if (okey)
-                       oflags |= GRE_KEY;
+               if ((cur = tb_data[GRE_DATA_OKEY])) {
+                       if ((okey = blobmsg_get_u32(cur)))
+                               oflags |= GRE_KEY;
+               }
 
-               if (icsum)
-                       iflags |= GRE_CSUM;
+               if ((cur = tb_data[GRE_DATA_ICSUM])) {
+                       if (blobmsg_get_bool(cur))
+                               iflags |= GRE_CSUM;
+               }
 
-               if (ocsum)
-                       oflags |= GRE_CSUM;
+               if ((cur = tb_data[GRE_DATA_OCSUM])) {
+                       if (blobmsg_get_bool(cur))
+                               oflags |= GRE_CSUM;
+               }
 
-               if (iseqno)
-                       iflags |= GRE_SEQ;
+               if ((cur = tb_data[GRE_DATA_ISEQNO])) {
+                       if (blobmsg_get_bool(cur))
+                               iflags |= GRE_SEQ;
+               }
 
-               if (oseqno)
-                       oflags |= GRE_SEQ;
+               if ((cur = tb[GRE_DATA_OSEQNO])) {
+                       if (blobmsg_get_bool(cur))
+                               oflags |= GRE_SEQ;
+               }
        }
 
        if (v6) {
@@ -2429,10 +2566,10 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
                nla_put_u16(nlm, IFLA_GRE_IFLAGS, iflags);
 
        if (okey)
-               nla_put_u32(nlm, IFLA_GRE_OKEY, okey);
+               nla_put_u32(nlm, IFLA_GRE_OKEY, htonl(okey));
 
        if (ikey)
-               nla_put_u32(nlm, IFLA_GRE_IKEY, ikey);
+               nla_put_u32(nlm, IFLA_GRE_IKEY, htonl(ikey));
 
        nla_nest_end(nlm, infodata);
        nla_nest_end(nlm, linkinfo);
@@ -2452,7 +2589,6 @@ static int system_add_vti_tunnel(const char *name, const char *kind,
        struct nl_msg *nlm;
        struct ifinfomsg ifi = { .ifi_family = AF_UNSPEC, };
        struct blob_attr *cur;
-       uint32_t ikey = 0, okey = 0;
        int ret = 0;
 
        nlm = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_REPLACE | NLM_F_CREATE);
@@ -2478,14 +2614,6 @@ static int system_add_vti_tunnel(const char *name, const char *kind,
        if (link)
                nla_put_u32(nlm, IFLA_VTI_LINK, link);
 
-       if ((cur = tb[TUNNEL_ATTR_INFO]) && (blobmsg_type(cur) == BLOBMSG_TYPE_STRING)) {
-               if (sscanf(blobmsg_get_string(cur), "%u,%u",
-                       &ikey, &okey) < 2) {
-                       ret = -EINVAL;
-                       goto failure;
-               }
-       }
-
        if (v6) {
                struct in6_addr in6buf;
                if ((cur = tb[TUNNEL_ATTR_LOCAL])) {
@@ -2525,11 +2653,23 @@ static int system_add_vti_tunnel(const char *name, const char *kind,
 
        }
 
-       if (okey)
-               nla_put_u32(nlm, IFLA_VTI_OKEY, htonl(okey));
+       if ((cur = tb[TUNNEL_ATTR_DATA])) {
+               struct blob_attr *tb_data[__VTI_DATA_ATTR_MAX];
+               uint32_t ikey = 0, okey = 0;
 
-       if (ikey)
-               nla_put_u32(nlm, IFLA_VTI_IKEY, htonl(ikey));
+               blobmsg_parse(vti_data_attr_list.params, __VTI_DATA_ATTR_MAX, tb_data,
+                       blobmsg_data(cur), blobmsg_len(cur));
+
+               if ((cur = tb_data[VTI_DATA_IKEY])) {
+                       if ((ikey = blobmsg_get_u32(cur)))
+                               nla_put_u32(nlm, IFLA_VTI_IKEY, htonl(ikey));
+               }
+
+               if ((cur = tb_data[VTI_DATA_OKEY])) {
+                       if ((okey = blobmsg_get_u32(cur)))
+                               nla_put_u32(nlm, IFLA_VTI_OKEY, htonl(okey));
+               }
+       }
 
        nla_nest_end(nlm, infodata);
        nla_nest_end(nlm, linkinfo);
@@ -2691,6 +2831,59 @@ failure:
 }
 #endif
 
+static int system_add_sit_tunnel(const char *name, const unsigned int link, struct blob_attr **tb)
+{
+       struct blob_attr *cur;
+       int ret = 0;
+
+       if (system_add_proto_tunnel(name, IPPROTO_IPV6, link, tb) < 0)
+               return -1;
+
+#ifdef SIOCADD6RD
+       if ((cur = tb[TUNNEL_ATTR_DATA])) {
+               struct blob_attr *tb_data[__SIXRD_DATA_ATTR_MAX];
+               unsigned int mask;
+               struct ip_tunnel_6rd p6;
+
+               blobmsg_parse(sixrd_data_attr_list.params, __SIXRD_DATA_ATTR_MAX, tb_data,
+                       blobmsg_data(cur), blobmsg_len(cur));
+
+               memset(&p6, 0, sizeof(p6));
+
+               if ((cur = tb_data[SIXRD_DATA_PREFIX])) {
+                       if (!parse_ip_and_netmask(AF_INET6, blobmsg_data(cur),
+                                               &p6.prefix, &mask) || mask > 128) {
+                               ret = -EINVAL;
+                               goto failure;
+                       }
+
+                       p6.prefixlen = mask;
+               }
+
+               if ((cur = tb_data[SIXRD_DATA_RELAY_PREFIX])) {
+                       if (!parse_ip_and_netmask(AF_INET, blobmsg_data(cur),
+                                               &p6.relay_prefix, &mask) || mask > 32) {
+                               ret = -EINVAL;
+                               goto failure;
+                       }
+
+                       p6.relay_prefixlen = mask;
+               }
+
+               if (tunnel_ioctl(name, SIOCADD6RD, &p6) < 0) {
+                       ret = -1;
+                       goto failure;
+               }
+       }
+#endif
+
+       return ret;
+
+failure:
+       __system_del_ip_tunnel(name, tb);
+       return ret;
+}
+
 static int system_add_proto_tunnel(const char *name, const uint8_t proto, const unsigned int link, struct blob_attr **tb)
 {
        struct blob_attr *cur;
@@ -2839,138 +3032,11 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
                        link = iface->l3_dev.dev->ifindex;
        }
 
-       if (!strcmp(str, "sit")) {
-               if (system_add_proto_tunnel(name, IPPROTO_IPV6, link, tb) < 0)
-                       return -1;
-
-#ifdef SIOCADD6RD
-               if ((cur = tb[TUNNEL_ATTR_6RD_PREFIX])) {
-                       unsigned int mask;
-                       struct ip_tunnel_6rd p6;
-
-                       memset(&p6, 0, sizeof(p6));
-
-                       if (!parse_ip_and_netmask(AF_INET6, blobmsg_data(cur),
-                                               &p6.prefix, &mask) || mask > 128)
-                               return -EINVAL;
-                       p6.prefixlen = mask;
-
-                       if ((cur = tb[TUNNEL_ATTR_6RD_RELAY_PREFIX])) {
-                               if (!parse_ip_and_netmask(AF_INET, blobmsg_data(cur),
-                                                       &p6.relay_prefix, &mask) || mask > 32)
-                                       return -EINVAL;
-                               p6.relay_prefixlen = mask;
-                       }
-
-                       if (tunnel_ioctl(name, SIOCADD6RD, &p6) < 0) {
-                               __system_del_ip_tunnel(name, tb);
-                               return -1;
-                       }
-               }
-#endif
+       if (!strcmp(str, "sit"))
+               return system_add_sit_tunnel(name, link, tb);
 #ifdef IFLA_IPTUN_MAX
-       } else if (!strcmp(str, "ipip6")) {
-               struct nl_msg *nlm = nlmsg_alloc_simple(RTM_NEWLINK,
-                               NLM_F_REQUEST | NLM_F_REPLACE | NLM_F_CREATE);
-               struct ifinfomsg ifi = { .ifi_family = AF_UNSPEC };
-               int ret = 0;
-
-               if (!nlm)
-                       return -1;
-
-               nlmsg_append(nlm, &ifi, sizeof(ifi), 0);
-               nla_put_string(nlm, IFLA_IFNAME, name);
-
-               if (link)
-                       nla_put_u32(nlm, IFLA_LINK, link);
-
-               struct nlattr *linkinfo = nla_nest_start(nlm, IFLA_LINKINFO);
-               if (!linkinfo) {
-                       ret = -ENOMEM;
-                       goto failure;
-               }
-               nla_put_string(nlm, IFLA_INFO_KIND, "ip6tnl");
-               struct nlattr *infodata = nla_nest_start(nlm, IFLA_INFO_DATA);
-               if (!infodata) {
-                       ret = -ENOMEM;
-                       goto failure;
-               }
-
-               if (link)
-                       nla_put_u32(nlm, IFLA_IPTUN_LINK, link);
-
-               nla_put_u8(nlm, IFLA_IPTUN_PROTO, IPPROTO_IPIP);
-               nla_put_u8(nlm, IFLA_IPTUN_TTL, (ttl) ? ttl : 64);
-               nla_put_u8(nlm, IFLA_IPTUN_ENCAP_LIMIT, 4);
-
-               struct in6_addr in6buf;
-               if ((cur = tb[TUNNEL_ATTR_LOCAL])) {
-                       if (inet_pton(AF_INET6, blobmsg_data(cur), &in6buf) < 1) {
-                               ret = -EINVAL;
-                               goto failure;
-                       }
-                       nla_put(nlm, IFLA_IPTUN_LOCAL, sizeof(in6buf), &in6buf);
-               }
-
-               if ((cur = tb[TUNNEL_ATTR_REMOTE])) {
-                       if (inet_pton(AF_INET6, blobmsg_data(cur), &in6buf) < 1) {
-                               ret = -EINVAL;
-                               goto failure;
-                       }
-                       nla_put(nlm, IFLA_IPTUN_REMOTE, sizeof(in6buf), &in6buf);
-               }
-
-#ifdef IFLA_IPTUN_FMR_MAX
-               if ((cur = tb[TUNNEL_ATTR_FMRS])) {
-                       struct nlattr *fmrs = nla_nest_start(nlm, IFLA_IPTUN_FMRS);
-
-                       struct blob_attr *fmr;
-                       unsigned rem, fmrcnt = 0;
-                       blobmsg_for_each_attr(fmr, cur, rem) {
-                               if (blobmsg_type(fmr) != BLOBMSG_TYPE_STRING)
-                                       continue;
-
-                               unsigned ip4len, ip6len, ealen, offset = 6;
-                               char ip6buf[48];
-                               char ip4buf[16];
-
-                               if (sscanf(blobmsg_get_string(fmr), "%47[^/]/%u,%15[^/]/%u,%u,%u",
-                                               ip6buf, &ip6len, ip4buf, &ip4len, &ealen, &offset) < 5) {
-                                       ret = -EINVAL;
-                                       goto failure;
-                               }
-
-                               struct in6_addr ip6prefix;
-                               struct in_addr ip4prefix;
-                               if (inet_pton(AF_INET6, ip6buf, &ip6prefix) != 1 ||
-                                               inet_pton(AF_INET, ip4buf, &ip4prefix) != 1) {
-                                       ret = -EINVAL;
-                                       goto failure;
-                               }
-
-                               struct nlattr *rule = nla_nest_start(nlm, ++fmrcnt);
-
-                               nla_put(nlm, IFLA_IPTUN_FMR_IP6_PREFIX, sizeof(ip6prefix), &ip6prefix);
-                               nla_put(nlm, IFLA_IPTUN_FMR_IP4_PREFIX, sizeof(ip4prefix), &ip4prefix);
-                               nla_put_u8(nlm, IFLA_IPTUN_FMR_IP6_PREFIX_LEN, ip6len);
-                               nla_put_u8(nlm, IFLA_IPTUN_FMR_IP4_PREFIX_LEN, ip4len);
-                               nla_put_u8(nlm, IFLA_IPTUN_FMR_EA_LEN, ealen);
-                               nla_put_u8(nlm, IFLA_IPTUN_FMR_OFFSET, offset);
-
-                               nla_nest_end(nlm, rule);
-                       }
-
-                       nla_nest_end(nlm, fmrs);
-               }
-#endif
-
-               nla_nest_end(nlm, infodata);
-               nla_nest_end(nlm, linkinfo);
-
-               return system_rtnl_call(nlm);
-failure:
-               nlmsg_free(nlm);
-               return ret;
+       else if (!strcmp(str, "ipip6")) {
+               return system_add_ip6_tunnel(name, link, tb);
        } else if (!strcmp(str, "greip")) {
                return system_add_gre_tunnel(name, "gre", link, tb, false);
        } else if (!strcmp(str, "gretapip"))  {