system-linux.c: use uin64_t datatype to read and store interface statistics, pass...

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

diff --git a/system-linux.c b/system-linux.c
index c7b8b8f..3175d92 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -154,7 +154,7 @@ static void system_set_sysctl(const char *path, const char *val)
 
 static void system_set_dev_sysctl(const char *path, const char *device, const char *val)
 {
-       snprintf(dev_buf, sizeof(dev_buf), path, val);
+       snprintf(dev_buf, sizeof(dev_buf), path, device);
        system_set_sysctl(dev_buf, val);
 }
 
@@ -235,6 +235,9 @@ found:
        if (dev->type != &simple_device_type)
                return;
 
+       if (add && system_if_force_external(dev->ifname))
+               return;
+
        device_set_present(dev, add);
 }
 
@@ -275,6 +278,8 @@ int system_bridge_delbr(struct device *bridge)
 static int system_bridge_if(const char *bridge, struct device *dev, int cmd, void *data)
 {
        struct ifreq ifr;
+
+       memset(&ifr, 0, sizeof(ifr));
        if (dev)
                ifr.ifr_ifindex = dev->ifindex;
        else
@@ -350,6 +355,8 @@ static int system_if_resolve(struct device *dev)
 static int system_if_flags(const char *ifname, unsigned add, unsigned rem)
 {
        struct ifreq ifr;
+
+       memset(&ifr, 0, sizeof(ifr));
        strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
        ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr);
        ifr.ifr_flags |= add;
@@ -375,8 +382,13 @@ static bool check_ifaddr(struct nlmsghdr *hdr, int ifindex)
 
 static bool check_route(struct nlmsghdr *hdr, int ifindex)
 {
+       struct rtmsg *r = NLMSG_DATA(hdr);
        struct nlattr *tb[__RTA_MAX];
 
+       if (r->rtm_protocol == RTPROT_KERNEL &&
+           r->rtm_family == AF_INET6)
+               return false;
+
        nlmsg_parse(hdr, sizeof(struct rtmsg), tb, __RTA_MAX - 1, NULL);
        if (!tb[RTA_OIF])
                return false;
@@ -625,7 +637,7 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
        }
 }
 
-static void
+void
 system_if_apply_settings(struct device *dev, struct device_settings *s)
 {
        struct ifreq ifr;
@@ -642,7 +654,7 @@ system_if_apply_settings(struct device *dev, struct device_settings *s)
                if (ioctl(sock_ioctl, SIOCSIFTXQLEN, &ifr) < 0)
                        s->flags &= ~DEV_OPT_TXQUEUELEN;
        }
-       if (s->flags & DEV_OPT_MACADDR) {
+       if ((s->flags & DEV_OPT_MACADDR) && !dev->external) {
                ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
                memcpy(&ifr.ifr_hwaddr.sa_data, s->macaddr, sizeof(s->macaddr));
                if (ioctl(sock_ioctl, SIOCSIFHWADDR, &ifr) < 0)
@@ -735,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;
 }
@@ -769,6 +781,16 @@ static void system_add_link_modes(struct blob_buf *b, __u32 mask)
        }
 }
 
+bool
+system_if_force_external(const char *ifname)
+{
+       char buf[64];
+       struct stat s;
+
+       snprintf(buf, sizeof(buf), "/sys/class/net/%s/phy80211", ifname);
+       return stat(buf, &s) == 0;
+}
+
 int
 system_if_dump_info(struct device *dev, struct blob_buf *b)
 {
@@ -776,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));
@@ -824,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);
@@ -832,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;
@@ -899,7 +923,7 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
                .rtm_family = (alen == 4) ? AF_INET : AF_INET6,
                .rtm_dst_len = route->mask,
                .rtm_table = RT_TABLE_MAIN,
-               .rtm_protocol = (route->flags & DEVADDR_KERNEL) ? RTPROT_KERNEL : RTPROT_BOOT,
+               .rtm_protocol = (route->flags & DEVADDR_KERNEL) ? RTPROT_KERNEL : RTPROT_STATIC,
                .rtm_scope = scope,
                .rtm_type = (cmd == RTM_DELROUTE) ? 0: RTN_UNICAST,
        };
@@ -1016,7 +1040,7 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
        struct blob_attr *cur;
        struct ip_tunnel_parm p;
        const char *base, *str;
-       int cmd = SIOCADDTUNNEL;
+       bool is_sit;
 
        system_del_ip_tunnel(name);
 
@@ -1025,12 +1049,12 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
        blobmsg_parse(tunnel_attr_list.params, __TUNNEL_ATTR_MAX, tb,
                blob_data(attr), blob_len(attr));
 
-       cur = tb[TUNNEL_ATTR_TYPE];
-       if (!cur)
+       if (!(cur = tb[TUNNEL_ATTR_TYPE]))
                return -EINVAL;
-
        str = blobmsg_data(cur);
-       if (!strcmp(str, "sit")) {
+       is_sit = !strcmp(str, "sit");
+
+       if (is_sit) {
                p.iph.protocol = IPPROTO_IPV6;
                base = "sit0";
        } else
@@ -1052,5 +1076,35 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
        }
 
        strncpy(p.name, name, sizeof(p.name));
-       return tunnel_ioctl(base, cmd, &p);
+       if (tunnel_ioctl(base, SIOCADDTUNNEL, &p) < 0)
+               return -1;
+
+#ifdef SIOCADD6RD
+       cur = tb[TUNNEL_ATTR_6RD_PREFIX];
+       if (cur && is_sit) {
+               unsigned int mask;
+               struct ip_tunnel_6rd p6;
+
+               memset(&p6, 0, sizeof(p6));
+
+               if (!parse_ip_and_netmask(AF_INET6, blobmsg_data(cur),
+                                       &p6.prefix, &mask) || mask > 128)
+                       return -EINVAL;
+               p6.prefixlen = mask;
+
+               if ((cur = tb[TUNNEL_ATTR_6RD_RELAY_PREFIX])) {
+                       if (!parse_ip_and_netmask(AF_INET, blobmsg_data(cur),
+                                               &p6.relay_prefix, &mask) || mask > 32)
+                               return -EINVAL;
+                       p6.relay_prefixlen = mask;
+               }
+
+               if (tunnel_ioctl(name, SIOCADD6RD, &p6) < 0) {
+                       system_del_ip_tunnel(name);
+                       return -1;
+               }
+       }
+#endif
+
+       return 0;
 }