Merge "Change g_waring to g_message" into tizen

[platform/upstream/connman.git] / plugins / ethernet.c

diff --git a/plugins/ethernet.c b/plugins/ethernet.c
index d176508..9e15746 100644 (file)
--- a/plugins/ethernet.c
+++ b/plugins/ethernet.c
@@ -27,11 +27,13 @@
 #include <net/if.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include <sys/types.h>
 #include <unistd.h>
 #include <stdio.h>
 
 #include <linux/if_vlan.h>
 #include <linux/sockios.h>
+#include <linux/ethtool.h>
 
 #ifndef IFF_LOWER_UP
 #define IFF_LOWER_UP   0x10000
@@ -47,6 +49,9 @@
 #include <connman/rtnl.h>
 #include <connman/log.h>
 #include <connman/setting.h>
+#if defined TIZEN_EXT_WIFI_MESH
+#include <connman/mesh.h>
+#endif
 
 static bool eth_tethering = false;
 
@@ -83,6 +88,48 @@ static int get_vlan_vid(const char *ifname)
        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);
@@ -126,7 +173,7 @@ static void add_network(struct connman_device *device,
                        struct ethernet_data *ethernet)
 {
        struct connman_network *network;
-       int index, vid;
+       int index;
        char *ifname;
 
        network = connman_network_create("carrier",
@@ -139,24 +186,33 @@ static void add_network(struct connman_device *device,
        ifname = connman_inet_ifname(index);
        if (!ifname)
                return;
-       vid = get_vlan_vid(ifname);
 
        connman_network_set_name(network, "Wired");
 
        if (connman_device_add_network(device, network) < 0) {
                connman_network_unref(network);
+               g_free(ifname);
                return;
        }
 
        if (!eth_tethering) {
-               char group[10] = "cable";
+               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)
+               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);
        }
@@ -201,6 +257,10 @@ static void ethernet_newlink(unsigned flags, unsigned change, void *user_data)
                } else {
                        DBG("carrier off");
                        remove_network(device, ethernet);
+#if defined TIZEN_EXT_WIFI_MESH
+                       /* Remove ethernet from mesh bridge */
+                       __connman_mesh_remove_ethernet_from_bridge();
+#endif
                }
        }
 
@@ -379,6 +439,54 @@ static struct connman_technology_driver eth_tech_driver = {
        .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;
@@ -387,6 +495,12 @@ static int ethernet_init(void)
        if (err < 0)
                return err;
 
+#if defined TIZEN_EXT_WIFI_MESH
+       err = connman_mesh_eth_driver_register(&eth_mesh_driver);
+       if (err < 0)
+               return err;
+#endif
+
        err = connman_network_driver_register(&eth_network_driver);
        if (err < 0)
                return err;
@@ -404,6 +518,10 @@ static void ethernet_exit(void)
 {
        connman_technology_driver_unregister(&eth_tech_driver);
 
+#if defined TIZEN_EXT_WIFI_MESH
+       connman_mesh_eth_driver_unregister(&eth_mesh_driver);
+#endif
+
        connman_network_driver_unregister(&eth_network_driver);
 
        connman_device_driver_unregister(&eth_dev_driver);