X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=158045a3487ed66776b165a42b3e567492b28153;hp=e333f1941e806329aca4bdd207b8ce6e406bf4aa;hb=e1b2a2313dfa148f0708add78f7efce362cbc408;hpb=9f43c03dd8632f14c190fcb5afcd465740f555d9

diff --git a/system-linux.c b/system-linux.c
index e333f19..158045a 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -9,6 +9,8 @@
 #include <fcntl.h>
 
 #include <netlink/msg.h>
+#include <netlink/attr.h>
+#include <netlink/socket.h>
 #include <libubox/uloop.h>
 
 #include "netifd.h"
@@ -22,6 +24,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)
 {
@@ -29,48 +32,52 @@ int system_init(void)
 	fcntl(sock_ioctl, F_SETFD, fcntl(sock_ioctl, F_GETFD) | FD_CLOEXEC);
 
 	// Prepare socket for routing / address control
-	if ((sock_rtnl = nl_socket_alloc())) {
-		if (nl_connect(sock_rtnl, NETLINK_ROUTE)) {
-			nl_socket_free(sock_rtnl);
-			sock_rtnl = NULL;
-		}
-	}
+	sock_rtnl = nl_socket_alloc();
+	if (!sock_rtnl)
+		return -1;
+
+	if (nl_connect(sock_rtnl, NETLINK_ROUTE))
+		goto error_free_sock;
 
 	// 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 (cb && (sock_rtnl_event = nl_socket_alloc_cb(cb))) {
-		if (nl_connect(sock_rtnl_event, NETLINK_ROUTE)) {
-			nl_socket_free(sock_rtnl_event);
-			sock_rtnl_event = NULL;
-		}
-		// Receive network link events form kernel
-		nl_socket_add_membership(sock_rtnl_event, RTNLGRP_LINK);
-
-		// Synthesize initial link messages
-		struct nl_msg *m = nlmsg_alloc_simple(RTM_GETLINK, NLM_F_DUMP);
-		if (m && nlmsg_reserve(m, sizeof(struct ifinfomsg), 0)) {
-			nl_send_auto_complete(sock_rtnl_event, m);
-			nlmsg_free(m);
-		}
-
-#ifdef NLA_PUT_DATA
-		rtnl_event.fd = nl_socket_get_fd(sock_rtnl_event);
-#else
-		rtnl_event.fd = sock_rtnl_event->s_fd; // libnl-tiny hack...
-#endif
-		uloop_fd_add(&rtnl_event, ULOOP_READ | ULOOP_EDGE_TRIGGER);
-	}
+	nl_cb_rtnl_event = nl_cb_alloc(NL_CB_DEFAULT);
+	if (!nl_cb_rtnl_event)
+		goto error_free_sock;
+
+	nl_cb_set(nl_cb_rtnl_event, NL_CB_VALID, NL_CB_CUSTOM,
+		  cb_rtnl_event, NULL);
+
+	sock_rtnl_event = nl_socket_alloc();
+	if (!sock_rtnl_event)
+		goto error_free_cb;
+
+	if (nl_connect(sock_rtnl_event, NETLINK_ROUTE))
+		goto error_free_event;
+
+	// Receive network link events form kernel
+	nl_socket_add_membership(sock_rtnl_event, RTNLGRP_LINK);
+
+	rtnl_event.fd = nl_socket_get_fd(sock_rtnl_event);
+	uloop_fd_add(&rtnl_event, ULOOP_READ | ULOOP_EDGE_TRIGGER);
 
 	return -(sock_ioctl < 0 || !sock_rtnl);
+
+error_free_event:
+	nl_socket_free(sock_rtnl_event);
+	sock_rtnl_event = NULL;
+error_free_cb:
+	nl_cb_put(nl_cb_rtnl_event);
+	nl_cb_rtnl_event = NULL;
+error_free_sock:
+	nl_socket_free(sock_rtnl);
+	sock_rtnl = NULL;
+	return -1;
 }
 
 // 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 +171,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,15 +194,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); */
+	device_set_present(dev, (system_if_resolve(dev) >= 0));
 	return 0;
 }
 
@@ -202,7 +212,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);
 }