X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=bb7ccf90d1c8bd0193fd37adf6727c4e7b5139dc;hp=aca30caff3aed65eabffeaf2a95bb2acc161bc5b;hb=f6f065d3997ccc8d42805529e4aad59b789579ad;hpb=8e15f409e000ffdd87d1022390e54f14da839b3f

diff --git a/system-linux.c b/system-linux.c
index aca30ca..bb7ccf9 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -204,6 +204,18 @@ system_rtn_aton(const char *src, unsigned int *dst)
 	return true;
 }
 
+static bool
+system_tos_aton(const char *src, unsigned *dst)
+{
+	char *e;
+
+	*dst = strtoul(src, &e, 16);
+	if (e == src || *e || *dst > 255)
+		return false;
+
+	return true;
+}
+
 int system_init(void)
 {
 	static struct event_socket rtnl_event;
@@ -253,6 +265,11 @@ static void system_set_disable_ipv6(struct device *dev, const char *val)
 	system_set_dev_sysctl("/proc/sys/net/ipv6/conf/%s/disable_ipv6", dev->ifname, val);
 }
 
+static void system_set_rpfilter(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/proc/sys/net/ipv4/conf/%s/rp_filter", dev->ifname, val);
+}
+
 static int system_get_sysctl(const char *path, char *buf, const size_t buf_sz)
 {
 	int fd = -1, ret = -1;
@@ -287,9 +304,11 @@ static int system_get_disable_ipv6(struct device *dev, char *buf, const size_t b
 			dev->ifname, buf, buf_sz);
 }
 
-#ifndef IFF_LOWER_UP
-#define IFF_LOWER_UP	0x10000
-#endif
+static int system_get_rpfilter(struct device *dev, char *buf, const size_t buf_sz)
+{
+	return system_get_dev_sysctl("/proc/sys/net/ipv4/conf/%s/rp_filter",
+			dev->ifname, buf, buf_sz);
+}
 
 // Evaluate netlink messages
 static int cb_rtnl_event(struct nl_msg *msg, void *arg)
@@ -297,6 +316,8 @@ 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];
 
 	if (nh->nlmsg_type != RTM_NEWLINK)
 		goto out;
@@ -306,11 +327,13 @@ static int cb_rtnl_event(struct nl_msg *msg, void *arg)
 		goto out;
 
 	struct device *dev = device_get(nla_data(nla[IFLA_IFNAME]), false);
-	if (!dev)
+	if (!dev || dev->type->keep_link_status)
 		goto out;
 
-	device_set_ifindex(dev, ifi->ifi_index);
-	device_set_link(dev, ifi->ifi_flags & IFF_LOWER_UP ? true : false);
+	if (!system_get_dev_sysctl("/sys/class/net/%s/carrier", dev->ifname, buf, sizeof(buf)))
+		link_state = strtoul(buf, NULL, 0);
+
+	device_set_link(dev, link_state ? true : false);
 
 out:
 	return 0;
@@ -430,17 +453,18 @@ static bool system_is_bridge(const char *name, char *buf, int buflen)
 static char *system_get_bridge(const char *name, char *buf, int buflen)
 {
 	char *path;
-	ssize_t len;
+	ssize_t len = -1;
 	glob_t gl;
 
 	snprintf(buf, buflen, "/sys/devices/virtual/net/*/brif/%s/bridge", name);
 	if (glob(buf, GLOB_NOSORT, NULL, &gl) < 0)
 		return NULL;
 
-	if (gl.gl_pathc == 0)
-		return NULL;
+	if (gl.gl_pathc > 0)
+		len = readlink(gl.gl_pathv[0], buf, buflen);
+
+	globfree(&gl);
 
-	len = readlink(gl.gl_pathv[0], buf, buflen);
 	if (len < 0)
 		return NULL;
 
@@ -480,7 +504,7 @@ int system_bridge_delif(struct device *bridge, struct device *dev)
 	return system_bridge_if(bridge->ifname, dev, SIOCBRDELIF, NULL);
 }
 
-static int system_if_resolve(struct device *dev)
+int system_if_resolve(struct device *dev)
 {
 	struct ifreq ifr;
 	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
@@ -747,7 +771,6 @@ int system_macvlan_add(struct device *macvlan, struct device *dev, struct macvla
 	struct nl_msg *msg;
 	struct nlattr *linkinfo, *data;
 	struct ifinfomsg iim = { .ifi_family = AF_UNSPEC, };
-	int ifindex = system_if_resolve(dev);
 	int i, rv;
 	static const struct {
 		const char *name;
@@ -759,9 +782,6 @@ int system_macvlan_add(struct device *macvlan, struct device *dev, struct macvla
 		{ "passthru", MACVLAN_MODE_PASSTHRU },
 	};
 
-	if (ifindex == 0)
-		return -ENOENT;
-
 	msg = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL);
 
 	if (!msg)
@@ -772,7 +792,7 @@ int system_macvlan_add(struct device *macvlan, struct device *dev, struct macvla
 	if (cfg->flags & MACVLAN_OPT_MACADDR)
 		nla_put(msg, IFLA_ADDRESS, sizeof(cfg->macaddr), cfg->macaddr);
 	nla_put_string(msg, IFLA_IFNAME, macvlan->ifname);
-	nla_put_u32(msg, IFLA_LINK, ifindex);
+	nla_put_u32(msg, IFLA_LINK, dev->ifindex);
 
 	if (!(linkinfo = nla_nest_start(msg, IFLA_LINKINFO)))
 		goto nla_put_failure;
@@ -864,12 +884,8 @@ int system_vlandev_add(struct device *vlandev, struct device *dev, struct vlande
 	struct nl_msg *msg;
 	struct nlattr *linkinfo, *data;
 	struct ifinfomsg iim = { .ifi_family = AF_UNSPEC };
-	int ifindex = system_if_resolve(dev);
 	int rv;
 
-	if (ifindex == 0)
-		return -ENOENT;
-
 	msg = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL);
 
 	if (!msg)
@@ -877,7 +893,7 @@ 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, ifindex);
+	nla_put_u32(msg, IFLA_LINK, dev->ifindex);
 	
 	if (!(linkinfo = nla_nest_start(msg, IFLA_LINKINFO)))
 		goto nla_put_failure;
@@ -948,6 +964,11 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
 		s->promisc = ifr.ifr_flags & IFF_PROMISC;
 		s->flags |= DEV_OPT_PROMISC;
 	}
+
+	if (!system_get_rpfilter(dev, buf, sizeof(buf))) {
+		s->rpfilter = strtoul(buf, NULL, 0);
+		s->flags |= DEV_OPT_RPFILTER;
+	}
 }
 
 void
@@ -983,13 +1004,18 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
 				    !s->promisc ? IFF_PROMISC : 0) < 0)
 			s->flags &= ~DEV_OPT_PROMISC;
 	}
+	if (s->flags & DEV_OPT_RPFILTER & apply_mask) {
+		char buf[2];
+
+		snprintf(buf, sizeof(buf), "%d", s->rpfilter);
+		system_set_rpfilter(dev, buf);
+	}
 }
 
 int system_if_up(struct device *dev)
 {
 	system_if_get_settings(dev, &dev->orig_settings);
 	system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
-	device_set_ifindex(dev, system_if_resolve(dev));
 	return system_if_flags(dev->ifname, IFF_UP, 0);
 }
 
@@ -1007,6 +1033,10 @@ struct if_check_data {
 	int ret;
 };
 
+#ifndef IFF_LOWER_UP
+#define IFF_LOWER_UP	0x10000
+#endif
+
 static int cb_if_check_valid(struct nl_msg *msg, void *arg)
 {
 	struct nlmsghdr *nh = nlmsg_hdr(msg);
@@ -1498,6 +1528,25 @@ bool system_is_default_rt_table(unsigned int id)
 	return (id == RT_TABLE_MAIN);
 }
 
+bool system_resolve_rpfilter(const char *filter, unsigned int *id)
+{
+	char *e;
+	unsigned int n;
+
+	if (!strcmp(filter, "strict"))
+		n = 1;
+	else if (!strcmp(filter, "loose"))
+		n = 2;
+	else {
+		n = strtoul(filter, &e, 0);
+		if (*e || e == filter || n > 2)
+			return false;
+	}
+
+	*id = n;
+	return true;
+}
+
 static int system_iprule(struct iprule *rule, int cmd)
 {
 	int alen = ((rule->flags & IPRULE_FAMILY) == IPRULE_INET4) ? 4 : 16;
@@ -1709,13 +1758,12 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
 		char *str = blobmsg_get_string(cur);
 		if (strcmp(str, "inherit")) {
 			unsigned uval;
-			char *e;
 
-			uval = strtoul(str, &e, 16);
-			if (e == str || *e || uval > 255) {
+			if (!system_tos_aton(str, &uval)) {
 				ret = -EINVAL;
 				goto failure;
 			}
+
 			if (v6)
 				flowinfo |= htonl(uval << 20) & IP6_FLOWINFO_TCLASS;
 			else
@@ -1814,6 +1862,12 @@ 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;
+		}
+
 		nla_put_u8(nlm, IFLA_GRE_PMTUDISC, set_df ? 1 : 0);
 
 		nla_put_u8(nlm, IFLA_GRE_TOS, tos);
@@ -1842,6 +1896,64 @@ failure:
 }
 #endif
 
+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,
+		.iph = {
+			.version = 4,
+			.ihl = 5,
+			.protocol = proto,
+		}
+	};
+
+	if ((cur = tb[TUNNEL_ATTR_LOCAL]) &&
+			inet_pton(AF_INET, blobmsg_data(cur), &p.iph.saddr) < 1)
+		return -EINVAL;
+
+	if ((cur = tb[TUNNEL_ATTR_REMOTE]) &&
+			inet_pton(AF_INET, blobmsg_data(cur), &p.iph.daddr) < 1)
+		return -EINVAL;
+
+	if ((cur = tb[TUNNEL_ATTR_DF]))
+		set_df = blobmsg_get_bool(cur);
+
+	if ((cur = tb[TUNNEL_ATTR_TTL]))
+		p.iph.ttl = blobmsg_get_u32(cur);
+
+	if ((cur = tb[TUNNEL_ATTR_TOS])) {
+		char *str = blobmsg_get_string(cur);
+		if (strcmp(str, "inherit")) {
+			unsigned uval;
+
+			if (!system_tos_aton(str, &uval))
+				return -EINVAL;
+
+			p.iph.tos = uval;
+		} else
+			p.iph.tos = 1;
+	}
+
+	p.iph.frag_off = set_df ? htons(IP_DF) : 0;
+	/* ttl !=0 and nopmtudisc are incompatible */
+	if (p.iph.ttl && p.iph.frag_off == 0)
+		return -EINVAL;
+
+	strncpy(p.name, name, sizeof(p.name));
+
+	switch (p.iph.protocol) {
+	case IPPROTO_IPIP:
+		return tunnel_ioctl("tunl0", SIOCADDTUNNEL, &p);
+	case IPPROTO_IPV6:
+		return tunnel_ioctl("sit0", SIOCADDTUNNEL, &p);
+	default:
+		break;
+	}
+	return -1;
+}
+
 static int __system_del_ip_tunnel(const char *name, struct blob_attr **tb)
 {
 	struct blob_attr *cur;
@@ -1899,7 +2011,6 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
 {
 	struct blob_attr *tb[__TUNNEL_ATTR_MAX];
 	struct blob_attr *cur;
-	bool set_df = true;
 	const char *str;
 
 	blobmsg_parse(tunnel_attr_list.params, __TUNNEL_ATTR_MAX, tb,
@@ -1911,13 +2022,10 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
 		return -EINVAL;
 	str = blobmsg_data(cur);
 
-	if ((cur = tb[TUNNEL_ATTR_DF]))
-		set_df = blobmsg_get_bool(cur);
-
 	unsigned int ttl = 0;
 	if ((cur = tb[TUNNEL_ATTR_TTL])) {
 		ttl = blobmsg_get_u32(cur);
-		if (ttl > 255 || (!set_df && ttl))
+		if (ttl > 255)
 			return -EINVAL;
 	}
 
@@ -1932,27 +2040,7 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
 	}
 
 	if (!strcmp(str, "sit")) {
-		struct ip_tunnel_parm p = {
-			.link = link,
-			.iph = {
-				.version = 4,
-				.ihl = 5,
-				.frag_off = set_df ? htons(IP_DF) : 0,
-				.protocol = IPPROTO_IPV6,
-				.ttl = ttl
-			}
-		};
-
-		if ((cur = tb[TUNNEL_ATTR_LOCAL]) &&
-				inet_pton(AF_INET, blobmsg_data(cur), &p.iph.saddr) < 1)
-			return -EINVAL;
-
-		if ((cur = tb[TUNNEL_ATTR_REMOTE]) &&
-				inet_pton(AF_INET, blobmsg_data(cur), &p.iph.daddr) < 1)
-			return -EINVAL;
-
-		strncpy(p.name, name, sizeof(p.name));
-		if (tunnel_ioctl("sit0", SIOCADDTUNNEL, &p) < 0)
+		if (system_add_proto_tunnel(name, IPPROTO_IPV6, link, tb) < 0)
 			return -1;
 
 #ifdef SIOCADD6RD
@@ -2092,6 +2180,8 @@ failure:
 	} else if (!strcmp(str, "gretapip6")) {
 		return system_add_gre_tunnel(name, "ip6gretap", link, tb, true);
 #endif
+	} else if (!strcmp(str, "ipip")) {
+		return system_add_proto_tunnel(name, IPPROTO_IPIP, link, tb);
 	}
 	else
 		return -EINVAL;