X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fethernet.c;h=ed4208ad7ec2627423ebb8267d8d6e6a25835e80;hb=refs%2Ftags%2Fupstream%2F1.38;hp=0b70462f9731d2d722767dc31ca5eabe6d22926b;hpb=f972a47e85625348030e28998ae9923180b0255e;p=platform%2Fupstream%2Fconnman.git diff --git a/plugins/ethernet.c b/plugins/ethernet.c index 0b70462..ed4208a 100644 --- a/plugins/ethernet.c +++ b/plugins/ethernet.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2008 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2013 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 @@ -23,204 +23,265 @@ #include #endif -#include +#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include + +#include +#include +#include + +#ifndef IFF_LOWER_UP +#define IFF_LOWER_UP 0x10000 +#endif + +#include +#define CONNMAN_API_SUBJECT_TO_CHANGE +#include #include #include +#include #include #include +#include + +static bool eth_tethering = false; 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 get_vlan_vid(const char *ifname) { - if (flags & IFF_UP) { - DBG("power on"); + struct vlan_ioctl_args vifr; + int vid; + int sk; - connman_device_set_powered(device, TRUE); - } else { - DBG("power off"); + memset(&vifr, 0, sizeof(vifr)); - connman_device_set_powered(device, FALSE); - } + sk = socket(AF_INET, SOCK_STREAM, 0); + if (sk < 0) + return -errno; + + vifr.cmd = GET_VLAN_VID_CMD; + stpncpy(vifr.device1, ifname, sizeof(vifr.device1)); + + if(ioctl(sk, SIOCSIFVLAN, &vifr) >= 0) + vid = vifr.u.VID; + else + vid = -errno; + + close(sk); + + return vid; } -static void update_carrier(struct connman_device *device, unsigned flags) +static int get_dsa_port(const char *ifname) { - struct connman_element *netdev; + int sk; + int dsaport = -1; + struct ifreq ifr; + struct ethtool_cmd cmd; + struct ethtool_drvinfo drvinfocmd; + struct vlan_ioctl_args vifr; + + sk = socket(AF_INET, SOCK_STREAM, 0); + if (sk < 0) + return -errno; - if (flags & IFF_LOWER_UP) { - DBG("carrier on"); + memset(&ifr, 0, sizeof(ifr)); + stpncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - 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; + /* check if it is a vlan and get physical interface name*/ + vifr.cmd = GET_VLAN_REALDEV_NAME_CMD; + stpncpy(vifr.device1, ifname, sizeof(vifr.device1)); - if (connman_element_register(netdev, - device->element) < 0) - connman_element_unref(netdev); - } - } else { - DBG("carrier off"); + if(ioctl(sk, SIOCSIFVLAN, &vifr) >= 0) + stpncpy(ifr.ifr_name, vifr.u.device2, sizeof(ifr.ifr_name)); + + /* get driver info */ + drvinfocmd.cmd = ETHTOOL_GDRVINFO; + ifr.ifr_data = (caddr_t)&drvinfocmd; + + if (!ioctl(sk, SIOCETHTOOL, &ifr)) { + if(!strcmp(drvinfocmd.driver, "dsa")) { + /* get dsa port*/ + cmd.cmd = ETHTOOL_GSET; + ifr.ifr_data = (caddr_t)&cmd; - connman_element_unregister_children(device->element); + if (!ioctl(sk, SIOCETHTOOL, &ifr)) + dsaport = cmd.phy_address; + } } + close(sk); + + return dsaport; } -static void ethernet_newlink(unsigned short type, int index, - unsigned flags, unsigned change) +static int eth_network_probe(struct connman_network *network) { - GSList *list; + DBG("network %p", network); - DBG("index %d flags %ld change %ld", index, flags, change); + return 0; +} - for (list = ethernet_list; list; list = list->next) { - struct connman_device *device = list->data; - struct ethernet_data *ethernet; +static void eth_network_remove(struct connman_network *network) +{ + DBG("network %p", network); +} - ethernet = connman_device_get_data(device); - if (ethernet == NULL) - continue; +static int eth_network_connect(struct connman_network *network) +{ + DBG("network %p", network); + + connman_network_set_connected(network, true); - if (ethernet->index != index) - continue; + return 0; +} - if ((ethernet->flags & IFF_UP) != (flags & IFF_UP)) - update_power(device, flags); +static int eth_network_disconnect(struct connman_network *network) +{ + DBG("network %p", network); - if ((ethernet->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) - update_carrier(device, flags); + connman_network_set_connected(network, false); - ethernet->flags = flags; - } + return 0; } -static struct connman_rtnl ethernet_rtnl = { - .name = "ethernet", - .newlink = ethernet_newlink, +static struct connman_network_driver eth_network_driver = { + .name = "cable", + .type = CONNMAN_NETWORK_TYPE_ETHERNET, + .probe = eth_network_probe, + .remove = eth_network_remove, + .connect = eth_network_connect, + .disconnect = eth_network_disconnect, }; -static int iface_up(struct ethernet_data *ethernet) +static void add_network(struct connman_device *device, + struct ethernet_data *ethernet) { - 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; + struct connman_network *network; + int index; + char *ifname; - memset(&ifr, 0, sizeof(ifr)); - ifr.ifr_ifindex = ethernet->index; + network = connman_network_create("carrier", + CONNMAN_NETWORK_TYPE_ETHERNET); + if (!network) + return; - if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) { - err = -errno; - goto done; - } + index = connman_device_get_index(device); + connman_network_set_index(network, index); + ifname = connman_inet_ifname(index); + if (!ifname) + return; - if (ioctl(sk, SIOCGIFFLAGS, &ifr) < 0) { - err = -errno; - goto done; - } + connman_network_set_name(network, "Wired"); - if (ifr.ifr_flags & IFF_UP) { - err = -EALREADY; - goto done; + if (connman_device_add_network(device, network) < 0) { + connman_network_unref(network); + g_free(ifname); + return; } - ifr.ifr_flags |= IFF_UP; - - if (ioctl(sk, SIOCSIFFLAGS, &ifr) < 0) { - err = -errno; - goto done; + if (!eth_tethering) { + char group[25] = "cable"; + int vid, dsaport; + + vid = get_vlan_vid(ifname); + dsaport = get_dsa_port(ifname); + + /* + * Prevent service from starting the reconnect + * procedure as we do not want the DHCP client + * to run when tethering. + */ + if((vid >= 0) && (dsaport >= 0)) + snprintf(group, sizeof(group), "p%02x_%03x_cable", dsaport, vid); + else if (vid >= 0) + snprintf(group, sizeof(group), "%03x_cable", vid); + else if (dsaport >= 0) + snprintf(group, sizeof(group), "p%02x_cable", dsaport); + + connman_network_set_group(network, group); } - err = 0; - -done: - close(sk); - - return err; + ethernet->network = network; + g_free(ifname); } -static int iface_down(struct ethernet_data *ethernet) +static void remove_network(struct connman_device *device, + struct ethernet_data *ethernet) { - struct ifreq ifr; - int sk, err; + if (!ethernet->network) + return; - DBG("index %d flags %d", ethernet->index, ethernet->flags); + connman_device_remove_network(device, ethernet->network); + connman_network_unref(ethernet->network); - sk = socket(PF_INET, SOCK_DGRAM, 0); - if (sk < 0) - return -errno; + ethernet->network = NULL; +} - memset(&ifr, 0, sizeof(ifr)); - ifr.ifr_ifindex = ethernet->index; +static void ethernet_newlink(unsigned flags, unsigned change, void *user_data) +{ + 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, ethernet); + } else { + DBG("carrier off"); + remove_network(device, ethernet); + } } - 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) +static int eth_dev_probe(struct connman_device *device) { struct ethernet_data *ethernet; DBG("device %p", device); ethernet = g_try_new0(struct ethernet_data, 1); - if (ethernet == NULL) + if (!ethernet) 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; } -static void ethernet_remove(struct connman_device *device) +static void eth_dev_remove(struct connman_device *device) { struct ethernet_data *ethernet = connman_device_get_data(device); @@ -228,49 +289,164 @@ static void ethernet_remove(struct connman_device *device) connman_device_set_data(device, NULL); - ethernet_list = g_slist_remove(ethernet_list, device); + connman_rtnl_remove_watch(ethernet->watch); + + remove_network(device, ethernet); g_free(ethernet); } -static int ethernet_enable(struct connman_device *device) +static int eth_dev_enable(struct connman_device *device) { struct ethernet_data *ethernet = connman_device_get_data(device); DBG("device %p", device); - return iface_up(ethernet); + return connman_inet_ifup(ethernet->index); } -static int ethernet_disable(struct connman_device *device) +static int eth_dev_disable(struct connman_device *device) { struct ethernet_data *ethernet = connman_device_get_data(device); DBG("device %p", device); - return iface_down(ethernet); + return connman_inet_ifdown(ethernet->index); } -static struct connman_device_driver ethernet_driver = { +static struct connman_device_driver eth_dev_driver = { .name = "ethernet", .type = CONNMAN_DEVICE_TYPE_ETHERNET, - .probe = ethernet_probe, - .remove = ethernet_remove, - .enable = ethernet_enable, - .disable = ethernet_disable, + .probe = eth_dev_probe, + .remove = eth_dev_remove, + .enable = eth_dev_enable, + .disable = eth_dev_disable, +}; + +static int eth_tech_probe(struct connman_technology *technology) +{ + return 0; +} + +static void eth_tech_remove(struct connman_technology *technology) +{ + DBG(""); +} + +static GList *eth_interface_list = NULL; + +static void eth_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(eth_interface_list, GINT_TO_POINTER((int)index))) + return; + + eth_interface_list = g_list_prepend(eth_interface_list, + (GINT_TO_POINTER((int) index))); +} + +static void eth_tech_remove_interface(struct connman_technology *technology, + int index) +{ + DBG("index %d", index); + + eth_interface_list = g_list_remove(eth_interface_list, + GINT_TO_POINTER((int) index)); +} + +static void eth_tech_enable_tethering(struct connman_technology *technology, + const char *bridge) +{ + GList *list; + struct ethernet_data *ethernet; + + for (list = eth_interface_list; list; list = list->next) { + int index = GPOINTER_TO_INT(list->data); + struct connman_device *device = + connman_device_find_by_index(index); + + if (device) { + ethernet = connman_device_get_data(device); + if (ethernet) + remove_network(device, ethernet); + } + + connman_technology_tethering_notify(technology, true); + + connman_inet_ifup(index); + + connman_inet_add_to_bridge(index, bridge); + + eth_tethering = true; + } +} + +static void eth_tech_disable_tethering(struct connman_technology *technology, + const char *bridge) +{ + GList *list; + + for (list = eth_interface_list; list; list = list->next) { + int index = GPOINTER_TO_INT(list->data); + struct connman_device *device = + connman_device_find_by_index(index); + + connman_inet_remove_from_bridge(index, bridge); + + connman_technology_tethering_notify(technology, false); + + if (device) + connman_device_reconnect_service(device); + + eth_tethering = false; + } +} + +static int eth_tech_set_tethering(struct connman_technology *technology, + const char *identifier, const char *passphrase, + const char *bridge, bool enabled) +{ + if (!connman_technology_is_tethering_allowed( + CONNMAN_SERVICE_TYPE_ETHERNET)) + return 0; + + DBG("bridge %s enabled %d", bridge, enabled); + + if (enabled) + eth_tech_enable_tethering(technology, bridge); + else + eth_tech_disable_tethering(technology, bridge); + + return 0; +} + +static struct connman_technology_driver eth_tech_driver = { + .name = "ethernet", + .type = CONNMAN_SERVICE_TYPE_ETHERNET, + .probe = eth_tech_probe, + .remove = eth_tech_remove, + .add_interface = eth_tech_add_interface, + .remove_interface = eth_tech_remove_interface, + .set_tethering = eth_tech_set_tethering, }; static int ethernet_init(void) { int err; - err = connman_rtnl_register(ðernet_rtnl); + err = connman_technology_driver_register(ð_tech_driver); if (err < 0) return err; - err = connman_device_driver_register(ðernet_driver); + err = connman_network_driver_register(ð_network_driver); + if (err < 0) + return err; + + err = connman_device_driver_register(ð_dev_driver); if (err < 0) { - connman_rtnl_unregister(ðernet_rtnl); + connman_network_driver_unregister(ð_network_driver); return err; } @@ -279,10 +455,12 @@ static int ethernet_init(void) static void ethernet_exit(void) { - connman_device_driver_unregister(ðernet_driver); + connman_technology_driver_unregister(ð_tech_driver); + + connman_network_driver_unregister(ð_network_driver); - connman_rtnl_unregister(ðernet_rtnl); + connman_device_driver_unregister(ð_dev_driver); } CONNMAN_PLUGIN_DEFINE(ethernet, "Ethernet interface plugin", VERSION, - ethernet_init, ethernet_exit) + CONNMAN_PLUGIN_PRIORITY_DEFAULT, ethernet_init, ethernet_exit)