#include <linux/rtnetlink.h>
#include <connman/plugin.h>
-#include <connman/driver.h>
+#include <connman/device.h>
#include <connman/rtnl.h>
#include <connman/log.h>
+#include "inet.h"
+
struct ethernet_data {
int index;
unsigned flags;
};
-static GStaticMutex ethernet_mutex = G_STATIC_MUTEX_INIT;
static GSList *ethernet_list = NULL;
static void ethernet_newlink(unsigned short type, int index,
DBG("index %d flags %ld change %ld", index, flags, change);
- g_static_mutex_lock(ðernet_mutex);
-
for (list = ethernet_list; list; list = list->next) {
- struct connman_element *element = list->data;
- struct connman_element *netdev;
+ struct connman_device *device = list->data;
struct ethernet_data *ethernet;
- ethernet = connman_element_get_data(element);
+ ethernet = connman_device_get_data(device);
if (ethernet == NULL)
continue;
if (ethernet->index != index)
continue;
- if ((ethernet->flags & IFF_RUNNING) == (flags & IFF_RUNNING))
- continue;
-
- ethernet->flags = flags;
-
- if (ethernet->flags & IFF_RUNNING) {
- DBG("carrier on");
-
- 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);
+ if ((ethernet->flags & IFF_UP) != (flags & IFF_UP)) {
+ if (flags & IFF_UP) {
+ DBG("power on");
+ connman_device_set_powered(device, TRUE);
+ } else {
+ DBG("power off");
+ connman_device_set_powered(device, FALSE);
}
- } else {
- DBG("carrier off");
+ }
- connman_element_unregister_children(element);
+ if ((ethernet->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
+ if (flags & IFF_LOWER_UP) {
+ DBG("carrier on");
+ connman_device_set_carrier(device, TRUE);
+ } else {
+ DBG("carrier off");
+ connman_device_set_carrier(device, FALSE);
+ }
}
- }
- g_static_mutex_unlock(ðernet_mutex);
+ ethernet->flags = flags;
+ }
}
static struct connman_rtnl ethernet_rtnl = {
.newlink = ethernet_newlink,
};
-static int iface_up(struct ethernet_data *ethernet)
+static int ethernet_probe(struct connman_device *device)
{
- struct ifreq ifr;
- int sk, err;
-
- DBG("index %d flags %d", ethernet->index, ethernet->flags);
-
- sk = socket(PF_INET, SOCK_DGRAM, 0);
- if (sk < 0)
- return -errno;
-
- memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = ethernet->index;
-
- if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
- err = -errno;
- goto done;
- }
+ struct ethernet_data *ethernet;
- if (ioctl(sk, SIOCGIFFLAGS, &ifr) < 0) {
- err = -errno;
- goto done;
- }
+ DBG("device %p", device);
- if (ifr.ifr_flags & IFF_UP) {
- err = -EALREADY;
- goto done;
- }
+ ethernet = g_try_new0(struct ethernet_data, 1);
+ if (ethernet == NULL)
+ return -ENOMEM;
- ifr.ifr_flags |= IFF_UP;
+ ethernet_list = g_slist_append(ethernet_list, device);
- if (ioctl(sk, SIOCSIFFLAGS, &ifr) < 0) {
- err = -errno;
- goto done;
- }
+ connman_device_set_data(device, ethernet);
- err = 0;
+ ethernet->index = connman_device_get_index(device);
-done:
- close(sk);
+ connman_rtnl_send_getlink();
- return err;
+ return 0;
}
-static int iface_down(struct ethernet_data *ethernet)
+static void ethernet_remove(struct connman_device *device)
{
- struct ifreq ifr;
- int sk, err;
+ struct ethernet_data *ethernet = connman_device_get_data(device);
- DBG("index %d flags %d", ethernet->index, ethernet->flags);
+ DBG("device %p", device);
- sk = socket(PF_INET, SOCK_DGRAM, 0);
- if (sk < 0)
- return -errno;
+ connman_device_set_data(device, NULL);
- memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = ethernet->index;
+ ethernet_list = g_slist_remove(ethernet_list, device);
- if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
- err = -errno;
- goto done;
- }
-
- if (ioctl(sk, SIOCGIFFLAGS, &ifr) < 0) {
- err = -errno;
- goto done;
- }
-
- if (!(ifr.ifr_flags & IFF_UP)) {
- err = -EALREADY;
- goto done;
- }
-
- ifr.ifr_flags &= ~IFF_UP;
-
- if (ioctl(sk, SIOCSIFFLAGS, &ifr) < 0)
- err = -errno;
- else
- err = 0;
-
-done:
- close(sk);
-
- return err;
+ g_free(ethernet);
}
-static int ethernet_probe(struct connman_element *element)
+static int ethernet_enable(struct connman_device *device)
{
- struct ethernet_data *ethernet;
-
- DBG("element %p name %s", element, element->name);
-
- ethernet = g_try_new0(struct ethernet_data, 1);
- if (ethernet == NULL)
- return -ENOMEM;
-
- g_static_mutex_lock(ðernet_mutex);
- ethernet_list = g_slist_append(ethernet_list, element);
- g_static_mutex_unlock(ðernet_mutex);
+ struct ethernet_data *ethernet = connman_device_get_data(device);
- connman_element_set_data(element, ethernet);
+ DBG("device %p", device);
- ethernet->index = element->index;
-
- iface_up(ethernet);
-
- connman_rtnl_send_getlink();
-
- return 0;
+ return inet_ifup(ethernet->index);
}
-static void ethernet_remove(struct connman_element *element)
+static int ethernet_disable(struct connman_device *device)
{
- struct ethernet_data *ethernet = connman_element_get_data(element);
-
- DBG("element %p name %s", element, element->name);
+ struct ethernet_data *ethernet = connman_device_get_data(device);
- connman_element_set_data(element, NULL);
+ DBG("device %p", device);
- iface_down(ethernet);
-
- g_static_mutex_lock(ðernet_mutex);
- ethernet_list = g_slist_remove(ethernet_list, element);
- g_static_mutex_unlock(ðernet_mutex);
-
- g_free(ethernet);
+ return inet_ifdown(ethernet->index);
}
-static struct connman_driver ethernet_driver = {
+static struct connman_device_driver ethernet_driver = {
.name = "ethernet",
- .type = CONNMAN_ELEMENT_TYPE_DEVICE,
- .subtype = CONNMAN_ELEMENT_SUBTYPE_ETHERNET,
+ .type = CONNMAN_DEVICE_TYPE_ETHERNET,
.probe = ethernet_probe,
.remove = ethernet_remove,
+ .enable = ethernet_enable,
+ .disable = ethernet_disable,
};
static int ethernet_init(void)
if (err < 0)
return err;
- err = connman_driver_register(ðernet_driver);
+ err = connman_device_driver_register(ðernet_driver);
if (err < 0) {
connman_rtnl_unregister(ðernet_rtnl);
return err;
static void ethernet_exit(void)
{
- connman_driver_unregister(ðernet_driver);
+ connman_device_driver_unregister(ðernet_driver);
connman_rtnl_unregister(ðernet_rtnl);
}
-CONNMAN_PLUGIN_DEFINE("ethernet", "Ethernet interface plugin", VERSION,
+CONNMAN_PLUGIN_DEFINE(ethernet, "Ethernet interface plugin", VERSION,
ethernet_init, ethernet_exit)
projects / connman / blobdiff