X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=d868c15debe82b96ff4b572556aa6f98c9da9009;hp=621f99b3fd6984412aeac47ef26a53370b7b321a;hb=c007f08413edc15805c248a8d65f075bb5fb0bdd;hpb=a0e96d0bdad7e39590ffc8dcb46935f35ee55284

diff --git a/system-linux.c b/system-linux.c
index 621f99b..d868c15 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -306,6 +306,16 @@ 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_dadtransmits(struct device *dev, const char *val)
 {
 	system_set_dev_sysctl("/proc/sys/net/ipv6/conf/%s/dad_transmits", dev->ifname, val);
@@ -452,6 +462,18 @@ 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_dadtransmits(struct device *dev, char *buf, const size_t buf_sz)
 {
 	return system_get_dev_sysctl("/proc/sys/net/ipv6/conf/%s/dad_transmits",
@@ -473,7 +495,7 @@ static int cb_rtnl_event(struct nl_msg *msg, void *arg)
 	if (!nla[IFLA_IFNAME])
 		goto out;
 
-	struct device *dev = device_get(nla_data(nla[IFLA_IFNAME]), false);
+	struct device *dev = device_find(nla_data(nla[IFLA_IFNAME]));
 	if (!dev)
 		goto out;
 
@@ -526,7 +548,7 @@ handle_hotplug_msg(char *data, int size)
 	return;
 
 found:
-	dev = device_get(interface, false);
+	dev = device_find(interface);
 	if (!dev)
 		return;
 
@@ -1243,6 +1265,16 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
 		s->flags |= DEV_OPT_NEIGHREACHABLETIME;
 	}
 
+	if (!system_get_neigh4gcstaletime(dev, buf, sizeof(buf))) {
+		s->neigh4gcstaletime = strtoul(buf, NULL, 0);
+		s->flags |= DEV_OPT_NEIGHGCSTALETIME;
+	}
+
+	if (!system_get_neigh6gcstaletime(dev, buf, sizeof(buf))) {
+		s->neigh6gcstaletime = strtoul(buf, NULL, 0);
+		s->flags |= DEV_OPT_NEIGHGCSTALETIME;
+	}
+
 	if (!system_get_dadtransmits(dev, buf, sizeof(buf))) {
 		s->dadtransmits = strtoul(buf, NULL, 0);
 		s->flags |= DEV_OPT_DADTRANSMITS;
@@ -1337,6 +1369,12 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
 		snprintf(buf, sizeof(buf), "%d", s->neigh6reachabletime);
 		system_set_neigh6reachabletime(dev, buf);
 	}
+	if (s->flags & DEV_OPT_NEIGHGCSTALETIME & apply_mask) {
+		snprintf(buf, sizeof(buf), "%d", s->neigh4gcstaletime);
+		system_set_neigh4gcstaletime(dev, buf);
+		snprintf(buf, sizeof(buf), "%d", s->neigh6gcstaletime);
+		system_set_neigh6gcstaletime(dev, buf);
+	}
 	if (s->flags & DEV_OPT_DADTRANSMITS & apply_mask) {
 		snprintf(buf, sizeof(buf), "%d", s->dadtransmits);
 		system_set_dadtransmits(dev, buf);