*
* Connection Manager
*
- * Copyright (C) 2007-2008 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2010 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#include <config.h>
#endif
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <linux/if.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
+#include <errno.h>
+#include <net/if.h>
+#ifndef IFF_LOWER_UP
+#define IFF_LOWER_UP 0x10000
+#endif
+
+#include <glib.h>
+
+#define CONNMAN_API_SUBJECT_TO_CHANGE
+#include <connman/technology.h>
#include <connman/plugin.h>
#include <connman/device.h>
+#include <connman/inet.h>
#include <connman/rtnl.h>
#include <connman/log.h>
struct ethernet_data {
int index;
unsigned flags;
+ unsigned int watch;
+ struct connman_network *network;
};
-static GSList *ethernet_list = NULL;
-
-static void update_power(struct connman_device *device, unsigned flags)
+static int cable_probe(struct connman_network *network)
{
- if (flags & IFF_UP) {
- DBG("power on");
-
- connman_device_set_powered(device, TRUE);
- } else {
- DBG("power off");
+ DBG("network %p", network);
- connman_device_set_powered(device, FALSE);
- }
+ return 0;
}
-static void update_carrier(struct connman_device *device, unsigned flags)
+static void cable_remove(struct connman_network *network)
{
- struct connman_element *netdev;
-
- if (flags & IFF_LOWER_UP) {
- 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 = device->element->index;
-
- if (connman_element_register(netdev,
- device->element) < 0)
- connman_element_unref(netdev);
- }
- } else {
- DBG("carrier off");
-
- connman_element_unregister_children(device->element);
- }
+ DBG("network %p", network);
}
-static void ethernet_newlink(unsigned short type, int index,
- unsigned flags, unsigned change)
+static int cable_connect(struct connman_network *network)
{
- GSList *list;
-
- DBG("index %d flags %ld change %ld", index, flags, change);
-
- for (list = ethernet_list; list; list = list->next) {
- struct connman_device *device = list->data;
- struct ethernet_data *ethernet;
+ DBG("network %p", network);
- ethernet = connman_device_get_data(device);
- if (ethernet == NULL)
- continue;
-
- if (ethernet->index != index)
- continue;
-
- if ((ethernet->flags & IFF_UP) != (flags & IFF_UP))
- update_power(device, flags);
+ return 0;
+}
- if ((ethernet->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP))
- update_carrier(device, flags);
+static int cable_disconnect(struct connman_network *network)
+{
+ DBG("network %p", network);
- ethernet->flags = flags;
- }
+ return 0;
}
-static struct connman_rtnl ethernet_rtnl = {
- .name = "ethernet",
- .newlink = ethernet_newlink,
+static struct connman_network_driver cable_driver = {
+ .name = "cable",
+ .type = CONNMAN_NETWORK_TYPE_ETHERNET,
+ .probe = cable_probe,
+ .remove = cable_remove,
+ .connect = cable_connect,
+ .disconnect = cable_disconnect,
};
-static int iface_up(struct ethernet_data *ethernet)
+static void add_network(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 connman_network *network;
+ int index;
- if (ioctl(sk, SIOCGIFFLAGS, &ifr) < 0) {
- err = -errno;
- goto done;
- }
+ network = connman_network_create("carrier",
+ CONNMAN_NETWORK_TYPE_ETHERNET);
+ if (network == NULL)
+ return;
- if (ifr.ifr_flags & IFF_UP) {
- err = -EALREADY;
- goto done;
- }
+ index = connman_device_get_index(device);
+ connman_network_set_index(network, index);
- ifr.ifr_flags |= IFF_UP;
+ connman_network_set_name(network, "Wired");
- if (ioctl(sk, SIOCSIFFLAGS, &ifr) < 0) {
- err = -errno;
- goto done;
+ if (connman_device_add_network(device, network) < 0) {
+ connman_network_unref(network);
+ return;
}
- err = 0;
+ connman_network_set_available(network, TRUE);
-done:
- close(sk);
+ connman_network_set_group(network, "cable");
- return err;
+ connman_network_set_connected(network, TRUE);
}
-static int iface_down(struct ethernet_data *ethernet)
+static void ethernet_newlink(unsigned flags, unsigned change, void *user_data)
{
- 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;
+ struct connman_device *device = user_data;
+ struct ethernet_data *ethernet = connman_device_get_data(device);
- if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
- err = -errno;
- goto done;
- }
+ DBG("index %d flags %d change %d", ethernet->index, flags, change);
- if (ioctl(sk, SIOCGIFFLAGS, &ifr) < 0) {
- err = -errno;
- goto done;
+ 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);
+ }
}
- if (!(ifr.ifr_flags & IFF_UP)) {
- err = -EALREADY;
- goto done;
+ if ((ethernet->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
+ if (flags & IFF_LOWER_UP) {
+ DBG("carrier on");
+ add_network(device);
+ } else {
+ DBG("carrier off");
+ connman_device_remove_all_networks(device);
+ }
}
- ifr.ifr_flags &= ~IFF_UP;
-
- if (ioctl(sk, SIOCSIFFLAGS, &ifr) < 0)
- err = -errno;
- else
- err = 0;
-
-done:
- close(sk);
-
- return err;
+ ethernet->flags = flags;
}
static int ethernet_probe(struct connman_device *device)
if (ethernet == NULL)
return -ENOMEM;
- ethernet_list = g_slist_append(ethernet_list, device);
-
connman_device_set_data(device, ethernet);
- ethernet->index = device->element->index;
+ ethernet->index = connman_device_get_index(device);
+ ethernet->flags = 0;
- connman_rtnl_send_getlink();
+ ethernet->watch = connman_rtnl_add_newlink_watch(ethernet->index,
+ ethernet_newlink, device);
return 0;
}
connman_device_set_data(device, NULL);
- ethernet_list = g_slist_remove(ethernet_list, device);
+ connman_rtnl_remove_watch(ethernet->watch);
+
+ connman_device_remove_all_networks(device);
g_free(ethernet);
}
DBG("device %p", device);
- return iface_up(ethernet);
+ return connman_inet_ifup(ethernet->index);
}
static int ethernet_disable(struct connman_device *device)
DBG("device %p", device);
- return iface_down(ethernet);
+ return connman_inet_ifdown(ethernet->index);
}
static struct connman_device_driver ethernet_driver = {
.disable = ethernet_disable,
};
+static GList *cdc_interface_list = NULL;
+
+static void tech_add_interface(struct connman_technology *technology,
+ int index, const char *name, const char *ident)
+{
+ DBG("index %d name %s ident %s", index, name, ident);
+
+ if (g_list_find(cdc_interface_list,
+ GINT_TO_POINTER((int) index)) != NULL)
+ return;
+
+ cdc_interface_list = g_list_prepend(cdc_interface_list,
+ (GINT_TO_POINTER((int) index)));
+}
+
+static void tech_remove_interface(struct connman_technology *technology,
+ int index)
+{
+ DBG("index %d", index);
+
+ cdc_interface_list = g_list_remove(cdc_interface_list,
+ GINT_TO_POINTER((int) index));
+}
+
+static void enable_tethering(struct connman_technology *technology,
+ const char *bridge)
+{
+ GList *list;
+
+ for (list = cdc_interface_list; list; list = list->next) {
+ int index = GPOINTER_TO_INT(list->data);
+
+ connman_inet_ifup(index);
+
+ connman_inet_add_to_bridge(index, bridge);
+
+ connman_technology_tethering_notify(technology, TRUE);
+ }
+}
+
+static void disable_tethering(struct connman_technology *technology,
+ const char *bridge)
+{
+ GList *list;
+
+ for (list = cdc_interface_list; list; list = list->next) {
+ int index = GPOINTER_TO_INT(list->data);
+
+ connman_inet_remove_from_bridge(index, bridge);
+
+ connman_inet_ifdown(index);
+
+ connman_technology_tethering_notify(technology, FALSE);
+ }
+}
+
+static int tech_set_tethering(struct connman_technology *technology,
+ const char *bridge, connman_bool_t enabled)
+{
+ DBG("bridge %s enabled %d", bridge, enabled);
+
+ if (enabled)
+ enable_tethering(technology, bridge);
+ else
+ disable_tethering(technology, bridge);
+
+ return 0;
+}
+
+static int tech_probe(struct connman_technology *technology)
+{
+ return 0;
+}
+
+static void tech_remove(struct connman_technology *technology)
+{
+ g_list_free(cdc_interface_list);
+
+ cdc_interface_list = NULL;
+}
+
+static struct connman_technology_driver tech_driver = {
+ .name = "cdc_ethernet",
+ .type = CONNMAN_SERVICE_TYPE_GADGET,
+ .probe = tech_probe,
+ .remove = tech_remove,
+ .add_interface = tech_add_interface,
+ .remove_interface = tech_remove_interface,
+ .set_tethering = tech_set_tethering,
+};
+
static int ethernet_init(void)
{
int err;
- err = connman_rtnl_register(ðernet_rtnl);
+ err = connman_network_driver_register(&cable_driver);
if (err < 0)
return err;
err = connman_device_driver_register(ðernet_driver);
if (err < 0) {
- connman_rtnl_unregister(ðernet_rtnl);
+ connman_network_driver_unregister(&cable_driver);
+ return err;
+ }
+
+ err = connman_technology_driver_register(&tech_driver);
+ if (err < 0) {
+ connman_device_driver_unregister(ðernet_driver);
+ connman_network_driver_unregister(&cable_driver);
return err;
}
static void ethernet_exit(void)
{
- connman_device_driver_unregister(ðernet_driver);
+ connman_technology_driver_unregister(&tech_driver);
- connman_rtnl_unregister(ðernet_rtnl);
+ connman_network_driver_unregister(&cable_driver);
+
+ connman_device_driver_unregister(ðernet_driver);
}
CONNMAN_PLUGIN_DEFINE(ethernet, "Ethernet interface plugin", VERSION,
- ethernet_init, ethernet_exit)
+ CONNMAN_PLUGIN_PRIORITY_DEFAULT, ethernet_init, ethernet_exit)
projects / platform / upstream / connman.git / blobdiff