X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=2a108e2e4ef6ad2426a1021a69dc7cf7ffc9ccf1;hp=e45fc6978f5da0eedf21f6ab3ac4d1571ea835d4;hb=HEAD;hpb=94bfecc312f8bcecb857d6b070d1c22869226ce4

diff --git a/system-linux.c b/system-linux.c
index e45fc69..2a108e2 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
  * Copyright (C) 2013 Steven Barth <steven@midlink.org>
  * Copyright (C) 2014 Gioacchino Mazzurco <gio@eigenlab.org>
+ * Copyright (C) 2017 Matthias Schiffer <mschiffer@universe-factory.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
@@ -25,11 +26,13 @@
 #include <net/if_arp.h>
 
 #include <arpa/inet.h>
+#include <netinet/ether.h>
 #include <netinet/in.h>
 
 #include <linux/rtnetlink.h>
 #include <linux/sockios.h>
 #include <linux/ip.h>
+#include <linux/if_addr.h>
 #include <linux/if_link.h>
 #include <linux/if_vlan.h>
 #include <linux/if_bridge.h>
@@ -37,12 +40,21 @@
 #include <linux/ip6_tunnel.h>
 #include <linux/ethtool.h>
 #include <linux/fib_rules.h>
+#include <linux/veth.h>
 #include <linux/version.h>
 
 #ifndef RTN_FAILED_POLICY
 #define RTN_FAILED_POLICY 12
 #endif
 
+#ifndef IFA_F_NOPREFIXROUTE
+#define IFA_F_NOPREFIXROUTE 0x200
+#endif
+
+#ifndef IFA_FLAGS
+#define IFA_FLAGS (IFA_MULTICAST + 1)
+#endif
+
 #include <string.h>
 #include <fcntl.h>
 #include <glob.h>
@@ -69,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];
 
@@ -130,7 +145,7 @@ create_socket(int protocol, int groups)
 
 static bool
 create_raw_event_socket(struct event_socket *ev, int protocol, int groups,
-                        uloop_fd_handler cb, int flags)
+			uloop_fd_handler cb, int flags)
 {
 	ev->sock = create_socket(protocol, groups);
 	if (!ev->sock)
@@ -234,7 +249,7 @@ int system_init(void)
 		return -1;
 
 	if (!create_raw_event_socket(&hotplug_event, NETLINK_KOBJECT_UEVENT, 1,
-	                             handle_hotplug_event, 0))
+					handle_hotplug_event, 0))
 		return -1;
 
 	// Receive network link events form kernel
@@ -296,6 +311,112 @@ static void system_set_neigh6reachabletime(struct device *dev, const char *val)
 	system_set_dev_sysctl("/proc/sys/net/ipv6/neigh/%s/base_reachable_time_ms", dev->ifname, val);
 }
 
+static void system_set_neigh4gcstaletime(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/proc/sys/net/ipv4/neigh/%s/gc_stale_time", dev->ifname, val);
+}
+
+static void system_set_neigh6gcstaletime(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/proc/sys/net/ipv6/neigh/%s/gc_stale_time", dev->ifname, val);
+}
+
+static void system_set_neigh4locktime(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/proc/sys/net/ipv4/neigh/%s/locktime", dev->ifname, val);
+}
+
+static void system_set_dadtransmits(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/proc/sys/net/ipv6/conf/%s/dad_transmits", dev->ifname, val);
+}
+
+static void system_bridge_set_multicast_to_unicast(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/sys/class/net/%s/brport/multicast_to_unicast", dev->ifname, val);
+}
+
+static void system_bridge_set_multicast_fast_leave(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/sys/class/net/%s/brport/multicast_fast_leave", dev->ifname, val);
+}
+
+static void system_bridge_set_hairpin_mode(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/sys/class/net/%s/brport/hairpin_mode", dev->ifname, val);
+}
+
+static void system_bridge_set_isolate_mode(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/sys/class/net/%s/brport/isolate_mode", dev->ifname, val);
+}
+
+static void system_bridge_set_multicast_router(struct device *dev, const char *val, bool bridge)
+{
+	system_set_dev_sysctl(bridge ? "/sys/class/net/%s/bridge/multicast_router" :
+				       "/sys/class/net/%s/brport/multicast_router",
+			      dev->ifname, val);
+}
+
+static void system_bridge_set_robustness(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_startup_query_count",
+			      dev->ifname, val);
+	system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_last_member_count",
+			      dev->ifname, val);
+}
+
+static void system_bridge_set_query_interval(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_query_interval",
+			      dev->ifname, val);
+}
+
+static void system_bridge_set_query_response_interval(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_query_response_interval",
+			      dev->ifname, val);
+}
+
+static void system_bridge_set_last_member_interval(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_last_member_interval",
+			      dev->ifname, val);
+}
+
+static void system_bridge_set_membership_interval(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_membership_interval",
+			      dev->ifname, val);
+}
+
+static void system_bridge_set_other_querier_timeout(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_querier_interval",
+			      dev->ifname, val);
+}
+
+static void system_bridge_set_startup_query_interval(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_startup_query_interval",
+			      dev->ifname, val);
+}
+
+static void system_bridge_set_learning(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/sys/class/net/%s/brport/learning", dev->ifname, val);
+}
+
+static void system_bridge_set_unicast_flood(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/sys/class/net/%s/brport/unicast_flood", dev->ifname, val);
+}
+
+static void system_set_sendredirects(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/proc/sys/net/ipv4/conf/%s/send_redirects", dev->ifname, val);
+}
+
 static int system_get_sysctl(const char *path, char *buf, const size_t buf_sz)
 {
 	int fd = -1, ret = -1;
@@ -366,11 +487,40 @@ static int system_get_neigh6reachabletime(struct device *dev, char *buf, const s
 			dev->ifname, buf, buf_sz);
 }
 
+static int system_get_neigh4gcstaletime(struct device *dev, char *buf, const size_t buf_sz)
+{
+	return system_get_dev_sysctl("/proc/sys/net/ipv4/neigh/%s/gc_stale_time",
+			dev->ifname, buf, buf_sz);
+}
+
+static int system_get_neigh6gcstaletime(struct device *dev, char *buf, const size_t buf_sz)
+{
+	return system_get_dev_sysctl("/proc/sys/net/ipv6/neigh/%s/gc_stale_time",
+			dev->ifname, buf, buf_sz);
+}
+
+static int system_get_neigh4locktime(struct device *dev, char *buf, const size_t buf_sz)
+{
+	return system_get_dev_sysctl("/proc/sys/net/ipv4/neigh/%s/locktime",
+			dev->ifname, buf, buf_sz);
+}
+
+static int system_get_dadtransmits(struct device *dev, char *buf, const size_t buf_sz)
+{
+	return system_get_dev_sysctl("/proc/sys/net/ipv6/conf/%s/dad_transmits",
+			dev->ifname, buf, buf_sz);
+}
+
+static int system_get_sendredirects(struct device *dev, char *buf, const size_t buf_sz)
+{
+	return system_get_dev_sysctl("/proc/sys/net/ipv4/conf/%s/send_redirects",
+			dev->ifname, buf, buf_sz);
+}
+
 // Evaluate netlink messages
 static int cb_rtnl_event(struct nl_msg *msg, void *arg)
 {
 	struct nlmsghdr *nh = nlmsg_hdr(msg);
-	struct ifinfomsg *ifi = NLMSG_DATA(nh);
 	struct nlattr *nla[__IFLA_MAX];
 	int link_state = 0;
 	char buf[10];
@@ -378,12 +528,12 @@ static int cb_rtnl_event(struct nl_msg *msg, void *arg)
 	if (nh->nlmsg_type != RTM_NEWLINK)
 		goto out;
 
-	nlmsg_parse(nh, sizeof(*ifi), nla, __IFLA_MAX - 1, NULL);
+	nlmsg_parse(nh, sizeof(struct ifinfomsg), nla, __IFLA_MAX - 1, NULL);
 	if (!nla[IFLA_IFNAME])
 		goto out;
 
-	struct device *dev = device_get(nla_data(nla[IFLA_IFNAME]), false);
-	if (!dev || dev->type->keep_link_status)
+	struct device *dev = device_find(nla_data(nla[IFLA_IFNAME]));
+	if (!dev)
 		goto out;
 
 	if (!system_get_dev_sysctl("/sys/class/net/%s/carrier", dev->ifname, buf, sizeof(buf)))
@@ -398,16 +548,20 @@ out:
 static void
 handle_hotplug_msg(char *data, int size)
 {
-	const char *subsystem = NULL, *interface = NULL;
+	const char *subsystem = NULL, *interface = NULL, *interface_old = NULL;
 	char *cur, *end, *sep;
 	struct device *dev;
 	int skip;
-	bool add;
+	bool add, move = false;
 
 	if (!strncmp(data, "add@", 4))
 		add = true;
 	else if (!strncmp(data, "remove@", 7))
 		add = false;
+	else if (!strncmp(data, "move@", 5)) {
+		add = true;
+		move = true;
+	}
 	else
 		return;
 
@@ -428,14 +582,34 @@ handle_hotplug_msg(char *data, int size)
 			subsystem = sep + 1;
 			if (strcmp(subsystem, "net") != 0)
 				return;
+		} else if (!strcmp(cur, "DEVPATH_OLD")) {
+			interface_old = strrchr(sep + 1, '/');
+			if (interface_old)
+				interface_old++;
 		}
-		if (subsystem && interface)
+	}
+
+	if (subsystem && interface) {
+		if (move && interface_old)
+			goto move;
+		else
 			goto found;
 	}
+
 	return;
 
+move:
+	dev = device_find(interface_old);
+	if (!dev)
+		goto found;
+
+	if (dev->type != &simple_device_type)
+		goto found;
+
+	device_set_present(dev, false);
+
 found:
-	dev = device_get(interface, false);
+	dev = device_find(interface);
 	if (!dev)
 		return;
 
@@ -491,7 +665,7 @@ static int system_bridge_if(const char *bridge, struct device *dev, int cmd, voi
 		ifr.ifr_ifindex = dev->ifindex;
 	else
 		ifr.ifr_data = data;
-	strncpy(ifr.ifr_name, bridge, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, bridge, sizeof(ifr.ifr_name) - 1);
 	return ioctl(sock_ioctl, cmd, &ifr);
 }
 
@@ -532,16 +706,26 @@ static char *system_get_bridge(const char *name, char *buf, int buflen)
 	return path + 1;
 }
 
-static void system_bridge_set_wireless(const char *bridge, const char *dev)
+static void
+system_bridge_set_wireless(struct device *bridge, struct device *dev)
 {
-	snprintf(dev_buf, sizeof(dev_buf),
-		 "/sys/devices/virtual/net/%s/brif/%s/multicast_to_unicast",
-		 bridge, dev);
-	system_set_sysctl(dev_buf, "1");
+	bool mcast_to_ucast = dev->wireless_ap;
+	bool hairpin = true;
+
+	if (bridge->settings.flags & DEV_OPT_MULTICAST_TO_UNICAST &&
+	    !bridge->settings.multicast_to_unicast)
+		mcast_to_ucast = false;
+
+	if (!mcast_to_ucast || dev->wireless_isolate)
+		hairpin = false;
+
+	system_bridge_set_multicast_to_unicast(dev, mcast_to_ucast ? "1" : "0");
+	system_bridge_set_hairpin_mode(dev, hairpin ? "1" : "0");
 }
 
 int system_bridge_addif(struct device *bridge, struct device *dev)
 {
+	char buf[64];
 	char *oldbr;
 	int ret = 0;
 
@@ -550,7 +734,28 @@ int system_bridge_addif(struct device *bridge, struct device *dev)
 		ret = system_bridge_if(bridge->ifname, dev, SIOCBRADDIF, NULL);
 
 	if (dev->wireless)
-		system_bridge_set_wireless(bridge->ifname, dev->ifname);
+		system_bridge_set_wireless(bridge, dev);
+
+	if (dev->settings.flags & DEV_OPT_MULTICAST_ROUTER) {
+		snprintf(buf, sizeof(buf), "%u", dev->settings.multicast_router);
+		system_bridge_set_multicast_router(dev, buf, false);
+	}
+
+	if (dev->settings.flags & DEV_OPT_MULTICAST_FAST_LEAVE &&
+	    dev->settings.multicast_fast_leave)
+		system_bridge_set_multicast_fast_leave(dev, "1");
+
+	if (dev->settings.flags & DEV_OPT_LEARNING &&
+	    !dev->settings.learning)
+		system_bridge_set_learning(dev, "0");
+
+	if (dev->settings.flags & DEV_OPT_UNICAST_FLOOD &&
+	    !dev->settings.unicast_flood)
+		system_bridge_set_unicast_flood(dev, "0");
+
+	if (dev->settings.flags & DEV_OPT_ISOLATE &&
+	    dev->settings.isolate)
+		system_bridge_set_isolate_mode(dev, "1");
 
 	return ret;
 }
@@ -563,7 +768,7 @@ int system_bridge_delif(struct device *bridge, struct device *dev)
 int system_if_resolve(struct device *dev)
 {
 	struct ifreq ifr;
-	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name) - 1);
 	if (!ioctl(sock_ioctl, SIOCGIFINDEX, &ifr))
 		return ifr.ifr_ifindex;
 	else
@@ -575,8 +780,10 @@ static int system_if_flags(const char *ifname, unsigned add, unsigned rem)
 	struct ifreq ifr;
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-	ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr);
+	strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1);
+	if (ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr) < 0)
+		return -1;
+
 	ifr.ifr_flags |= add;
 	ifr.ifr_flags &= ~rem;
 	return ioctl(sock_ioctl, SIOCSIFFLAGS, &ifr);
@@ -776,8 +983,83 @@ sec_to_jiffies(int val)
 	return (unsigned long) val * 100;
 }
 
+static void system_bridge_conf_multicast_deps(struct device *bridge,
+					      struct bridge_config *cfg,
+					      char *buf,
+					      int buf_len)
+{
+	int val;
+
+	if (cfg->flags & BRIDGE_OPT_ROBUSTNESS ||
+	    cfg->flags & BRIDGE_OPT_QUERY_INTERVAL ||
+	    cfg->flags & BRIDGE_OPT_QUERY_RESPONSE_INTERVAL) {
+		val = cfg->robustness * cfg->query_interval +
+			cfg->query_response_interval;
+
+		snprintf(buf, buf_len, "%i", val);
+		system_bridge_set_membership_interval(bridge, buf);
+
+		val = cfg->robustness * cfg->query_interval +
+			cfg->query_response_interval / 2;
+
+		snprintf(buf, buf_len, "%i", val);
+		system_bridge_set_other_querier_timeout(bridge, buf);
+	}
+
+	if (cfg->flags & BRIDGE_OPT_QUERY_INTERVAL) {
+		val = cfg->query_interval / 4;
+
+		snprintf(buf, buf_len, "%i", val);
+		system_bridge_set_startup_query_interval(bridge, buf);
+	}
+}
+
+static void system_bridge_conf_multicast(struct device *bridge,
+					 struct bridge_config *cfg,
+					 char *buf,
+					 int buf_len)
+{
+	system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_snooping",
+		bridge->ifname, cfg->igmp_snoop ? "1" : "0");
+
+	system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_querier",
+		bridge->ifname, cfg->multicast_querier ? "1" : "0");
+
+	snprintf(buf, buf_len, "%i", cfg->hash_max);
+	system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/hash_max",
+		bridge->ifname, buf);
+
+	if (bridge->settings.flags & DEV_OPT_MULTICAST_ROUTER) {
+		snprintf(buf, buf_len, "%u", bridge->settings.multicast_router);
+		system_bridge_set_multicast_router(bridge, buf, true);
+	}
+
+	if (cfg->flags & BRIDGE_OPT_ROBUSTNESS) {
+		snprintf(buf, buf_len, "%i", cfg->robustness);
+		system_bridge_set_robustness(bridge, buf);
+	}
+
+	if (cfg->flags & BRIDGE_OPT_QUERY_INTERVAL) {
+		snprintf(buf, buf_len, "%i", cfg->query_interval);
+		system_bridge_set_query_interval(bridge, buf);
+	}
+
+	if (cfg->flags & BRIDGE_OPT_QUERY_RESPONSE_INTERVAL) {
+		snprintf(buf, buf_len, "%i", cfg->query_response_interval);
+		system_bridge_set_query_response_interval(bridge, buf);
+	}
+
+	if (cfg->flags & BRIDGE_OPT_LAST_MEMBER_INTERVAL) {
+		snprintf(buf, buf_len, "%i", cfg->last_member_interval);
+		system_bridge_set_last_member_interval(bridge, buf);
+	}
+
+	system_bridge_conf_multicast_deps(bridge, cfg, buf, buf_len);
+}
+
 int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg)
 {
+	char buf[64];
 	unsigned long args[4] = {};
 
 	if (ioctl(sock_ioctl, SIOCBRADDBR, bridge->ifname) < 0)
@@ -791,11 +1073,7 @@ int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg)
 	args[1] = sec_to_jiffies(cfg->forward_delay);
 	system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args);
 
-	system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_snooping",
-		bridge->ifname, cfg->igmp_snoop ? "1" : "0");
-
-	system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_querier",
-		bridge->ifname, cfg->multicast_querier ? "1" : "0");
+	system_bridge_conf_multicast(bridge, cfg, buf, sizeof(buf));
 
 	args[0] = BRCTL_SET_BRIDGE_PRIORITY;
 	args[1] = cfg->priority;
@@ -905,6 +1183,66 @@ int system_macvlan_del(struct device *macvlan)
 	return system_link_del(macvlan->ifname);
 }
 
+int system_veth_add(struct device *veth, struct veth_config *cfg)
+{
+	struct nl_msg *msg;
+	struct ifinfomsg empty_iim = {};
+	struct nlattr *linkinfo, *data, *veth_info;
+	int rv;
+
+	msg = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL);
+
+	if (!msg)
+		return -1;
+
+	nlmsg_append(msg, &empty_iim, sizeof(empty_iim), 0);
+
+	if (cfg->flags & VETH_OPT_MACADDR)
+		nla_put(msg, IFLA_ADDRESS, sizeof(cfg->macaddr), cfg->macaddr);
+	nla_put_string(msg, IFLA_IFNAME, veth->ifname);
+
+	if (!(linkinfo = nla_nest_start(msg, IFLA_LINKINFO)))
+		goto nla_put_failure;
+
+	nla_put_string(msg, IFLA_INFO_KIND, "veth");
+
+	if (!(data = nla_nest_start(msg, IFLA_INFO_DATA)))
+		goto nla_put_failure;
+
+	if (!(veth_info = nla_nest_start(msg, VETH_INFO_PEER)))
+		goto nla_put_failure;
+
+	nlmsg_append(msg, &empty_iim, sizeof(empty_iim), 0);
+
+	if (cfg->flags & VETH_OPT_PEER_NAME)
+		nla_put_string(msg, IFLA_IFNAME, cfg->peer_name);
+	if (cfg->flags & VETH_OPT_PEER_MACADDR)
+		nla_put(msg, IFLA_ADDRESS, sizeof(cfg->peer_macaddr), cfg->peer_macaddr);
+
+	nla_nest_end(msg, veth_info);
+	nla_nest_end(msg, data);
+	nla_nest_end(msg, linkinfo);
+
+	rv = system_rtnl_call(msg);
+	if (rv) {
+		if (cfg->flags & VETH_OPT_PEER_NAME)
+			D(SYSTEM, "Error adding veth '%s' with peer '%s': %d\n", veth->ifname, cfg->peer_name, rv);
+		else
+			D(SYSTEM, "Error adding veth '%s': %d\n", veth->ifname, rv);
+	}
+
+	return rv;
+
+nla_put_failure:
+	nlmsg_free(msg);
+	return -ENOMEM;
+}
+
+int system_veth_del(struct device *veth)
+{
+	return system_link_del(veth->ifname);
+}
+
 static int system_vlan(struct device *dev, int id)
 {
 	struct vlan_ioctl_args ifr = {
@@ -912,7 +1250,8 @@ static int system_vlan(struct device *dev, int id)
 		.u.name_type = VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD,
 	};
 
-	ioctl(sock_ioctl, SIOCSIFVLAN, &ifr);
+	if (ioctl(sock_ioctl, SIOCSIFVLAN, &ifr) < 0)
+		return -1;
 
 	if (id < 0) {
 		ifr.cmd = DEL_VLAN_CMD;
@@ -950,10 +1289,10 @@ int system_vlandev_add(struct device *vlandev, struct device *dev, struct vlande
 	nlmsg_append(msg, &iim, sizeof(iim), 0);
 	nla_put_string(msg, IFLA_IFNAME, vlandev->ifname);
 	nla_put_u32(msg, IFLA_LINK, dev->ifindex);
-	
+
 	if (!(linkinfo = nla_nest_start(msg, IFLA_LINKINFO)))
 		goto nla_put_failure;
-	
+
 	nla_put_string(msg, IFLA_INFO_KIND, "vlan");
 
 	if (!(data = nla_nest_start(msg, IFLA_INFO_DATA)))
@@ -987,20 +1326,24 @@ int system_vlandev_del(struct device *vlandev)
 	return system_link_del(vlandev->ifname);
 }
 
-static void
+void
 system_if_get_settings(struct device *dev, struct device_settings *s)
 {
 	struct ifreq ifr;
 	char buf[10];
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name) - 1);
 
 	if (ioctl(sock_ioctl, SIOCGIFMTU, &ifr) == 0) {
 		s->mtu = ifr.ifr_mtu;
 		s->flags |= DEV_OPT_MTU;
 	}
 
+	s->mtu6 = system_update_ipv6_mtu(dev, 0);
+	if (s->mtu6 > 0)
+		s->flags |= DEV_OPT_MTU6;
+
 	if (ioctl(sock_ioctl, SIOCGIFTXQLEN, &ifr) == 0) {
 		s->txqueuelen = ifr.ifr_qlen;
 		s->flags |= DEV_OPT_TXQUEUELEN;
@@ -1019,6 +1362,9 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
 	if (ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr) == 0) {
 		s->promisc = ifr.ifr_flags & IFF_PROMISC;
 		s->flags |= DEV_OPT_PROMISC;
+
+		s->multicast = ifr.ifr_flags & IFF_MULTICAST;
+		s->flags |= DEV_OPT_MULTICAST;
 	}
 
 	if (!system_get_rpfilter(dev, buf, sizeof(buf))) {
@@ -1050,52 +1396,49 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
 		s->neigh6reachabletime = strtoul(buf, NULL, 0);
 		s->flags |= DEV_OPT_NEIGHREACHABLETIME;
 	}
-}
-
-static void
-system_if_set_rps_xps_val(const char *path, int val)
-{
-	char val_buf[8];
-	glob_t gl;
-	int i;
-
-	if (glob(path, 0, NULL, &gl))
-		return;
 
-	snprintf(val_buf, sizeof(val_buf), "%x", val);
-	for (i = 0; i < gl.gl_pathc; i++)
-		system_set_sysctl(gl.gl_pathv[i], val_buf);
-}
+	if (!system_get_neigh4locktime(dev, buf, sizeof(buf))) {
+		s->neigh4locktime = strtol(buf, NULL, 0);
+		s->flags |= DEV_OPT_NEIGHLOCKTIME;
+	}
 
-static void
-system_if_apply_rps_xps(struct device *dev, struct device_settings *s)
-{
-	long n_cpus = sysconf(_SC_NPROCESSORS_ONLN);
-	int val;
+	if (!system_get_neigh4gcstaletime(dev, buf, sizeof(buf))) {
+		s->neigh4gcstaletime = strtoul(buf, NULL, 0);
+		s->flags |= DEV_OPT_NEIGHGCSTALETIME;
+	}
 
-	if (n_cpus < 2)
-		return;
+	if (!system_get_neigh6gcstaletime(dev, buf, sizeof(buf))) {
+		s->neigh6gcstaletime = strtoul(buf, NULL, 0);
+		s->flags |= DEV_OPT_NEIGHGCSTALETIME;
+	}
 
-	val = (1 << n_cpus) - 1;
-	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);
+	if (!system_get_dadtransmits(dev, buf, sizeof(buf))) {
+		s->dadtransmits = strtoul(buf, NULL, 0);
+		s->flags |= DEV_OPT_DADTRANSMITS;
+	}
 
-	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);
+	if (!system_get_sendredirects(dev, buf, sizeof(buf))) {
+		s->sendredirects = strtoul(buf, NULL, 0);
+		s->flags |= DEV_OPT_SENDREDIRECTS;
+	}
 }
 
 void
 system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned int apply_mask)
 {
 	struct ifreq ifr;
+	char buf[12];
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name) - 1);
 	if (s->flags & DEV_OPT_MTU & apply_mask) {
 		ifr.ifr_mtu = s->mtu;
 		if (ioctl(sock_ioctl, SIOCSIFMTU, &ifr) < 0)
 			s->flags &= ~DEV_OPT_MTU;
 	}
+	if (s->flags & DEV_OPT_MTU6 & apply_mask) {
+		system_update_ipv6_mtu(dev, s->mtu6);
+	}
 	if (s->flags & DEV_OPT_TXQUEUELEN & apply_mask) {
 		ifr.ifr_qlen = s->txqueuelen;
 		if (ioctl(sock_ioctl, SIOCSIFTXQLEN, &ifr) < 0)
@@ -1115,41 +1458,53 @@ 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) {
-		char buf[2];
-
-		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) {
-		char buf[2];
-
-		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) {
-		char buf[2];
-
-		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) {
-		char buf[12];
-
-		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);
 	}
-
-	system_if_apply_rps_xps(dev, s);
+	if (s->flags & DEV_OPT_NEIGHLOCKTIME & apply_mask) {
+		snprintf(buf, sizeof(buf), "%d", s->neigh4locktime);
+		system_set_neigh4locktime(dev, buf);
+	}
+	if (s->flags & DEV_OPT_NEIGHGCSTALETIME & apply_mask) {
+		snprintf(buf, sizeof(buf), "%u", s->neigh4gcstaletime);
+		system_set_neigh4gcstaletime(dev, buf);
+		snprintf(buf, sizeof(buf), "%u", s->neigh6gcstaletime);
+		system_set_neigh6gcstaletime(dev, buf);
+	}
+	if (s->flags & DEV_OPT_DADTRANSMITS & apply_mask) {
+		snprintf(buf, sizeof(buf), "%u", s->dadtransmits);
+		system_set_dadtransmits(dev, buf);
+	}
+	if (s->flags & DEV_OPT_MULTICAST & apply_mask) {
+		if (system_if_flags(dev->ifname, s->multicast ? IFF_MULTICAST : 0,
+				    !s->multicast ? IFF_MULTICAST : 0) < 0)
+			s->flags &= ~DEV_OPT_MULTICAST;
+	}
+	if (s->flags & DEV_OPT_SENDREDIRECTS & apply_mask)
+		system_set_sendredirects(dev, s->sendredirects ? "1" : "0");
 }
 
 int system_if_up(struct device *dev)
 {
 	system_if_get_settings(dev, &dev->orig_settings);
 	/* Only keep orig settings based on what needs to be set */
+	dev->orig_settings.valid_flags = dev->orig_settings.flags;
 	dev->orig_settings.flags &= dev->settings.flags;
 	system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
 	return system_if_flags(dev->ifname, IFF_UP, 0);
@@ -1219,11 +1574,17 @@ int system_if_check(struct device *dev)
 	};
 	int ret = 1;
 
+	if (!cb)
+		return ret;
+
 	msg = nlmsg_alloc_simple(RTM_GETLINK, 0);
-	if (!msg || nlmsg_append(msg, &ifi, sizeof(ifi), 0) ||
-	    nla_put_string(msg, IFLA_IFNAME, dev->ifname))
+	if (!msg)
 		goto out;
 
+	if (nlmsg_append(msg, &ifi, sizeof(ifi), 0) ||
+	    nla_put_string(msg, IFLA_IFNAME, dev->ifname))
+		goto free;
+
 	nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, cb_if_check_valid, &chk);
 	nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, cb_if_check_ack, &chk);
 	nl_cb_err(cb, NL_CB_CUSTOM, cb_if_check_error, &chk);
@@ -1232,9 +1593,10 @@ int system_if_check(struct device *dev)
 	while (chk.pending > 0)
 		nl_recvmsgs(sock_rtnl, cb);
 
-	nlmsg_free(msg);
 	ret = chk.pending;
 
+free:
+	nlmsg_free(msg);
 out:
 	nl_cb_put(cb);
 	return ret;
@@ -1352,16 +1714,12 @@ system_if_dump_info(struct device *dev, struct blob_buf *b)
 {
 	struct ethtool_cmd ecmd;
 	struct ifreq ifr;
-	char buf[64], *s;
+	char *s;
 	void *c;
-	int dir_fd;
-
-	snprintf(buf, sizeof(buf), "/sys/class/net/%s", dev->ifname);
-	dir_fd = open(buf, O_DIRECTORY);
 
 	memset(&ecmd, 0, sizeof(ecmd));
 	memset(&ifr, 0, sizeof(ifr));
-	strcpy(ifr.ifr_name, dev->ifname);
+	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name) - 1);
 	ifr.ifr_data = (caddr_t) &ecmd;
 	ecmd.cmd = ETHTOOL_GSET;
 
@@ -1380,7 +1738,6 @@ system_if_dump_info(struct device *dev, struct blob_buf *b)
 		blobmsg_add_string_buffer(b);
 	}
 
-	close(dir_fd);
 	return 0;
 }
 
@@ -1457,8 +1814,10 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
 
 		if (addr->valid_until) {
 			int64_t valid = addr->valid_until - now;
-			if (valid <= 0)
+			if (valid <= 0) {
+				nlmsg_free(msg);
 				return -1;
+			}
 			else if (valid > UINT32_MAX)
 				valid = UINT32_MAX;
 
@@ -1466,6 +1825,9 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
 		}
 
 		nla_put(msg, IFA_CACHEINFO, sizeof(cinfo), &cinfo);
+
+		if (cmd == RTM_NEWADDR && (addr->flags & DEVADDR_OFFLINK))
+			nla_put_u32(msg, IFA_FLAGS, IFA_F_NOPREFIXROUTE);
 	}
 
 	return system_rtnl_call(msg);
@@ -1503,7 +1865,7 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
 		.rtm_dst_len = route->mask,
 		.rtm_src_len = route->sourcemask,
 		.rtm_table = (table < 256) ? table : RT_TABLE_UNSPEC,
-		.rtm_protocol = (route->flags & DEVADDR_KERNEL) ? RTPROT_KERNEL : RTPROT_STATIC,
+		.rtm_protocol = (route->flags & DEVROUTE_PROTO) ? route->proto : RTPROT_STATIC,
 		.rtm_scope = RT_SCOPE_NOWHERE,
 		.rtm_type = (cmd == RTM_DELROUTE) ? 0: RTN_UNICAST,
 		.rtm_flags = (route->flags & DEVROUTE_ONLINK) ? RTNH_F_ONLINK : 0,
@@ -1535,7 +1897,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;
 		}
@@ -1621,6 +1984,45 @@ bool system_resolve_rt_type(const char *type, unsigned int *id)
 	return system_rtn_aton(type, id);
 }
 
+bool system_resolve_rt_proto(const char *type, unsigned int *id)
+{
+	FILE *f;
+	char *e, buf[128];
+	unsigned int n, proto = 256;
+	n = strtoul(type, &e, 0);
+	if (!*e && e != type)
+		proto = n;
+	else if (!strcmp(type, "unspec"))
+		proto = RTPROT_UNSPEC;
+	else if (!strcmp(type, "kernel"))
+		proto = RTPROT_KERNEL;
+	else if (!strcmp(type, "boot"))
+		proto = RTPROT_BOOT;
+	else if (!strcmp(type, "static"))
+		proto = RTPROT_STATIC;
+	else if ((f = fopen("/etc/iproute2/rt_protos", "r")) != NULL) {
+		while (fgets(buf, sizeof(buf) - 1, f) != NULL) {
+			if ((e = strtok(buf, " \t\n")) == NULL || *e == '#')
+				continue;
+
+			n = strtoul(e, NULL, 10);
+			e = strtok(NULL, " \t\n");
+
+			if (e && !strcmp(e, type)) {
+				proto = n;
+				break;
+			}
+		}
+		fclose(f);
+	}
+
+	if (proto > 255)
+		return false;
+
+	*id = proto;
+	return true;
+}
+
 bool system_resolve_rt_table(const char *name, unsigned int *id)
 {
 	FILE *f;
@@ -1705,10 +2107,8 @@ static int system_iprule(struct iprule *rule, int cmd)
 		.rtm_flags = 0,
 	};
 
-	if (cmd == RTM_NEWRULE) {
+	if (cmd == RTM_NEWRULE)
 		rtm.rtm_type = RTN_UNICAST;
-		rtm.rtm_flags |= NLM_F_REPLACE | NLM_F_EXCL;
-	}
 
 	if (rule->invert)
 		rtm.rtm_flags |= FIB_RULE_INVERT;
@@ -1769,6 +2169,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);
 
@@ -1798,7 +2201,7 @@ int system_flush_iprules(void)
 
 	rule.flags = IPRULE_INET4 | IPRULE_PRIORITY | IPRULE_LOOKUP;
 
-	rule.priority = 128;
+	rule.priority = 0;
 	rule.lookup = RT_TABLE_LOCAL;
 	rv |= system_iprule(&rule, RTM_NEWRULE);
 
@@ -1813,7 +2216,7 @@ int system_flush_iprules(void)
 
 	rule.flags = IPRULE_INET6 | IPRULE_PRIORITY | IPRULE_LOOKUP;
 
-	rule.priority = 128;
+	rule.priority = 0;
 	rule.lookup = RT_TABLE_LOCAL;
 	rv |= system_iprule(&rule, RTM_NEWRULE);
 
@@ -1852,14 +2255,160 @@ 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));
+	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name) - 1);
 	ifr.ifr_ifru.ifru_data = p;
 	return ioctl(sock_ioctl, cmd, &ifr);
 }
 
 #ifdef IFLA_IPTUN_MAX
-#define IP6_FLOWINFO_TCLASS	htonl(0x0FF00000)
-static int system_add_gre_tunnel(const char *name, const char *kind,
+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_DATA])) {
+		struct blob_attr *dcur;
+		unsigned drem, fmrcnt = 0;
+		struct nlattr *fmrs = nla_nest_start(nlm, IFLA_IPTUN_FMRS);
+
+		if (!fmrs) {
+			ret = -ENOMEM;
+			goto failure;
+		}
+
+		blobmsg_for_each_attr(dcur, cur, drem) {
+			if (blobmsg_type(dcur) != BLOBMSG_TYPE_ARRAY ||
+					strcmp(blobmsg_name(dcur), "fmrs") ||
+					blobmsg_check_array(dcur, BLOBMSG_TYPE_UNSPEC) <= 0)
+				continue;
+
+			struct blob_attr *rcur;
+			unsigned rrem;
+			blobmsg_for_each_attr(rcur, dcur, rrem) {
+				struct blob_attr *tb_fmr[__FMR_DATA_ATTR_MAX], *tb_cur;
+				struct in6_addr ip6prefix;
+				struct in_addr ip4prefix;
+				unsigned ip4len, ip6len, ealen, offset;
+
+				blobmsg_parse(fmr_data_attr_list.params, __FMR_DATA_ATTR_MAX, tb_fmr,
+						blobmsg_data(rcur), blobmsg_len(rcur));
+
+				if (!(tb_cur = tb_fmr[FMR_DATA_PREFIX6]) ||
+						!parse_ip_and_netmask(AF_INET6,
+							blobmsg_data(tb_cur), &ip6prefix,
+							&ip6len)) {
+					ret = -EINVAL;
+					goto failure;
+				}
+
+				if (!(tb_cur = tb_fmr[FMR_DATA_PREFIX4]) ||
+						!parse_ip_and_netmask(AF_INET,
+							blobmsg_data(tb_cur), &ip4prefix,
+							&ip4len)) {
+					ret = -EINVAL;
+					goto failure;
+				}
+
+				if (!(tb_cur = tb_fmr[FMR_DATA_EALEN])) {
+					ret = -EINVAL;
+					goto failure;
+				}
+				ealen = blobmsg_get_u32(tb_cur);
+
+				if (!(tb_cur = tb_fmr[FMR_DATA_OFFSET])) {
+					ret = -EINVAL;
+					goto failure;
+				}
+				offset = blobmsg_get_u32(tb_cur);
+
+				struct nlattr *rule = nla_nest_start(nlm, ++fmrcnt);
+				if (!rule) {
+					ret = -ENOMEM;
+					goto failure;
+				}
+
+				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)
 {
 	struct nl_msg *nlm;
@@ -1868,7 +2417,7 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
 	uint32_t ikey = 0, okey = 0, flags = 0, flowinfo = 0;
 	uint16_t iflags = 0, oflags = 0;
 	uint8_t tos = 0;
-	int ret = 0, ttl = 64;
+	int ret = 0, ttl = 0;
 
 	nlm = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_REPLACE | NLM_F_CREATE);
 	if (!nlm)
@@ -1896,8 +2445,6 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
 	if ((cur = tb[TUNNEL_ATTR_TTL]))
 		ttl = blobmsg_get_u32(cur);
 
-	nla_put_u8(nlm, IFLA_GRE_TTL, ttl);
-
 	if ((cur = tb[TUNNEL_ATTR_TOS])) {
 		char *str = blobmsg_get_string(cur);
 		if (strcmp(str, "inherit")) {
@@ -1918,33 +2465,43 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
 			else
 				tos = 1;
 		}
-        }
+	}
 
-	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];
 
-		if (ikey)
-			iflags |= GRE_KEY;
+		blobmsg_parse(gre_data_attr_list.params, __GRE_DATA_ATTR_MAX, tb_data,
+			blobmsg_data(cur), blobmsg_len(cur));
 
-		if (okey)
-			oflags |= GRE_KEY;
+		if ((cur = tb_data[GRE_DATA_IKEY])) {
+			if ((ikey = blobmsg_get_u32(cur)))
+				iflags |= GRE_KEY;
+		}
 
-		if (icsum)
-			iflags |= GRE_CSUM;
+		if ((cur = tb_data[GRE_DATA_OKEY])) {
+			if ((okey = blobmsg_get_u32(cur)))
+				oflags |= GRE_KEY;
+		}
+
+		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) {
@@ -1971,6 +2528,9 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
 
 		if (flags)
 			nla_put_u32(nlm, IFLA_GRE_FLAGS, flags);
+
+		if (!ttl)
+			ttl = 64;
 	} else {
 		struct in_addr inbuf;
 		bool set_df = true;
@@ -2006,17 +2566,23 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
 		if ((cur = tb[TUNNEL_ATTR_DF]))
 			set_df = blobmsg_get_bool(cur);
 
-		/* ttl !=0 and nopmtudisc are incompatible */
-		if (ttl && !set_df) {
-			ret = -EINVAL;
-			goto failure;
-		}
+		if (!set_df) {
+			/* ttl != 0 and nopmtudisc are incompatible */
+			if (ttl) {
+				ret = -EINVAL;
+				goto failure;
+			}
+		} else if (!ttl)
+			ttl = 64;
 
 		nla_put_u8(nlm, IFLA_GRE_PMTUDISC, set_df ? 1 : 0);
 
 		nla_put_u8(nlm, IFLA_GRE_TOS, tos);
 	}
 
+	if (ttl)
+		nla_put_u8(nlm, IFLA_GRE_TTL, ttl);
+
 	if (oflags)
 		nla_put_u16(nlm, IFLA_GRE_OFLAGS, oflags);
 
@@ -2024,10 +2590,110 @@ 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);
+
+	return system_rtnl_call(nlm);
+
+failure:
+	nlmsg_free(nlm);
+	return ret;
+}
+#endif
+
+#ifdef IFLA_VTI_MAX
+static int system_add_vti_tunnel(const char *name, const char *kind,
+				 const unsigned int link, struct blob_attr **tb, bool v6)
+{
+	struct nl_msg *nlm;
+	struct ifinfomsg ifi = { .ifi_family = AF_UNSPEC, };
+	struct blob_attr *cur;
+	int ret = 0;
+
+	nlm = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_REPLACE | NLM_F_CREATE);
+	if (!nlm)
+		return -1;
+
+	nlmsg_append(nlm, &ifi, sizeof(ifi), 0);
+	nla_put_string(nlm, IFLA_IFNAME, name);
+
+	struct nlattr *linkinfo = nla_nest_start(nlm, IFLA_LINKINFO);
+	if (!linkinfo) {
+		ret = -ENOMEM;
+		goto failure;
+	}
+
+	nla_put_string(nlm, IFLA_INFO_KIND, kind);
+	struct nlattr *infodata = nla_nest_start(nlm, IFLA_INFO_DATA);
+	if (!infodata) {
+		ret = -ENOMEM;
+		goto failure;
+	}
+
+	if (link)
+		nla_put_u32(nlm, IFLA_VTI_LINK, link);
+
+	if (v6) {
+		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_VTI_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_VTI_REMOTE, sizeof(in6buf), &in6buf);
+		}
+
+	} else {
+		struct in_addr inbuf;
+
+		if ((cur = tb[TUNNEL_ATTR_LOCAL])) {
+			if (inet_pton(AF_INET, blobmsg_data(cur), &inbuf) < 1) {
+				ret = -EINVAL;
+				goto failure;
+			}
+			nla_put(nlm, IFLA_VTI_LOCAL, sizeof(inbuf), &inbuf);
+		}
+
+		if ((cur = tb[TUNNEL_ATTR_REMOTE])) {
+			if (inet_pton(AF_INET, blobmsg_data(cur), &inbuf) < 1) {
+				ret = -EINVAL;
+				goto failure;
+			}
+			nla_put(nlm, IFLA_VTI_REMOTE, sizeof(inbuf), &inbuf);
+		}
+
+	}
+
+	if ((cur = tb[TUNNEL_ATTR_DATA])) {
+		struct blob_attr *tb_data[__VTI_DATA_ATTR_MAX];
+		uint32_t ikey = 0, okey = 0;
+
+		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);
@@ -2040,12 +2706,227 @@ failure:
 }
 #endif
 
+#ifdef IFLA_VXLAN_MAX
+static int system_add_vxlan(const char *name, const unsigned int link, struct blob_attr **tb, bool v6)
+{
+	struct blob_attr *tb_data[__VXLAN_DATA_ATTR_MAX];
+	struct nl_msg *msg;
+	struct nlattr *linkinfo, *data;
+	struct ifinfomsg iim = { .ifi_family = AF_UNSPEC, };
+	struct blob_attr *cur;
+	int ret = 0;
+
+	if ((cur = tb[TUNNEL_ATTR_DATA]))
+		blobmsg_parse(vxlan_data_attr_list.params, __VXLAN_DATA_ATTR_MAX, tb_data,
+			blobmsg_data(cur), blobmsg_len(cur));
+	else
+		return -EINVAL;
+
+	msg = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL);
+
+	if (!msg)
+		return -1;
+
+	nlmsg_append(msg, &iim, sizeof(iim), 0);
+
+	nla_put_string(msg, IFLA_IFNAME, name);
+
+	if ((cur = tb_data[VXLAN_DATA_ATTR_MACADDR])) {
+		struct ether_addr *ea = ether_aton(blobmsg_get_string(cur));
+		if (!ea) {
+			ret = -EINVAL;
+			goto failure;
+		}
+
+		nla_put(msg, IFLA_ADDRESS, ETH_ALEN, ea);
+	}
+
+	if ((cur = tb[TUNNEL_ATTR_MTU])) {
+		uint32_t mtu = blobmsg_get_u32(cur);
+		nla_put_u32(msg, IFLA_MTU, mtu);
+	}
+
+	if (!(linkinfo = nla_nest_start(msg, IFLA_LINKINFO))) {
+		ret = -ENOMEM;
+		goto failure;
+	}
+
+	nla_put_string(msg, IFLA_INFO_KIND, "vxlan");
+
+	if (!(data = nla_nest_start(msg, IFLA_INFO_DATA))) {
+		ret = -ENOMEM;
+		goto failure;
+	}
+
+	if (link)
+		nla_put_u32(msg, IFLA_VXLAN_LINK, link);
+
+	if ((cur = tb_data[VXLAN_DATA_ATTR_ID])) {
+		uint32_t id = blobmsg_get_u32(cur);
+		if (id >= (1u << 24) - 1) {
+			ret = -EINVAL;
+			goto failure;
+		}
+
+		nla_put_u32(msg, IFLA_VXLAN_ID, id);
+	}
+
+	if (v6) {
+		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(msg, IFLA_VXLAN_LOCAL6, 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(msg, IFLA_VXLAN_GROUP6, sizeof(in6buf), &in6buf);
+		}
+	} else {
+		struct in_addr inbuf;
+
+		if ((cur = tb[TUNNEL_ATTR_LOCAL])) {
+			if (inet_pton(AF_INET, blobmsg_data(cur), &inbuf) < 1) {
+				ret = -EINVAL;
+				goto failure;
+			}
+			nla_put(msg, IFLA_VXLAN_LOCAL, sizeof(inbuf), &inbuf);
+		}
+
+		if ((cur = tb[TUNNEL_ATTR_REMOTE])) {
+			if (inet_pton(AF_INET, blobmsg_data(cur), &inbuf) < 1) {
+				ret = -EINVAL;
+				goto failure;
+			}
+			nla_put(msg, IFLA_VXLAN_GROUP, sizeof(inbuf), &inbuf);
+		}
+	}
+
+	uint32_t port = 4789;
+	if ((cur = tb_data[VXLAN_DATA_ATTR_PORT])) {
+		port = blobmsg_get_u32(cur);
+		if (port < 1 || port > 65535) {
+			ret = -EINVAL;
+			goto failure;
+		}
+	}
+	nla_put_u16(msg, IFLA_VXLAN_PORT, htons(port));
+
+	if ((cur = tb_data[VXLAN_DATA_ATTR_RXCSUM])) {
+		bool rxcsum = blobmsg_get_bool(cur);
+		nla_put_u8(msg, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, !rxcsum);
+	}
+
+	if ((cur = tb_data[VXLAN_DATA_ATTR_TXCSUM])) {
+		bool txcsum = blobmsg_get_bool(cur);
+		nla_put_u8(msg, IFLA_VXLAN_UDP_CSUM, txcsum);
+		nla_put_u8(msg, IFLA_VXLAN_UDP_ZERO_CSUM6_TX, !txcsum);
+	}
+
+	if ((cur = tb[TUNNEL_ATTR_TOS])) {
+		char *str = blobmsg_get_string(cur);
+		unsigned tos = 1;
+
+		if (strcmp(str, "inherit")) {
+			if (!system_tos_aton(str, &tos)) {
+				ret = -EINVAL;
+				goto failure;
+			}
+		}
+
+		nla_put_u8(msg, IFLA_VXLAN_TOS, tos);
+	}
+
+	if ((cur = tb[TUNNEL_ATTR_TTL])) {
+		uint32_t ttl = blobmsg_get_u32(cur);
+		if (ttl < 1 || ttl > 255) {
+			ret = -EINVAL;
+			goto failure;
+		}
+
+		nla_put_u8(msg, IFLA_VXLAN_TTL, ttl);
+	}
+
+	nla_nest_end(msg, data);
+	nla_nest_end(msg, linkinfo);
+
+	ret = system_rtnl_call(msg);
+	if (ret)
+		D(SYSTEM, "Error adding vxlan '%s': %d\n", name, ret);
+
+	return ret;
+
+failure:
+	nlmsg_free(msg);
+	return ret;
+}
+#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;
 	bool set_df = true;
 	struct ip_tunnel_parm p  = {
-	        .link = link,
+		.link = link,
 		.iph = {
 			.version = 4,
 			.ihl = 5,
@@ -2085,7 +2966,7 @@ static int system_add_proto_tunnel(const char *name, const uint8_t proto, const
 	if (p.iph.ttl && p.iph.frag_off == 0)
 		return -EINVAL;
 
-	strncpy(p.name, name, sizeof(p.name));
+	strncpy(p.name, name, sizeof(p.name) - 1);
 
 	switch (p.iph.protocol) {
 	case IPPROTO_IPIP:
@@ -2108,7 +2989,9 @@ static int __system_del_ip_tunnel(const char *name, struct blob_attr **tb)
 	str = blobmsg_data(cur);
 
 	if (!strcmp(str, "greip") || !strcmp(str, "gretapip") ||
-	    !strcmp(str, "greip6") || !strcmp(str, "gretapip6"))
+	    !strcmp(str, "greip6") || !strcmp(str, "gretapip6") ||
+	    !strcmp(str, "vtiip") || !strcmp(str, "vtiip6") ||
+	    !strcmp(str, "vxlan") || !strcmp(str, "vxlan6"))
 		return system_link_del(name);
 	else
 		return tunnel_ioctl(name, SIOCDELTUNNEL, NULL);
@@ -2128,23 +3011,26 @@ int system_update_ipv6_mtu(struct device *dev, int mtu)
 {
 	int ret = -1;
 	char buf[64];
+	int fd;
+
 	snprintf(buf, sizeof(buf), "/proc/sys/net/ipv6/conf/%s/mtu",
 			dev->ifname);
 
-	int fd = open(buf, O_RDWR);
-	ssize_t len = read(fd, buf, sizeof(buf) - 1);
-	if (len < 0)
-		goto out;
-
-	buf[len] = 0;
-	ret = atoi(buf);
+	fd = open(buf, O_RDWR);
+	if (fd < 0)
+		return ret;
 
-	if (!mtu || ret <= mtu)
-		goto out;
+	if (!mtu) {
+		ssize_t len = read(fd, buf, sizeof(buf) - 1);
+		if (len < 0)
+			goto out;
 
-	lseek(fd, 0, SEEK_SET);
-	if (write(fd, buf, snprintf(buf, sizeof(buf), "%i", mtu)) <= 0)
-		ret = -1;
+		buf[len] = 0;
+		ret = atoi(buf);
+	} else {
+		if (write(fd, buf, snprintf(buf, sizeof(buf), "%i", mtu)) > 0)
+			ret = mtu;
+	}
 
 out:
 	close(fd);
@@ -2183,138 +3069,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"))  {
@@ -2323,6 +3082,18 @@ failure:
 		return system_add_gre_tunnel(name, "ip6gre", link, tb, true);
 	} else if (!strcmp(str, "gretapip6")) {
 		return system_add_gre_tunnel(name, "ip6gretap", link, tb, true);
+#ifdef IFLA_VTI_MAX
+	} else if (!strcmp(str, "vtiip")) {
+		return system_add_vti_tunnel(name, "vti", link, tb, false);
+	} else if (!strcmp(str, "vtiip6")) {
+		return system_add_vti_tunnel(name, "vti6", link, tb, true);
+#endif
+#ifdef IFLA_VXLAN_MAX
+	} else if(!strcmp(str, "vxlan")) {
+		return system_add_vxlan(name, link, tb, false);
+	} else if(!strcmp(str, "vxlan6")) {
+		return system_add_vxlan(name, link, tb, true);
+#endif
 #endif
 	} else if (!strcmp(str, "ipip")) {
 		return system_add_proto_tunnel(name, IPPROTO_IPIP, link, tb);