move broadcast address handling to the core

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

diff --git a/system-linux.c b/system-linux.c
index 2150c44..28029c1 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -570,37 +570,66 @@ int system_vlan_del(struct device *dev)
 }
 
 static void
-system_if_apply_settings(struct device *dev)
+system_if_get_settings(struct device *dev, struct device_settings *s)
 {
        struct ifreq ifr;
 
        memset(&ifr, 0, sizeof(ifr));
        strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
-       if (dev->flags & DEV_OPT_MTU) {
-               ifr.ifr_mtu = dev->mtu;
-               ioctl(sock_ioctl, SIOCSIFMTU, &ifr);
+
+       if (ioctl(sock_ioctl, SIOCGIFMTU, &ifr) == 0) {
+               s->mtu = ifr.ifr_mtu;
+               s->flags |= DEV_OPT_MTU;
        }
-       if (dev->flags & DEV_OPT_TXQUEUELEN) {
-               ifr.ifr_qlen = dev->txqueuelen;
-               ioctl(sock_ioctl, SIOCSIFTXQLEN, &ifr);
+
+       if (ioctl(sock_ioctl, SIOCGIFTXQLEN, &ifr) == 0) {
+               s->txqueuelen = ifr.ifr_qlen;
+               s->flags |= DEV_OPT_TXQUEUELEN;
        }
-       if (dev->flags & DEV_OPT_MACADDR) {
-               memcpy(&ifr.ifr_hwaddr, dev->macaddr, sizeof(dev->macaddr));
-               ioctl(sock_ioctl, SIOCSIFHWADDR, &ifr);
+
+       if (ioctl(sock_ioctl, SIOCGIFHWADDR, &ifr) == 0) {
+               memcpy(s->macaddr, &ifr.ifr_hwaddr, sizeof(s->macaddr));
+               s->flags |= DEV_OPT_MACADDR;
        }
+}
 
-       dev->ifindex = system_if_resolve(dev);
+static void
+system_if_apply_settings(struct device *dev, struct device_settings *s)
+{
+       struct ifreq ifr;
+
+       memset(&ifr, 0, sizeof(ifr));
+       strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
+       if (s->flags & DEV_OPT_MTU) {
+               ifr.ifr_mtu = s->mtu;
+               if (ioctl(sock_ioctl, SIOCSIFMTU, &ifr) < 0)
+                       s->flags &= ~DEV_OPT_MTU;
+       }
+       if (s->flags & DEV_OPT_TXQUEUELEN) {
+               ifr.ifr_qlen = s->txqueuelen;
+               if (ioctl(sock_ioctl, SIOCSIFTXQLEN, &ifr) < 0)
+                       s->flags &= ~DEV_OPT_TXQUEUELEN;
+       }
+       if (s->flags & DEV_OPT_MACADDR) {
+               memcpy(&ifr.ifr_hwaddr, s->macaddr, sizeof(s->macaddr));
+               if (ioctl(sock_ioctl, SIOCSIFHWADDR, &ifr) < 0)
+                       s->flags &= ~DEV_OPT_MACADDR;
+       }
 }
 
 int system_if_up(struct device *dev)
 {
-       system_if_apply_settings(dev);
+       system_if_get_settings(dev, &dev->orig_settings);
+       system_if_apply_settings(dev, &dev->settings);
+       dev->ifindex = system_if_resolve(dev);
        return system_if_flags(dev->ifname, IFF_UP, 0);
 }
 
 int system_if_down(struct device *dev)
 {
-       return system_if_flags(dev->ifname, 0, IFF_UP);
+       int ret = system_if_flags(dev->ifname, 0, IFF_UP);
+       system_if_apply_settings(dev, &dev->orig_settings);
+       return ret;
 }
 
 int system_if_check(struct device *dev)
@@ -720,8 +749,6 @@ system_if_dump_info(struct device *dev, struct blob_buf *b)
 
        if (read_int_file(dir_fd, "carrier", &val))
                blobmsg_add_u8(b, "link", !!val);
-       if (read_string_file(dir_fd, "address", buf, sizeof(buf)))
-               blobmsg_add_string(b, "macaddr", buf);
 
        memset(&ecmd, 0, sizeof(ecmd));
        memset(&ifr, 0, sizeof(ifr));
@@ -780,7 +807,8 @@ system_if_dump_stats(struct device *dev, struct blob_buf *b)
 
 static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
 {
-       int alen = ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4) ? 4 : 16;
+       bool v4 = ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4);
+       int alen = v4 ? 4 : 16;
        struct ifaddrmsg ifa = {
                .ifa_family = (alen == 4) ? AF_INET : AF_INET6,
                .ifa_prefixlen = addr->mask,
@@ -789,20 +817,15 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
 
        struct nl_msg *msg;
 
-       dev = addr->device;
-       if (dev) {
-               if (!dev->ifindex)
-                       return -1;
-
-               ifa.ifa_index = dev->ifindex;
-       }
-
        msg = nlmsg_alloc_simple(cmd, 0);
        if (!msg)
                return -1;
 
        nlmsg_append(msg, &ifa, sizeof(ifa), 0);
        nla_put(msg, IFA_LOCAL, alen, &addr->addr);
+       if (v4)
+               nla_put_u32(msg, IFA_BROADCAST, addr->broadcast);
+
        return system_rtnl_call(msg);
 }
 
@@ -847,14 +870,6 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
        if (cmd == RTM_NEWROUTE)
                flags |= NLM_F_CREATE | NLM_F_REPLACE;
 
-       dev = route->device;
-       if (dev) {
-               if (!dev->ifindex)
-                       return -1;
-
-               ifindex = dev->ifindex;
-       }
-
        msg = nlmsg_alloc_simple(cmd, flags);
        if (!msg)
                return -1;
@@ -864,6 +879,9 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
        if (route->mask)
                nla_put(msg, RTA_DST, alen, &route->addr);
 
+       if (route->metric >= 0)
+               nla_put_u32(msg, RTA_PRIORITY, route->metric);
+
        if (have_gw)
                nla_put(msg, RTA_GATEWAY, alen, &route->nexthop);