X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=4662bf814f80d8e47fe147bd5400b95926ad023e;hp=6a6028c7e64ce3be76ecad022d4feb21396e4565;hb=9d8dd091f8f336b111364ed211165b5ec9842a24;hpb=fe08cfd2bfb389f7c174e2dd1561ba4a381db213

diff --git a/system-linux.c b/system-linux.c
index 6a6028c..4662bf8 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -265,6 +265,16 @@ 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 void system_set_acceptlocal(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/proc/sys/net/ipv4/conf/%s/accept_local", dev->ifname, val);
+}
+
 static int system_get_sysctl(const char *path, char *buf, const size_t buf_sz)
 {
 	int fd = -1, ret = -1;
@@ -299,6 +309,18 @@ static int system_get_disable_ipv6(struct device *dev, char *buf, const size_t b
 			dev->ifname, buf, buf_sz);
 }
 
+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);
+}
+
+static int system_get_acceptlocal(struct device *dev, char *buf, const size_t buf_sz)
+{
+	return system_get_dev_sysctl("/proc/sys/net/ipv4/conf/%s/accept_local",
+			dev->ifname, buf, buf_sz);
+}
+
 // Evaluate netlink messages
 static int cb_rtnl_event(struct nl_msg *msg, void *arg)
 {
@@ -760,7 +782,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;
@@ -772,9 +793,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)
@@ -785,7 +803,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;
@@ -877,12 +895,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)
@@ -890,7 +904,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;
@@ -961,6 +975,16 @@ 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;
+	}
+
+	if (!system_get_acceptlocal(dev, buf, sizeof(buf))) {
+		s->acceptlocal = strtoul(buf, NULL, 0);
+		s->flags |= DEV_OPT_ACCEPTLOCAL;
+	}
 }
 
 void
@@ -996,11 +1020,21 @@ 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);
+	}
+	if (s->flags & DEV_OPT_ACCEPTLOCAL & apply_mask)
+		system_set_acceptlocal(dev, s->acceptlocal ? "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.flags &= dev->settings.flags;
 	system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
 	return system_if_flags(dev->ifname, IFF_UP, 0);
 }
@@ -1008,7 +1042,6 @@ int system_if_up(struct device *dev)
 int system_if_down(struct device *dev)
 {
 	int ret = system_if_flags(dev->ifname, 0, IFF_UP);
-	dev->orig_settings.flags &= dev->settings.flags;
 	system_if_apply_settings(dev, &dev->orig_settings, dev->orig_settings.flags);
 	return ret;
 }
@@ -1380,11 +1413,16 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
 				rtm.rtm_table = RT_TABLE_LOCAL;
 		}
 
-		if (rtm.rtm_type == RTN_LOCAL || rtm.rtm_type == RTN_NAT)
+		if (rtm.rtm_type == RTN_LOCAL || rtm.rtm_type == RTN_NAT) {
 			rtm.rtm_scope = RT_SCOPE_HOST;
-		else if (rtm.rtm_type == RTN_BROADCAST || rtm.rtm_type == RTN_MULTICAST ||
-			rtm.rtm_type == RTN_ANYCAST)
+		} else if (rtm.rtm_type == RTN_BROADCAST || rtm.rtm_type == RTN_MULTICAST ||
+				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_scope = RT_SCOPE_UNIVERSE;
+			dev = NULL;
+		}
 	}
 
 	msg = nlmsg_alloc_simple(cmd, flags);
@@ -1396,8 +1434,12 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
 	if (route->mask)
 		nla_put(msg, RTA_DST, alen, &route->addr);
 
-	if (route->sourcemask)
-		nla_put(msg, RTA_SRC, alen, &route->source);
+	if (route->sourcemask) {
+		if (rtm.rtm_family == AF_INET)
+			nla_put(msg, RTA_PREFSRC, alen, &route->source);
+		else
+			nla_put(msg, RTA_SRC, alen, &route->source);
+	}
 
 	if (route->metric > 0)
 		nla_put_u32(msg, RTA_PRIORITY, route->metric);
@@ -1514,6 +1556,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;