Only update resolv.conf if changed (avoid logspam)

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

diff --git a/system-linux.c b/system-linux.c
index eb73e95..8345e5d 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -747,14 +747,14 @@ retry:
 }
 
 static bool
-read_int_file(int dir_fd, const char *file, int *val)
+read_uint64_file(int dir_fd, const char *file, uint64_t *val)
 {
        char buf[64];
        bool ret = false;
 
        ret = read_string_file(dir_fd, file, buf, sizeof(buf));
        if (ret)
-               *val = strtoul(buf, NULL, 0);
+               *val = strtoull(buf, NULL, 0);
 
        return ret;
 }
@@ -798,12 +798,13 @@ system_if_dump_info(struct device *dev, struct blob_buf *b)
        struct ifreq ifr;
        char buf[64], *s;
        void *c;
-       int dir_fd, val = 0;
+       int dir_fd;
+       uint64_t val = 0;
 
        snprintf(buf, sizeof(buf), "/sys/class/net/%s", dev->ifname);
        dir_fd = open(buf, O_DIRECTORY);
 
-       if (read_int_file(dir_fd, "carrier", &val))
+       if (read_uint64_file(dir_fd, "carrier", &val))
                blobmsg_add_u8(b, "link", !!val);
 
        memset(&ecmd, 0, sizeof(ecmd));
@@ -846,7 +847,8 @@ system_if_dump_stats(struct device *dev, struct blob_buf *b)
        };
        char buf[64];
        int stats_dir;
-       int i, val = 0;
+       int i;
+       uint64_t val = 0;
 
        snprintf(buf, sizeof(buf), "/sys/class/net/%s/statistics", dev->ifname);
        stats_dir = open(buf, O_DIRECTORY);
@@ -854,8 +856,8 @@ system_if_dump_stats(struct device *dev, struct blob_buf *b)
                return -1;
 
        for (i = 0; i < ARRAY_SIZE(counters); i++)
-               if (read_int_file(stats_dir, counters[i], &val))
-                       blobmsg_add_u32(b, counters[i], val);
+               if (read_uint64_file(stats_dir, counters[i], &val))
+                       blobmsg_add_u64(b, counters[i], val);
 
        close(stats_dir);
        return 0;
@@ -865,6 +867,7 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
 {
        bool v4 = ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4);
        int alen = v4 ? 4 : 16;
+       unsigned int flags = 0;
        struct ifaddrmsg ifa = {
                .ifa_family = (alen == 4) ? AF_INET : AF_INET6,
                .ifa_prefixlen = addr->mask,
@@ -872,8 +875,10 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
        };
 
        struct nl_msg *msg;
+       if (cmd == RTM_NEWADDR)
+               flags |= NLM_F_CREATE | NLM_F_REPLACE;
 
-       msg = nlmsg_alloc_simple(cmd, 0);
+       msg = nlmsg_alloc_simple(cmd, flags);
        if (!msg)
                return -1;
 
@@ -884,6 +889,27 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
                        nla_put_u32(msg, IFA_BROADCAST, addr->broadcast);
                if (addr->point_to_point)
                        nla_put_u32(msg, IFA_ADDRESS, addr->point_to_point);
+       } else {
+               time_t now = system_get_rtime();
+               struct ifa_cacheinfo cinfo = {0xffffffffU, 0xffffffffU, 0, 0};
+
+               if (addr->preferred_until) {
+                       int preferred = addr->preferred_until - now;
+                       if (preferred < 0)
+                               preferred = 0;
+
+                       cinfo.ifa_prefered = preferred;
+               }
+
+               if (addr->valid_until) {
+                       int valid = addr->valid_until - now;
+                       if (valid <= 0)
+                               return -1;
+
+                       cinfo.ifa_valid = valid;
+               }
+
+               nla_put(msg, IFA_CACHEINFO, sizeof(cinfo), &cinfo);
        }
 
        return system_rtnl_call(msg);
@@ -904,7 +930,6 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
        int alen = ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET4) ? 4 : 16;
        bool have_gw;
        unsigned int flags = 0;
-       int ifindex = dev->ifindex;
 
        if (alen == 4)
                have_gw = !!route->nexthop.in.s_addr;
@@ -927,9 +952,15 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
        };
        struct nl_msg *msg;
 
-       if (cmd == RTM_NEWROUTE)
+       if (cmd == RTM_NEWROUTE) {
                flags |= NLM_F_CREATE | NLM_F_REPLACE;
 
+               if (!dev) { // Add null-route
+                       rtm.rtm_scope = RT_SCOPE_UNIVERSE;
+                       rtm.rtm_type = RTN_UNREACHABLE;
+               }
+       }
+
        msg = nlmsg_alloc_simple(cmd, flags);
        if (!msg)
                return -1;
@@ -945,7 +976,8 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
        if (have_gw)
                nla_put(msg, RTA_GATEWAY, alen, &route->nexthop);
 
-       nla_put_u32(msg, RTA_OIF, ifindex);
+       if (dev)
+               nla_put_u32(msg, RTA_OIF, dev->ifindex);
 
        return system_rtnl_call(msg);
 }
@@ -1023,6 +1055,33 @@ int system_del_ip_tunnel(const char *name)
        return tunnel_ioctl(name, SIOCDELTUNNEL, &p);
 }
 
+int system_update_ipv6_mtu(struct device *dev, int mtu)
+{
+       int ret = -1;
+       char buf[64];
+       snprintf(buf, sizeof(buf), "/proc/sys/net/ipv6/conf/%s/mtu",
+                       dev->ifname);
+
+       int fd = open(buf, O_RDWR);
+       ssize_t len = read(fd, buf, sizeof(buf) - 1);
+       if (len < 0)
+               goto out;
+
+       buf[len] = 0;
+       ret = atoi(buf);
+
+       if (!mtu || ret <= mtu)
+               goto out;
+
+       lseek(fd, 0, SEEK_SET);
+       if (write(fd, buf, snprintf(buf, sizeof(buf), "%i", mtu)) <= 0)
+               ret = -1;
+
+out:
+       close(fd);
+       return ret;
+}
+
 static int parse_ipaddr(struct blob_attr *attr, __be32 *addr)
 {
        if (!attr)