Add support for notifier registration for Intel OSPM module

[connman] / plugins / wifi.c

diff --git a/plugins/wifi.c b/plugins/wifi.c
index 40a5913..a86b00e 100644 (file)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2008  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2009  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,63 +23,170 @@
 #include <config.h>
 #endif
 
+#include <errno.h>
+
+#include <dbus/dbus.h>
+#include <glib.h>
+
+#define CONNMAN_API_SUBJECT_TO_CHANGE
 #include <connman/plugin.h>
-#include <connman/driver.h>
+#include <connman/device.h>
 #include <connman/log.h>
 
+#include "inet.h"
 #include "supplicant.h"
 
-static void scan_result(struct connman_element *element,
-                                       struct supplicant_network *network)
+#define CLEANUP_TIMEOUT   8    /* in seconds */
+#define INACTIVE_TIMEOUT  12   /* in seconds */
+
+struct wifi_data {
+       char *identifier;
+       connman_bool_t connected;
+};
+
+static int network_probe(struct connman_network *network)
 {
-       DBG("element %p name %s", element, element->name);
+       DBG("network %p", network);
 
-       DBG("network %p identifier %s", network, network->identifier);
+       return 0;
 }
 
-static struct supplicant_callback wifi_callback = {
-       .scan_result    = scan_result,
+static void network_remove(struct connman_network *network)
+{
+       DBG("network %p", network);
+}
+
+static int network_connect(struct connman_network *network)
+{
+       DBG("network %p", network);
+
+       return supplicant_connect(network);
+}
+
+static int network_disconnect(struct connman_network *network)
+{
+       DBG("network %p", network);
+
+       return supplicant_disconnect(network);
+}
+
+static struct connman_network_driver network_driver = {
+       .name           = "wifi",
+       .type           = CONNMAN_NETWORK_TYPE_WIFI,
+       .probe          = network_probe,
+       .remove         = network_remove,
+       .connect        = network_connect,
+       .disconnect     = network_disconnect,
 };
 
-static int wifi_probe(struct connman_element *element)
+static int wifi_probe(struct connman_device *device)
 {
-       int err;
+       struct wifi_data *data;
 
-       DBG("element %p name %s", element, element->name);
+       DBG("device %p", device);
 
-       err = __supplicant_start(element, &wifi_callback);
-       if (err < 0)
-               return err;
+       data = g_try_new0(struct wifi_data, 1);
+       if (data == NULL)
+               return -ENOMEM;
+
+       data->connected = FALSE;
 
-       __supplicant_scan(element);
+       connman_device_set_data(device, data);
 
        return 0;
 }
 
-static void wifi_remove(struct connman_element *element)
+static void wifi_remove(struct connman_device *device)
+{
+       struct wifi_data *data = connman_device_get_data(device);
+
+       DBG("device %p", device);
+
+       connman_device_set_data(device, NULL);
+
+       g_free(data->identifier);
+       g_free(data);
+}
+
+static int wifi_enable(struct connman_device *device)
+{
+       DBG("device %p", device);
+
+       return supplicant_start(device);
+}
+
+static int wifi_disable(struct connman_device *device)
 {
-       DBG("element %p name %s", element, element->name);
+       struct wifi_data *data = connman_device_get_data(device);
+
+       DBG("device %p", device);
 
-       __supplicant_stop(element);
+       data->connected = FALSE;
+
+       return supplicant_stop(device);
 }
 
-static struct connman_driver wifi_driver = {
+static int wifi_scan(struct connman_device *device)
+{
+       DBG("device %p", device);
+
+       return supplicant_scan(device);
+}
+
+static struct connman_device_driver wifi_driver = {
        .name           = "wifi",
-       .type           = CONNMAN_ELEMENT_TYPE_DEVICE,
-       .subtype        = CONNMAN_ELEMENT_SUBTYPE_WIFI,
+       .type           = CONNMAN_DEVICE_TYPE_WIFI,
        .probe          = wifi_probe,
        .remove         = wifi_remove,
+       .enable         = wifi_enable,
+       .disable        = wifi_disable,
+       .scan           = wifi_scan,
+};
+
+static void wifi_register(void)
+{
+       DBG("");
+
+       if (connman_device_driver_register(&wifi_driver) < 0)
+               connman_error("Failed to register WiFi driver");
+}
+
+static void wifi_unregister(void)
+{
+       DBG("");
+
+       connman_device_driver_unregister(&wifi_driver);
+}
+
+static struct supplicant_driver supplicant = {
+       .name           = "wifi",
+       .probe          = wifi_register,
+       .remove         = wifi_unregister,
 };
 
 static int wifi_init(void)
 {
-       return connman_driver_register(&wifi_driver);
+       int err;
+
+       err = connman_network_driver_register(&network_driver);
+       if (err < 0)
+               return err;
+
+       err = supplicant_register(&supplicant);
+       if (err < 0) {
+               connman_network_driver_unregister(&network_driver);
+               return err;
+       }
+
+       return 0;
 }
 
 static void wifi_exit(void)
 {
-       connman_driver_unregister(&wifi_driver);
+       supplicant_unregister(&supplicant);
+
+       connman_network_driver_unregister(&network_driver);
 }
 
-CONNMAN_PLUGIN_DEFINE("WiFi", "WiFi interface plugin", VERSION,
-                                                       wifi_init, wifi_exit)
+CONNMAN_PLUGIN_DEFINE(wifi, "WiFi interface plugin", VERSION,
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, wifi_init, wifi_exit)