network: Remove connman_network_register/unregister()
[platform/upstream/connman.git] / plugins / ethernet.c
index 2851bf5..2ccd498 100644 (file)
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2009  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
@@ -33,6 +33,7 @@
 #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>
@@ -43,8 +44,71 @@ struct ethernet_data {
        int index;
        unsigned flags;
        unsigned int watch;
+       struct connman_network *network;
 };
 
+static int cable_probe(struct connman_network *network)
+{
+       DBG("network %p", network);
+
+       return 0;
+}
+
+static void cable_remove(struct connman_network *network)
+{
+       DBG("network %p", network);
+}
+
+static int cable_connect(struct connman_network *network)
+{
+       DBG("network %p", network);
+
+       return 0;
+}
+
+static int cable_disconnect(struct connman_network *network)
+{
+       DBG("network %p", network);
+
+       return 0;
+}
+
+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 void add_network(struct connman_device *device)
+{
+       struct connman_network *network;
+       int index;
+
+       network = connman_network_create("carrier",
+                                       CONNMAN_NETWORK_TYPE_ETHERNET);
+       if (network == NULL)
+               return;
+
+       index = connman_device_get_index(device);
+       connman_network_set_index(network, index);
+
+       connman_network_set_name(network, "Wired");
+
+       if (connman_device_add_network(device, network) < 0) {
+               connman_network_unref(network);
+               return;
+       }
+
+       connman_network_set_available(network, TRUE);
+
+       connman_network_set_group(network, "cable");
+
+       connman_network_set_connected(network, TRUE);
+}
+
 static void ethernet_newlink(unsigned flags, unsigned change, void *user_data)
 {
        struct connman_device *device = user_data;
@@ -65,10 +129,10 @@ static void ethernet_newlink(unsigned flags, unsigned change, void *user_data)
        if ((ethernet->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
                if (flags & IFF_LOWER_UP) {
                        DBG("carrier on");
-                       connman_device_set_carrier(device, TRUE);
+                       add_network(device);
                } else {
                        DBG("carrier off");
-                       connman_device_set_carrier(device, FALSE);
+                       connman_device_remove_all_networks(device);
                }
        }
 
@@ -93,8 +157,6 @@ static int ethernet_probe(struct connman_device *device)
        ethernet->watch = connman_rtnl_add_newlink_watch(ethernet->index,
                                                ethernet_newlink, device);
 
-       connman_rtnl_send_getlink();
-
        return 0;
 }
 
@@ -108,6 +170,8 @@ static void ethernet_remove(struct connman_device *device)
 
        connman_rtnl_remove_watch(ethernet->watch);
 
+       connman_device_remove_all_networks(device);
+
        g_free(ethernet);
 }
 
@@ -129,52 +193,137 @@ static int ethernet_disable(struct connman_device *device)
        return connman_inet_ifdown(ethernet->index);
 }
 
-static int ethernet_connect(struct connman_device *device)
+static struct connman_device_driver ethernet_driver = {
+       .name           = "ethernet",
+       .type           = CONNMAN_DEVICE_TYPE_ETHERNET,
+       .probe          = ethernet_probe,
+       .remove         = ethernet_remove,
+       .enable         = ethernet_enable,
+       .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)
 {
-       struct ethernet_data *ethernet = connman_device_get_data(device);
+       DBG("index %d name %s ident %s", index, name, ident);
 
-       DBG("device %p", device);
+       if (g_list_find(cdc_interface_list,
+                       GINT_TO_POINTER((int) index)) != NULL)
+               return;
 
-       if (!(ethernet->flags & IFF_LOWER_UP))
-               return -ENOTCONN;
+       cdc_interface_list = g_list_prepend(cdc_interface_list,
+                                       (GINT_TO_POINTER((int) index)));
+}
 
-       connman_device_set_carrier(device, TRUE);
+static void tech_remove_interface(struct connman_technology *technology,
+                                                               int index)
+{
+       DBG("index %d", index);
 
-       return 0;
+       cdc_interface_list = g_list_remove(cdc_interface_list,
+                                       GINT_TO_POINTER((int) index));
 }
 
-static int ethernet_disconnect(struct connman_device *device)
+static void enable_tethering(struct connman_technology *technology,
+                                               const char *bridge)
 {
-       struct ethernet_data *ethernet = connman_device_get_data(device);
+       GList *list;
 
-       DBG("device %p", device);
+       for (list = cdc_interface_list; list; list = list->next) {
+               int index = GPOINTER_TO_INT(list->data);
+
+               connman_technology_tethering_notify(technology, TRUE);
+
+               connman_inet_ifup(index);
+
+               connman_inet_add_to_bridge(index, bridge);
+       }
+}
 
-       if (!(ethernet->flags & IFF_LOWER_UP))
-               return -ENOTCONN;
+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_device_set_carrier(device, FALSE);
+               connman_inet_ifdown(index);
+
+               connman_technology_tethering_notify(technology, FALSE);
+       }
+}
+
+static int tech_set_tethering(struct connman_technology *technology,
+                               const char *identifier, const char *passphrase,
+                               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 struct connman_device_driver ethernet_driver = {
-       .name           = "ethernet",
-       .type           = CONNMAN_DEVICE_TYPE_ETHERNET,
-       .probe          = ethernet_probe,
-       .remove         = ethernet_remove,
-       .enable         = ethernet_enable,
-       .disable        = ethernet_disable,
-       .connect        = ethernet_connect,
-       .disconnect     = ethernet_disconnect,
+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)
 {
-       return connman_device_driver_register(&ethernet_driver);
+       int err;
+
+       err = connman_network_driver_register(&cable_driver);
+       if (err < 0)
+               return err;
+
+       err = connman_device_driver_register(&ethernet_driver);
+       if (err < 0) {
+               connman_network_driver_unregister(&cable_driver);
+               return err;
+       }
+
+       err = connman_technology_driver_register(&tech_driver);
+       if (err < 0) {
+               connman_device_driver_unregister(&ethernet_driver);
+               connman_network_driver_unregister(&cable_driver);
+               return err;
+       }
+
+       return 0;
 }
 
 static void ethernet_exit(void)
 {
+       connman_technology_driver_unregister(&tech_driver);
+
+       connman_network_driver_unregister(&cable_driver);
+
        connman_device_driver_unregister(&ethernet_driver);
 }