remove some more code duplication

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

diff --git a/system-linux.c b/system-linux.c
index 4da7416..0308e6f 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -24,58 +24,81 @@
 #include "device.h"
 #include "system.h"
 
+struct event_socket {
+       struct uloop_fd uloop;
+       struct nl_sock *sock;
+       struct nl_cb *cb;
+};
+
 static int sock_ioctl = -1;
 static struct nl_sock *sock_rtnl = NULL;
-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)
+static void
+handler_nl_event(struct uloop_fd *u, unsigned int events)
 {
-       sock_ioctl = socket(AF_LOCAL, SOCK_DGRAM, 0);
-       fcntl(sock_ioctl, F_SETFD, fcntl(sock_ioctl, F_GETFD) | FD_CLOEXEC);
+       struct event_socket *ev = container_of(u, struct event_socket, uloop);
+       nl_recvmsgs(ev->sock, ev->cb);
+}
 
-       // Prepare socket for routing / address control
-       sock_rtnl = nl_socket_alloc();
-       if (!sock_rtnl)
-               return -1;
+static struct nl_sock *
+create_socket(int protocol)
+{
+       struct nl_sock *sock;
 
-       if (nl_connect(sock_rtnl, NETLINK_ROUTE))
-               return -1;
+       sock = nl_socket_alloc();
+       if (!sock)
+               return NULL;
+
+       if (nl_connect(sock, protocol))
+               return NULL;
 
+       return sock;
+}
+
+static bool
+create_event_socket(struct event_socket *ev, int protocol,
+                   int (*cb)(struct nl_msg *msg, void *arg))
+{
        // Prepare socket for link events
-       nl_cb_rtnl_event = nl_cb_alloc(NL_CB_DEFAULT);
-       if (!nl_cb_rtnl_event)
-               return -1;
+       ev->cb = nl_cb_alloc(NL_CB_DEFAULT);
+       if (!ev->cb)
+               return false;
+
+       nl_cb_set(ev->cb, NL_CB_VALID, NL_CB_CUSTOM, cb, NULL);
+
+       ev->sock = create_socket(protocol);
+       if (!ev->sock)
+               return false;
+
+       ev->uloop.fd = nl_socket_get_fd(ev->sock);
+       ev->uloop.cb = handler_nl_event;
+       uloop_fd_add(&ev->uloop, ULOOP_READ | ULOOP_EDGE_TRIGGER);
+       return true;
+}
+
+int system_init(void)
+{
+       static struct event_socket rtnl_event;
 
-       nl_cb_set(nl_cb_rtnl_event, NL_CB_VALID, NL_CB_CUSTOM,
-                 cb_rtnl_event, NULL);
+       sock_ioctl = socket(AF_LOCAL, SOCK_DGRAM, 0);
+       fcntl(sock_ioctl, F_SETFD, fcntl(sock_ioctl, F_GETFD) | FD_CLOEXEC);
 
-       sock_rtnl_event = nl_socket_alloc();
-       if (!sock_rtnl_event)
+       // Prepare socket for routing / address control
+       sock_rtnl = create_socket(NETLINK_ROUTE);
+       if (!sock_rtnl)
                return -1;
 
-       if (nl_connect(sock_rtnl_event, NETLINK_ROUTE))
+       if (!create_event_socket(&rtnl_event, NETLINK_ROUTE, cb_rtnl_event))
                return -1;
 
        // 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);
+       nl_socket_add_membership(rtnl_event.sock, RTNLGRP_LINK);
 
        return 0;
 }
 
-// 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, nl_cb_rtnl_event);
-}
-
 static void system_set_sysctl(const char *path, const char *val)
 {
        int fd;