add an install target

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

diff --git a/system-linux.c b/system-linux.c
index e333f19..488f5be 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 
 #include <netlink/msg.h>
+#include <netlink/attr.h>
 #include <libubox/uloop.h>
 
 #include "netifd.h"
@@ -22,6 +23,7 @@ static struct nl_sock *sock_rtnl_event = NULL;
 static void handler_rtnl_event(struct uloop_fd *u, unsigned int events);
 static int cb_rtnl_event(struct nl_msg *msg, void *arg);
 static struct uloop_fd rtnl_event = {.cb = handler_rtnl_event};
+static struct nl_cb *nl_cb_rtnl_event;
 
 int system_init(void)
 {
@@ -37,11 +39,11 @@ int system_init(void)
        }
 
        // Prepare socket for link events
-       struct nl_cb *cb = nl_cb_alloc(NL_CB_DEFAULT);
-       if (cb)
-               nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, cb_rtnl_event, NULL);
+       if ((nl_cb_rtnl_event = nl_cb_alloc(NL_CB_DEFAULT)))
+               nl_cb_set(nl_cb_rtnl_event, NL_CB_VALID, NL_CB_CUSTOM,
+                                                       cb_rtnl_event, NULL);
 
-       if (cb && (sock_rtnl_event = nl_socket_alloc_cb(cb))) {
+       if (nl_cb_rtnl_event && (sock_rtnl_event = nl_socket_alloc())) {
                if (nl_connect(sock_rtnl_event, NETLINK_ROUTE)) {
                        nl_socket_free(sock_rtnl_event);
                        sock_rtnl_event = NULL;
@@ -70,7 +72,7 @@ int system_init(void)
 // If socket is ready for reading parse netlink events
 static void handler_rtnl_event(struct uloop_fd *u, unsigned int events)
 {
-       nl_recvmsgs(sock_rtnl_event, NULL);
+       nl_recvmsgs(sock_rtnl_event, nl_cb_rtnl_event);
 }
 
 // Evaluate netlink messages
@@ -164,8 +166,19 @@ static int system_if_flags(struct device *dev, unsigned add, unsigned rem)
        return ioctl(sock_ioctl, SIOCSIFFLAGS, &ifr);
 }
 
+static int system_if_resolve(struct device *dev)
+{
+       struct ifreq ifr;
+       strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
+       if (!ioctl(sock_ioctl, SIOCGIFINDEX, &ifr))
+               return ifr.ifr_ifindex;
+       else
+               return 0;
+}
+
 int system_if_up(struct device *dev)
 {
+       dev->ifindex = system_if_resolve(dev);
        return system_if_flags(dev, IFF_UP, 0);
 }
 
@@ -176,16 +189,7 @@ int system_if_down(struct device *dev)
 
 int system_if_check(struct device *dev)
 {
-       struct ifreq ifr;
-       strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
-       if (ioctl(sock_ioctl, SIOCGIFINDEX, &ifr))
-               return -1;
-
-       dev->ifindex = ifr.ifr_ifindex;
-
-       /* if (!strcmp(dev->ifname, "eth0"))
-               device_set_present(dev, true); */
-       return 0;
+       return -!(system_if_resolve(dev));
 }
 
 static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
@@ -202,7 +206,7 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
                return -1;
 
        nlmsg_append(msg, &ifa, sizeof(ifa), 0);
-       nla_put(msg, IFA_ADDRESS, alen, &addr->addr);
+       nla_put(msg, IFA_LOCAL, alen, &addr->addr);
        return system_rtnl_call(msg);
 }