Remove usage of GStaticMutex since it causes compiler problems
[connman] / plugins / ethernet.c
index 8905223..d6861f8 100644 (file)
@@ -25,6 +25,7 @@
 
 #include <unistd.h>
 #include <string.h>
+#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <linux/if.h>
 #include <linux/netlink.h>
 
 #include <connman/plugin.h>
 #include <connman/driver.h>
+#include <connman/rtnl.h>
 #include <connman/log.h>
 
-static GStaticMutex ethernet_mutex = G_STATIC_MUTEX_INIT;
-static GSList *ethernet_list = NULL;
-
-static GStaticMutex element_mutex = G_STATIC_MUTEX_INIT;
-static GSList *element_list = NULL;
-
-static void create_element(struct connman_element *parent,
-                                       enum connman_element_type type)
-{
-       struct connman_element *element;
-
-       DBG("parent %p name %s", parent, parent->name);
-
-       element = connman_element_create();
-
-       element->type = type;
-       element->netdev.index = parent->netdev.index;
-       element->netdev.name = g_strdup(parent->netdev.name);
-
-       g_static_mutex_lock(&element_mutex);
-       element_list = g_slist_append(element_list, element);
-       g_static_mutex_unlock(&element_mutex);
-
-       connman_element_register(element, parent);
-}
-
-static void remove_elements(struct connman_element *parent)
-{
-       GSList *list = element_list;
-
-       DBG("parent %p name %s", parent, parent->name);
-
-       g_static_mutex_lock(&element_mutex);
-
-       while (list) {
-               GSList *next = list->next;
-               struct connman_element *element = list->data;
-
-               if (element->netdev.index != parent->netdev.index) {
-                       list = next;
-                       continue;
-               }
-
-               element_list = g_slist_delete_link(element_list, list);
-
-               connman_element_unregister(element);
-
-               connman_element_unref(element);
-
-               list = next;
-       }
+struct ethernet_data {
+       int index;
+       unsigned flags;
+};
 
-       g_static_mutex_unlock(&element_mutex);
-}
+static GSList *ethernet_list = NULL;
 
-static void rtnl_link(struct nlmsghdr *hdr, const char *type)
+static void ethernet_newlink(unsigned short type, int index,
+                                       unsigned flags, unsigned change)
 {
        GSList *list;
-       struct ifinfomsg *msg;
-       int bytes;
-
-       msg = (struct ifinfomsg *) NLMSG_DATA(hdr);
-       bytes = IFLA_PAYLOAD(hdr);
-
-       DBG("%s ifi_index %d ifi_flags 0x%04x",
-                               type, msg->ifi_index, msg->ifi_flags);
 
-       g_static_mutex_lock(&ethernet_mutex);
+       DBG("index %d flags %ld change %ld", index, flags, change);
 
        for (list = ethernet_list; list; list = list->next) {
                struct connman_element *element = list->data;
+               struct connman_element *netdev;
+               struct ethernet_data *ethernet;
 
-               if (element->type != CONNMAN_ELEMENT_TYPE_DEVICE)
+               ethernet = connman_element_get_data(element);
+               if (ethernet == NULL)
                        continue;
 
-               if (element->netdev.index != msg->ifi_index)
+               if (ethernet->index != index)
                        continue;
 
-               if ((element->netdev.flags & IFF_RUNNING) ==
-                                               (msg->ifi_flags & IFF_RUNNING))
+               if ((ethernet->flags & IFF_RUNNING) == (flags & IFF_RUNNING))
                        continue;
 
-               element->netdev.flags = msg->ifi_flags;
+               ethernet->flags = flags;
 
-               if (msg->ifi_flags & IFF_RUNNING) {
+               if (ethernet->flags & IFF_RUNNING) {
                        DBG("carrier on");
 
-                       create_element(element, CONNMAN_ELEMENT_TYPE_DHCP);
-                       create_element(element, CONNMAN_ELEMENT_TYPE_ZEROCONF);
+                       netdev = connman_element_create(NULL);
+                       if (netdev != NULL) {
+                               netdev->type    = CONNMAN_ELEMENT_TYPE_DEVICE;
+                               netdev->subtype = CONNMAN_ELEMENT_SUBTYPE_NETWORK;
+                               netdev->index   = element->index;
+
+                               connman_element_register(netdev, element);
+                       }
                } else {
                        DBG("carrier off");
 
-                       remove_elements(element);
+                       connman_element_unregister_children(element);
                }
        }
-
-       g_static_mutex_unlock(&ethernet_mutex);
 }
 
-static gboolean rtnl_event(GIOChannel *chan, GIOCondition cond, gpointer data)
+static struct connman_rtnl ethernet_rtnl = {
+       .name           = "ethernet",
+       .newlink        = ethernet_newlink,
+};
+
+static int iface_up(struct ethernet_data *ethernet)
 {
-       unsigned char buf[1024];
-       void *ptr = buf;
-       gsize len;
-       GIOError err;
+       struct ifreq ifr;
+       int sk, err;
 
-       if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR))
-               return FALSE;
+       DBG("index %d flags %d", ethernet->index, ethernet->flags);
 
-       memset(buf, 0, sizeof(buf));
+       sk = socket(PF_INET, SOCK_DGRAM, 0);
+       if (sk < 0)
+               return -errno;
+
+       memset(&ifr, 0, sizeof(ifr));
+       ifr.ifr_ifindex = ethernet->index;
 
-       err = g_io_channel_read(chan, (gchar *) buf, sizeof(buf), &len);
-       if (err) {
-               if (err == G_IO_ERROR_AGAIN)
-                       return TRUE;
-               return FALSE;
+       if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
+               err = -errno;
+               goto done;
        }
 
-       DBG("buf %p len %zd", buf, len);
+       if (ioctl(sk, SIOCGIFFLAGS, &ifr) < 0) {
+               err = -errno;
+               goto done;
+       }
 
-       while (len > 0) {
-               struct nlmsghdr *hdr = ptr;
-               struct nlmsgerr *err;
+       if (ifr.ifr_flags & IFF_UP) {
+               err = -EALREADY;
+               goto done;
+       }
 
-               if (!NLMSG_OK(hdr, len))
-                       break;
+       ifr.ifr_flags |= IFF_UP;
 
-               DBG("len %d type %d flags 0x%04x seq %d",
-                                       hdr->nlmsg_len, hdr->nlmsg_type,
-                                       hdr->nlmsg_flags, hdr->nlmsg_seq);
+       if (ioctl(sk, SIOCSIFFLAGS, &ifr) < 0) {
+               err = -errno;
+               goto done;
+       }
 
-               switch (hdr->nlmsg_type) {
-               case NLMSG_ERROR:
-                       err = NLMSG_DATA(hdr);
-                       DBG("ERROR %d (%s)", -err->error,
-                                               strerror(-err->error));
-                       break;
+       err = 0;
 
-               case RTM_NEWLINK:
-                       rtnl_link(hdr, "NEWLINK");
-                       break;
+done:
+       close(sk);
 
-               case RTM_DELLINK:
-                       rtnl_link(hdr, "DELLINK");
-                       break;
-               }
+       return err;
+}
 
-               len -= hdr->nlmsg_len;
-               ptr += hdr->nlmsg_len;
-       }
+static int iface_down(struct ethernet_data *ethernet)
+{
+       struct ifreq ifr;
+       int sk, err;
 
-       return TRUE;
-}
+       DBG("index %d flags %d", ethernet->index, ethernet->flags);
 
-static GIOChannel *channel = NULL;
+       sk = socket(PF_INET, SOCK_DGRAM, 0);
+       if (sk < 0)
+               return -errno;
 
-static int rtnl_request(void)
-{
-       struct {
-               struct nlmsghdr hdr;
-               struct rtgenmsg msg;
-       } req;
+       memset(&ifr, 0, sizeof(ifr));
+       ifr.ifr_ifindex = ethernet->index;
 
-       struct sockaddr_nl addr;
-       int sk;
+       if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
+               err = -errno;
+               goto done;
+       }
 
-       DBG("");
+       if (ioctl(sk, SIOCGIFFLAGS, &ifr) < 0) {
+               err = -errno;
+               goto done;
+       }
 
-       memset(&req, 0, sizeof(req));
-       req.hdr.nlmsg_len = sizeof(req.hdr) + sizeof(req.msg);
-       req.hdr.nlmsg_type = RTM_GETLINK;
-       req.hdr.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
-       req.hdr.nlmsg_pid = 0;
-       req.hdr.nlmsg_seq = 42;
-       req.msg.rtgen_family = AF_INET;
+       if (!(ifr.ifr_flags & IFF_UP)) {
+               err = -EALREADY;
+               goto done;
+       }
 
-       sk = g_io_channel_unix_get_fd(channel);
+       ifr.ifr_flags &= ~IFF_UP;
 
-       memset(&addr, 0, sizeof(addr));
-       addr.nl_family = AF_NETLINK;
+       if (ioctl(sk, SIOCSIFFLAGS, &ifr) < 0)
+               err = -errno;
+       else
+               err = 0;
+
+done:
+       close(sk);
 
-       return sendto(sk, &req, sizeof(req), 0,
-                       (struct sockaddr *) &addr, sizeof(addr));
+       return err;
 }
 
 static int ethernet_probe(struct connman_element *element)
 {
+       struct ethernet_data *ethernet;
+
        DBG("element %p name %s", element, element->name);
 
-       g_static_mutex_lock(&ethernet_mutex);
+       ethernet = g_try_new0(struct ethernet_data, 1);
+       if (ethernet == NULL)
+               return -ENOMEM;
+
        ethernet_list = g_slist_append(ethernet_list, element);
-       g_static_mutex_unlock(&ethernet_mutex);
 
-       rtnl_request();
+       connman_element_set_data(element, ethernet);
+
+       ethernet->index = element->index;
+
+       iface_up(ethernet);
+
+       connman_rtnl_send_getlink();
 
        return 0;
 }
 
 static void ethernet_remove(struct connman_element *element)
 {
+       struct ethernet_data *ethernet = connman_element_get_data(element);
+
        DBG("element %p name %s", element, element->name);
 
-       g_static_mutex_lock(&ethernet_mutex);
+       connman_element_set_data(element, NULL);
+
+       iface_down(ethernet);
+
        ethernet_list = g_slist_remove(ethernet_list, element);
-       g_static_mutex_unlock(&ethernet_mutex);
+
+       g_free(ethernet);
 }
 
 static struct connman_driver ethernet_driver = {
@@ -249,57 +223,17 @@ static struct connman_driver ethernet_driver = {
        .remove         = ethernet_remove,
 };
 
-static int rtnl_init(void)
-{
-       struct sockaddr_nl addr;
-       int sk, err;
-
-       DBG("");
-
-       sk = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE);
-       if (sk < 0)
-               return -errno;
-
-       memset(&addr, 0, sizeof(addr));
-       addr.nl_family = AF_NETLINK;
-       addr.nl_groups = RTMGRP_LINK;
-
-       if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               err = -errno;
-               close(sk);
-               return err;
-       }
-
-       channel = g_io_channel_unix_new(sk);
-       g_io_channel_set_close_on_unref(channel, TRUE);
-
-       g_io_add_watch(channel, G_IO_IN | G_IO_NVAL | G_IO_HUP | G_IO_ERR,
-                                                       rtnl_event, NULL);
-
-       return 0;
-}
-
-static void rtnl_cleanup(void)
-{
-       DBG("");
-
-       g_io_channel_shutdown(channel, TRUE, NULL);
-       g_io_channel_unref(channel);
-
-       channel = NULL;
-}
-
 static int ethernet_init(void)
 {
        int err;
 
-       err = rtnl_init();
+       err = connman_rtnl_register(&ethernet_rtnl);
        if (err < 0)
                return err;
 
        err = connman_driver_register(&ethernet_driver);
        if (err < 0) {
-               rtnl_cleanup();
+               connman_rtnl_unregister(&ethernet_rtnl);
                return err;
        }
 
@@ -310,7 +244,7 @@ static void ethernet_exit(void)
 {
        connman_driver_unregister(&ethernet_driver);
 
-       rtnl_cleanup();
+       connman_rtnl_unregister(&ethernet_rtnl);
 }
 
 CONNMAN_PLUGIN_DEFINE("ethernet", "Ethernet interface plugin", VERSION,