ignore mac80211 devices specified in /etc/config/network

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

diff --git a/system-linux.c b/system-linux.c
index 66799e9..ceb5ac5 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #define _GNU_SOURCE
 
 #include <sys/socket.h>
@@ -243,10 +256,15 @@ handle_hotplug_event(struct uloop_fd *u, unsigned int events)
 
 static int system_rtnl_call(struct nl_msg *msg)
 {
-       int s = -(nl_send_auto_complete(sock_rtnl, msg)
-                       || nl_wait_for_ack(sock_rtnl));
+       int ret;
+
+       ret = nl_send_auto_complete(sock_rtnl, msg);
        nlmsg_free(msg);
-       return s;
+
+       if (ret < 0)
+               return ret;
+
+       return nl_wait_for_ack(sock_rtnl);
 }
 
 int system_bridge_delbr(struct device *bridge)
@@ -751,6 +769,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)
 {
@@ -839,8 +867,12 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
 
        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);
+       if (v4) {
+               if (addr->broadcast)
+                       nla_put_u32(msg, IFA_BROADCAST, addr->broadcast);
+               if (addr->point_to_point)
+                       nla_put_u32(msg, IFA_ADDRESS, addr->point_to_point);
+       }
 
        return system_rtnl_call(msg);
 }
@@ -877,7 +909,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 = RTPROT_BOOT,
+               .rtm_protocol = (route->flags & DEVADDR_KERNEL) ? RTPROT_KERNEL : RTPROT_BOOT,
                .rtm_scope = scope,
                .rtm_type = (cmd == RTM_DELROUTE) ? 0: RTN_UNICAST,
        };