X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=21385fc767b971c18fb5e237995e00bd4a5a504d;hp=ed69bef015055ffeabbb3a4aa927cb00b32cda57;hb=3eea8576d48d9b20cc1c6b46f54c7345a39d13aa;hpb=25289c946427db676d41c0fa4e6c01ade2f43b66

diff --git a/system-linux.c b/system-linux.c
index ed69bef..21385fc 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -43,6 +43,10 @@
 #define RTN_FAILED_POLICY 12
 #endif
 
+#ifndef RT_TABLE_PRELOCAL
+#define RT_TABLE_PRELOCAL 128
+#endif
+
 #include <string.h>
 #include <fcntl.h>
 #include <glob.h>
@@ -275,6 +279,26 @@ 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 void system_set_igmpversion(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/proc/sys/net/ipv4/conf/%s/force_igmp_version", dev->ifname, val);
+}
+
+static void system_set_mldversion(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/proc/sys/net/ipv6/conf/%s/force_mld_version", dev->ifname, val);
+}
+
+static void system_set_neigh4reachabletime(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/proc/sys/net/ipv4/neigh/%s/base_reachable_time_ms", dev->ifname, val);
+}
+
+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 int system_get_sysctl(const char *path, char *buf, const size_t buf_sz)
 {
 	int fd = -1, ret = -1;
@@ -321,6 +345,30 @@ static int system_get_acceptlocal(struct device *dev, char *buf, const size_t bu
 			dev->ifname, buf, buf_sz);
 }
 
+static int system_get_igmpversion(struct device *dev, char *buf, const size_t buf_sz)
+{
+	return system_get_dev_sysctl("/proc/sys/net/ipv4/conf/%s/force_igmp_version",
+			dev->ifname, buf, buf_sz);
+}
+
+static int system_get_mldversion(struct device *dev, char *buf, const size_t buf_sz)
+{
+	return system_get_dev_sysctl("/proc/sys/net/ipv6/conf/%s/force_mld_version",
+			dev->ifname, buf, buf_sz);
+}
+
+static int system_get_neigh4reachabletime(struct device *dev, char *buf, const size_t buf_sz)
+{
+	return system_get_dev_sysctl("/proc/sys/net/ipv4/neigh/%s/base_reachable_time_ms",
+			dev->ifname, buf, buf_sz);
+}
+
+static int system_get_neigh6reachabletime(struct device *dev, char *buf, const size_t buf_sz)
+{
+	return system_get_dev_sysctl("/proc/sys/net/ipv6/neigh/%s/base_reachable_time_ms",
+			dev->ifname, buf, buf_sz);
+}
+
 // Evaluate netlink messages
 static int cb_rtnl_event(struct nl_msg *msg, void *arg)
 {
@@ -985,6 +1033,26 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
 		s->acceptlocal = strtoul(buf, NULL, 0);
 		s->flags |= DEV_OPT_ACCEPTLOCAL;
 	}
+
+	if (!system_get_igmpversion(dev, buf, sizeof(buf))) {
+		s->igmpversion = strtoul(buf, NULL, 0);
+		s->flags |= DEV_OPT_IGMPVERSION;
+	}
+
+	if (!system_get_mldversion(dev, buf, sizeof(buf))) {
+		s->mldversion = strtoul(buf, NULL, 0);
+		s->flags |= DEV_OPT_MLDVERSION;
+	}
+
+	if (!system_get_neigh4reachabletime(dev, buf, sizeof(buf))) {
+		s->neigh4reachabletime = strtoul(buf, NULL, 0);
+		s->flags |= DEV_OPT_NEIGHREACHABLETIME;
+	}
+
+	if (!system_get_neigh6reachabletime(dev, buf, sizeof(buf))) {
+		s->neigh6reachabletime = strtoul(buf, NULL, 0);
+		s->flags |= DEV_OPT_NEIGHREACHABLETIME;
+	}
 }
 
 void
@@ -1028,11 +1096,33 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
 	}
 	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);
+		system_set_igmpversion(dev, buf);
+	}
+	if (s->flags & DEV_OPT_MLDVERSION & apply_mask) {
+		char buf[2];
+
+		snprintf(buf, sizeof(buf), "%d", 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);
+		system_set_neigh4reachabletime(dev, buf);
+		snprintf(buf, sizeof(buf), "%d", s->neigh6reachabletime);
+		system_set_neigh6reachabletime(dev, buf);
+	}
 }
 
 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);
 }
@@ -1040,7 +1130,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;
 }
@@ -1521,6 +1610,8 @@ bool system_resolve_rt_table(const char *name, unsigned int *id)
 		table = RT_TABLE_MAIN;
 	else if (!strcmp(name, "local"))
 		table = RT_TABLE_LOCAL;
+	else if (!strcmp(name, "prelocal"))
+		table = RT_TABLE_PRELOCAL;
 
 	/* try to look up name in /etc/iproute2/rt_tables */
 	else if ((f = fopen("/etc/iproute2/rt_tables", "r")) != NULL)
@@ -1682,6 +1773,10 @@ int system_flush_iprules(void)
 	rule.flags = IPRULE_INET4 | IPRULE_PRIORITY | IPRULE_LOOKUP;
 
 	rule.priority = 0;
+	rule.lookup = RT_TABLE_PRELOCAL;
+	rv |= system_iprule(&rule, RTM_NEWRULE);
+
+	rule.priority = 1;
 	rule.lookup = RT_TABLE_LOCAL;
 	rv |= system_iprule(&rule, RTM_NEWRULE);
 
@@ -1697,6 +1792,10 @@ int system_flush_iprules(void)
 	rule.flags = IPRULE_INET6 | IPRULE_PRIORITY | IPRULE_LOOKUP;
 
 	rule.priority = 0;
+	rule.lookup = RT_TABLE_PRELOCAL;
+	rv |= system_iprule(&rule, RTM_NEWRULE);
+
+	rule.priority = 1;
 	rule.lookup = RT_TABLE_LOCAL;
 	rv |= system_iprule(&rule, RTM_NEWRULE);