X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=system-linux.c;h=fb2ee29d2d8e216adf76163318e6da0fcc7590dc;hb=7ac29b75319fd69a8a7c0aeea7804d381ec07d3d;hp=7beae0913bbcdda9c4b2d8990a66810142367451;hpb=7c5d82806c11886bcc08821584fe51790a593feb;p=project%2Fnetifd.git

diff --git a/system-linux.c b/system-linux.c
index 7beae09..fb2ee29 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -280,6 +280,21 @@ 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;
@@ -332,6 +347,24 @@ static int system_get_igmpversion(struct device *dev, char *buf, const size_t bu
 			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)
 {
@@ -1001,6 +1034,21 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
 		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
@@ -1050,6 +1098,20 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
 		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)
@@ -1597,18 +1659,6 @@ bool system_resolve_rpfilter(const char *filter, unsigned int *id)
 	return true;
 }
 
-bool system_resolve_igmpversion(const unsigned int version, unsigned int *id)
-{
-	if (!version || version > 3)
-		return false;
-
-	*id = version;
-	if (*id == 3)
-		*id = 0;
-
-	return true;
-}
-
 static int system_iprule(struct iprule *rule, int cmd)
 {
 	int alen = ((rule->flags & IPRULE_FAMILY) == IPRULE_INET4) ? 4 : 16;