X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fethernet.c;h=9e157467f2c079316b32c763a4b39b96771fe488;hb=55711cd139bfe3ecfba94288d49b311994585130;hp=2181bdee11774589f5b3b2def387df8d8c232aa8;hpb=4373a96829d0ed1153b5c72f8ef7c9522e3b7a07;p=platform%2Fupstream%2Fconnman.git diff --git a/plugins/ethernet.c b/plugins/ethernet.c index 2181bde..9e15746 100644 --- a/plugins/ethernet.c +++ b/plugins/ethernet.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2009 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 @@ -25,6 +25,15 @@ #include #include +#include +#include +#include +#include +#include + +#include +#include +#include #ifndef IFF_LOWER_UP #define IFF_LOWER_UP 0x10000 @@ -33,11 +42,18 @@ #include #define CONNMAN_API_SUBJECT_TO_CHANGE +#include #include #include #include #include #include +#include +#if defined TIZEN_EXT_WIFI_MESH +#include +#endif + +static bool eth_tethering = false; struct ethernet_data { int index; @@ -46,69 +62,175 @@ struct ethernet_data { struct connman_network *network; }; -static int cable_probe(struct connman_network *network) + +static int get_vlan_vid(const char *ifname) +{ + struct vlan_ioctl_args vifr; + int vid; + int sk; + + memset(&vifr, 0, sizeof(vifr)); + + sk = socket(AF_INET, SOCK_STREAM, 0); + if (sk < 0) + return -errno; + + vifr.cmd = GET_VLAN_VID_CMD; + strncpy(vifr.device1, ifname, sizeof(vifr.device1)); + + if(ioctl(sk, SIOCSIFVLAN, &vifr) >= 0) + vid = vifr.u.VID; + else + vid = -errno; + + close(sk); + + return vid; +} + +static int get_dsa_port(const char *ifname) +{ + 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; + + memset(&ifr, 0, sizeof(ifr)); + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + + /* check if it is a vlan and get physical interface name*/ + vifr.cmd = GET_VLAN_REALDEV_NAME_CMD; + strncpy(vifr.device1, ifname, sizeof(vifr.device1)); + + if(ioctl(sk, SIOCSIFVLAN, &vifr) >= 0) + strncpy(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; + + if (!ioctl(sk, SIOCETHTOOL, &ifr)) + dsaport = cmd.phy_address; + } + } + close(sk); + + return dsaport; +} + +static int eth_network_probe(struct connman_network *network) { DBG("network %p", network); return 0; } -static void cable_remove(struct connman_network *network) +static void eth_network_remove(struct connman_network *network) { DBG("network %p", network); } -static int cable_connect(struct connman_network *network) +static int eth_network_connect(struct connman_network *network) { DBG("network %p", network); + connman_network_set_connected(network, true); + return 0; } -static int cable_disconnect(struct connman_network *network) +static int eth_network_disconnect(struct connman_network *network) { DBG("network %p", network); + connman_network_set_connected(network, false); + return 0; } -static struct connman_network_driver cable_driver = { +static struct connman_network_driver eth_network_driver = { .name = "cable", .type = CONNMAN_NETWORK_TYPE_ETHERNET, - .probe = cable_probe, - .remove = cable_remove, - .connect = cable_connect, - .disconnect = cable_disconnect, + .probe = eth_network_probe, + .remove = eth_network_remove, + .connect = eth_network_connect, + .disconnect = eth_network_disconnect, }; -static void add_network(struct connman_device *device) +static void add_network(struct connman_device *device, + struct ethernet_data *ethernet) { struct connman_network *network; int index; + char *ifname; network = connman_network_create("carrier", CONNMAN_NETWORK_TYPE_ETHERNET); - if (network == NULL) + if (!network) return; index = connman_device_get_index(device); connman_network_set_index(network, index); + ifname = connman_inet_ifname(index); + if (!ifname) + return; connman_network_set_name(network, "Wired"); - connman_network_set_protocol(network, CONNMAN_NETWORK_PROTOCOL_IP); if (connman_device_add_network(device, network) < 0) { connman_network_unref(network); + g_free(ifname); return; } - connman_network_set_available(network, TRUE); + 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); + } - connman_network_set_group(network, "cable"); + ethernet->network = network; + g_free(ifname); +} - connman_network_set_method(network, CONNMAN_IPCONFIG_METHOD_DHCP); +static void remove_network(struct connman_device *device, + struct ethernet_data *ethernet) +{ + if (!ethernet->network) + return; + + connman_device_remove_network(device, ethernet->network); + connman_network_unref(ethernet->network); - connman_network_set_connected(network, TRUE); + ethernet->network = NULL; } static void ethernet_newlink(unsigned flags, unsigned change, void *user_data) @@ -121,34 +243,38 @@ static void ethernet_newlink(unsigned flags, unsigned change, void *user_data) if ((ethernet->flags & IFF_UP) != (flags & IFF_UP)) { if (flags & IFF_UP) { DBG("power on"); - connman_device_set_powered(device, TRUE); + connman_device_set_powered(device, true); } else { DBG("power off"); - connman_device_set_powered(device, FALSE); + connman_device_set_powered(device, false); } } if ((ethernet->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) { if (flags & IFF_LOWER_UP) { DBG("carrier on"); - add_network(device); + add_network(device, ethernet); } else { DBG("carrier off"); - connman_device_remove_all_networks(device); + remove_network(device, ethernet); +#if defined TIZEN_EXT_WIFI_MESH + /* Remove ethernet from mesh bridge */ + __connman_mesh_remove_ethernet_from_bridge(); +#endif } } 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; connman_device_set_data(device, ethernet); @@ -162,7 +288,7 @@ static int ethernet_probe(struct connman_device *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); @@ -172,12 +298,12 @@ static void ethernet_remove(struct connman_device *device) connman_rtnl_remove_watch(ethernet->watch); - connman_device_remove_all_networks(device); + 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); @@ -186,7 +312,7 @@ static int ethernet_enable(struct connman_device *device) 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); @@ -195,26 +321,193 @@ static int ethernet_disable(struct connman_device *device) 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, +}; + +#if defined TIZEN_EXT_WIFI_MESH +static int eth_mesh_add_to_bridge(const char *bridge) +{ + GList *list; + struct ethernet_data *ethernet; + + DBG("Add ethernet to bridge %s", bridge); + + 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_inet_ifup(index); + + connman_inet_add_to_bridge(index, bridge); + } + + return 0; +} + +static int eth_mesh_remove_from_bridge(const char *bridge) +{ + GList *list; + + DBG("Remove ethernet from bridge %s", bridge); + + for (list = eth_interface_list; list; list = list->next) { + int index = GPOINTER_TO_INT(list->data); + + connman_inet_remove_from_bridge(index, bridge); + } + + return 0; +} + +static struct connman_mesh_eth_driver eth_mesh_driver = { + .add_to_bridge = eth_mesh_add_to_bridge, + .remove_from_bridge = eth_mesh_remove_from_bridge, +}; +#endif + static int ethernet_init(void) { int err; - err = connman_network_driver_register(&cable_driver); + err = connman_technology_driver_register(ð_tech_driver); if (err < 0) return err; - err = connman_device_driver_register(ðernet_driver); +#if defined TIZEN_EXT_WIFI_MESH + err = connman_mesh_eth_driver_register(ð_mesh_driver); + if (err < 0) + return err; +#endif + + err = connman_network_driver_register(ð_network_driver); + if (err < 0) + return err; + + err = connman_device_driver_register(ð_dev_driver); if (err < 0) { - connman_network_driver_unregister(&cable_driver); + connman_network_driver_unregister(ð_network_driver); return err; } @@ -223,9 +516,15 @@ static int ethernet_init(void) static void ethernet_exit(void) { - connman_network_driver_unregister(&cable_driver); + connman_technology_driver_unregister(ð_tech_driver); + +#if defined TIZEN_EXT_WIFI_MESH + connman_mesh_eth_driver_unregister(ð_mesh_driver); +#endif + + connman_network_driver_unregister(ð_network_driver); - connman_device_driver_unregister(ðernet_driver); + connman_device_driver_unregister(ð_dev_driver); } CONNMAN_PLUGIN_DEFINE(ethernet, "Ethernet interface plugin", VERSION,