netifd: Add sendredirects config support

[project/netifd.git] / system-linux.c

diff --git a/system-linux.c b/system-linux.c
index 6e4a1949a11874443e05d45ebf41e916fcf23219..2f15bf1dbab92411087884a80c7b544948cf8a39 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -397,6 +397,11 @@ static void system_bridge_set_unicast_flood(struct device *dev, const char *val)
        system_set_dev_sysctl("/sys/class/net/%s/brport/unicast_flood", dev->ifname, val);
 }
 
+static void system_set_sendredirects(struct device *dev, const char *val)
+{
+       system_set_dev_sysctl("/proc/sys/net/ipv4/conf/%s/send_redirects", dev->ifname, val);
+}
+
 static int system_get_sysctl(const char *path, char *buf, const size_t buf_sz)
 {
        int fd = -1, ret = -1;
@@ -485,6 +490,12 @@ static int system_get_dadtransmits(struct device *dev, char *buf, const size_t b
                        dev->ifname, buf, buf_sz);
 }
 
+static int system_get_sendredirects(struct device *dev, char *buf, const size_t buf_sz)
+{
+       return system_get_dev_sysctl("/proc/sys/net/ipv4/conf/%s/send_redirects",
+                       dev->ifname, buf, buf_sz);
+}
+
 // Evaluate netlink messages
 static int cb_rtnl_event(struct nl_msg *msg, void *arg)
 {
@@ -1288,6 +1299,11 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
                s->dadtransmits = strtoul(buf, NULL, 0);
                s->flags |= DEV_OPT_DADTRANSMITS;
        }
+
+       if (!system_get_sendredirects(dev, buf, sizeof(buf))) {
+               s->sendredirects = strtoul(buf, NULL, 0);
+               s->flags |= DEV_OPT_SENDREDIRECTS;
+       }
 }
 
 static void
@@ -1393,6 +1409,8 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
                                    !s->multicast ? IFF_MULTICAST : 0) < 0)
                        s->flags &= ~DEV_OPT_MULTICAST;
        }
+       if (s->flags & DEV_OPT_SENDREDIRECTS & apply_mask)
+               system_set_sendredirects(dev, s->sendredirects ? "1" : "0");
 
        system_if_apply_rps_xps(dev, s);
 }
@@ -2127,7 +2145,7 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
        uint32_t ikey = 0, okey = 0, flags = 0, flowinfo = 0;
        uint16_t iflags = 0, oflags = 0;
        uint8_t tos = 0;
-       int ret = 0, ttl = 64;
+       int ret = 0, ttl = 0;
 
        nlm = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_REPLACE | NLM_F_CREATE);
        if (!nlm)
@@ -2155,8 +2173,6 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
        if ((cur = tb[TUNNEL_ATTR_TTL]))
                ttl = blobmsg_get_u32(cur);
 
-       nla_put_u8(nlm, IFLA_GRE_TTL, ttl);
-
        if ((cur = tb[TUNNEL_ATTR_TOS])) {
                char *str = blobmsg_get_string(cur);
                if (strcmp(str, "inherit")) {
@@ -2230,6 +2246,9 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
 
                if (flags)
                        nla_put_u32(nlm, IFLA_GRE_FLAGS, flags);
+
+               if (!ttl)
+                       ttl = 64;
        } else {
                struct in_addr inbuf;
                bool set_df = true;
@@ -2265,17 +2284,23 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
                if ((cur = tb[TUNNEL_ATTR_DF]))
                        set_df = blobmsg_get_bool(cur);
 
-               /* ttl !=0 and nopmtudisc are incompatible */
-               if (ttl && !set_df) {
-                       ret = -EINVAL;
-                       goto failure;
-               }
+               if (!set_df) {
+                       /* ttl != 0 and nopmtudisc are incompatible */
+                       if (ttl) {
+                               ret = -EINVAL;
+                               goto failure;
+                       }
+               } else if (!ttl)
+                       ttl = 64;
 
                nla_put_u8(nlm, IFLA_GRE_PMTUDISC, set_df ? 1 : 0);
 
                nla_put_u8(nlm, IFLA_GRE_TOS, tos);
        }
 
+       if (ttl)
+               nla_put_u8(nlm, IFLA_GRE_TTL, ttl);
+
        if (oflags)
                nla_put_u16(nlm, IFLA_GRE_OFLAGS, oflags);
 
@@ -2485,10 +2510,14 @@ int system_update_ipv6_mtu(struct device *dev, int mtu)
 {
        int ret = -1;
        char buf[64];
+       int fd;
+
        snprintf(buf, sizeof(buf), "/proc/sys/net/ipv6/conf/%s/mtu",
                        dev->ifname);
 
-       int fd = open(buf, O_RDWR);
+       fd = open(buf, O_RDWR);
+       if (fd < 0)
+               return ret;
 
        if (!mtu) {
                ssize_t len = read(fd, buf, sizeof(buf) - 1);