netifd: Add option to configure locktime for each device

The UCI parameter neighlocktime allows to control the hardware
address to IP mapping lock time in the IPv4 neighbour table.

The IPv6 lock time was not set because it is not used at all in any
kernel versions, hardware address override being controlled in this case
by the override flag present in the NA packet.

Signed-off-by: Alin Nastac <alin.nastac@gmail.com>

1 files changed, 20 insertions, 0 deletions

diff --git a/system-linux.c b/system-linux.c
index e0cb5bc..f4d6c25 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -316,6 +316,11 @@ 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_neigh4locktime(struct device *dev, const char *val)
+{
+	system_set_dev_sysctl("/proc/sys/net/ipv4/neigh/%s/locktime", 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);
@@ -484,6 +489,12 @@ static int system_get_neigh6gcstaletime(struct device *dev, char *buf, const siz
 			dev->ifname, buf, buf_sz);
 }
 
+static int system_get_neigh4locktime(struct device *dev, char *buf, const size_t buf_sz)
+{
+	return system_get_dev_sysctl("/proc/sys/net/ipv4/neigh/%s/locktime",
+			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",
@@ -1345,6 +1356,11 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
 		s->flags |= DEV_OPT_NEIGHREACHABLETIME;
 	}
 
+	if (!system_get_neigh4locktime(dev, buf, sizeof(buf))) {
+		s->neigh4locktime = strtoul(buf, NULL, 0);
+		s->flags |= DEV_OPT_NEIGHLOCKTIME;
+	}
+
 	if (!system_get_neigh4gcstaletime(dev, buf, sizeof(buf))) {
 		s->neigh4gcstaletime = strtoul(buf, NULL, 0);
 		s->flags |= DEV_OPT_NEIGHGCSTALETIME;
@@ -1454,6 +1470,10 @@ 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_NEIGHLOCKTIME & apply_mask) {
+		snprintf(buf, sizeof(buf), "%d", s->neigh4locktime);
+		system_set_neigh4locktime(dev, buf);
+	}
 	if (s->flags & DEV_OPT_NEIGHGCSTALETIME & apply_mask) {
 		snprintf(buf, sizeof(buf), "%d", s->neigh4gcstaletime);
 		system_set_neigh4gcstaletime(dev, buf);