Use async creation and removal for supplicant interfaces
[connman] / plugins / supplicant.c
index ec0b7e7..88e8123 100644 (file)
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007  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
 #include <config.h>
 #endif
 
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <net/if.h>
+#include <string.h>
 
-#include <glib.h>
+#include <gdbus.h>
 
+#define CONNMAN_API_SUBJECT_TO_CHANGE
+#include <connman/log.h>
+#include <connman/dbus.h>
+
+#include "inet.h"
 #include "supplicant.h"
 
+#define TIMEOUT 5000
+
+#define IEEE80211_CAP_ESS       0x0001
+#define IEEE80211_CAP_IBSS      0x0002
+#define IEEE80211_CAP_PRIVACY   0x0010
+
+static GSList *driver_list = NULL;
+
+static void process_state_change(struct connman_device *device,
+                                               enum supplicant_state state)
+{
+       GSList *list;
+
+       for (list = driver_list; list; list = list->next) {
+               struct supplicant_driver *driver = list->data;
+
+               if (driver->state_change)
+                       driver->state_change(device, state);
+       }
+}
+
+static void process_clear_results(struct connman_device *device)
+{
+       GSList *list;
+
+       for (list = driver_list; list; list = list->next) {
+               struct supplicant_driver *driver = list->data;
+
+               if (driver->clear_results)
+                       driver->clear_results(device);
+       }
+}
+
+static void process_scan_result(struct connman_device *device,
+                                       struct supplicant_network *network)
+{
+       GSList *list;
+
+       for (list = driver_list; list; list = list->next) {
+               struct supplicant_driver *driver = list->data;
+
+               if (driver->scan_result)
+                       driver->scan_result(device, network);
+       }
+}
+
 struct supplicant_task {
-       GPid pid;
        int ifindex;
-       char *ifname;
-       struct connman_iface *iface;
-       int socket;
-       GIOChannel *channel;
+       gchar *ifname;
+       struct connman_device *device;
+       gchar *path;
+       gboolean created;
+       gchar *network;
+       enum supplicant_state state;
 };
 
-static GSList *tasks = NULL;
+static GSList *task_list = NULL;
+
+static DBusConnection *connection;
+
+static void free_task(struct supplicant_task *task)
+{
+       DBG("task %p", task);
+
+       g_free(task->ifname);
+       g_free(task->path);
+       g_free(task);
+}
 
-static struct supplicant_task *find_task(int ifindex)
+static struct supplicant_task *find_task_by_index(int index)
 {
        GSList *list;
 
-       for (list = tasks; list; list = list->next) {
+       for (list = task_list; list; list = list->next) {
                struct supplicant_task *task = list->data;
 
-               if (task->ifindex == ifindex) 
+               if (task->ifindex == index)
                        return task;
        }
 
        return NULL;
 }
 
-static int exec_cmd(struct supplicant_task *task, char *cmd)
+static struct supplicant_task *find_task_by_path(const char *path)
+{
+       GSList *list;
+
+       for (list = task_list; list; list = list->next) {
+               struct supplicant_task *task = list->data;
+
+               if (g_str_equal(task->path, path) == TRUE)
+                       return task;
+       }
+
+       return NULL;
+}
+
+static void add_interface_reply(DBusPendingCall *call, void *user_data)
+{
+       struct supplicant_task *task = user_data;
+       DBusMessage *reply;
+       DBusError error;
+       const char *path;
+
+       DBG("task %p", task);
+
+       reply = dbus_pending_call_steal_reply(call);
+       if (reply == NULL)
+               return;
+
+       if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR)
+               goto done;
+
+       dbus_error_init(&error);
+
+       if (dbus_message_get_args(reply, &error, DBUS_TYPE_OBJECT_PATH, &path,
+                                               DBUS_TYPE_INVALID) == FALSE) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       connman_error("%s", error.message);
+                       dbus_error_free(&error);
+               } else
+                       connman_error("Wrong arguments for interface");
+               goto done;
+       }
+
+       DBG("path %s", path);
+
+       task->path = g_strdup(path);
+       task->created = TRUE;
+
+       connman_device_set_powered(task->device, TRUE);
+
+done:
+       dbus_message_unref(reply);
+}
+
+static int add_interface(struct supplicant_task *task)
+{
+       DBusMessage *message;
+       DBusPendingCall *call;
+
+       DBG("task %p", task);
+
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, SUPPLICANT_PATH,
+                                       SUPPLICANT_INTF, "addInterface");
+       if (message == NULL)
+               return -ENOMEM;
+
+       dbus_message_append_args(message, DBUS_TYPE_STRING, &task->ifname,
+                                                       DBUS_TYPE_INVALID);
+
+       if (dbus_connection_send_with_reply(connection, message,
+                                               &call, TIMEOUT) == FALSE) {
+               connman_error("Failed to add interface");
+               dbus_message_unref(message);
+               return -EIO;
+       }
+
+       dbus_pending_call_set_notify(call, add_interface_reply, task, NULL);
+
+       dbus_message_unref(message);
+
+       return -EINPROGRESS;
+}
+
+static void get_interface_reply(DBusPendingCall *call, void *user_data)
+{
+       struct supplicant_task *task = user_data;
+       DBusMessage *reply;
+       DBusError error;
+       const char *path;
+
+       DBG("task %p", task);
+
+       reply = dbus_pending_call_steal_reply(call);
+       if (reply == NULL)
+               return;
+
+       if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
+               add_interface(task);
+               goto done;
+       }
+
+       dbus_error_init(&error);
+
+       if (dbus_message_get_args(reply, &error, DBUS_TYPE_OBJECT_PATH, &path,
+                                               DBUS_TYPE_INVALID) == FALSE) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       connman_error("%s", error.message);
+                       dbus_error_free(&error);
+               } else
+                       connman_error("Wrong arguments for interface");
+               goto done;
+       }
+
+       DBG("path %s", path);
+
+       task->path = g_strdup(path);
+       task->created = FALSE;
+
+       connman_device_set_powered(task->device, TRUE);
+
+done:
+       dbus_message_unref(reply);
+}
+
+static int create_interface(struct supplicant_task *task)
+{
+       DBusMessage *message;
+       DBusPendingCall *call;
+
+       DBG("task %p", task);
+
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, SUPPLICANT_PATH,
+                                       SUPPLICANT_INTF, "getInterface");
+       if (message == NULL)
+               return -ENOMEM;
+
+       dbus_message_append_args(message, DBUS_TYPE_STRING, &task->ifname,
+                                                       DBUS_TYPE_INVALID);
+
+       if (dbus_connection_send_with_reply(connection, message,
+                                               &call, TIMEOUT) == FALSE) {
+               connman_error("Failed to get interface");
+               dbus_message_unref(message);
+               return -EIO;
+       }
+
+       dbus_pending_call_set_notify(call, get_interface_reply, task, NULL);
+
+       dbus_message_unref(message);
+
+       return -EINPROGRESS;
+}
+
+static void remove_interface_reply(DBusPendingCall *call, void *user_data)
+{
+       struct supplicant_task *task = user_data;
+       DBusMessage *reply;
+
+       DBG("task %p", task);
+
+       reply = dbus_pending_call_steal_reply(call);
+
+       connman_device_set_powered(task->device, FALSE);
+
+       free_task(task);
+
+       dbus_message_unref(reply);
+}
+
+static int remove_interface(struct supplicant_task *task)
 {
-       write(task->socket, cmd, strlen(cmd));
+       DBusMessage *message;
+       DBusPendingCall *call;
+
+       DBG("task %p", task);
+
+       if (task->created == FALSE) {
+               connman_device_set_powered(task->device, FALSE);
+               return 0;
+       }
+
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, SUPPLICANT_PATH,
+                                       SUPPLICANT_INTF, "removeInterface");
+       if (message == NULL)
+               return -ENOMEM;
+
+       dbus_message_append_args(message, DBUS_TYPE_OBJECT_PATH, &task->path,
+                                                       DBUS_TYPE_INVALID);
+
+       if (dbus_connection_send_with_reply(connection, message,
+                                               &call, TIMEOUT) == FALSE) {
+               connman_error("Failed to remove interface");
+               dbus_message_unref(message);
+               return -EIO;
+       }
+
+       dbus_pending_call_set_notify(call, remove_interface_reply, task, NULL);
+
+       dbus_message_unref(message);
+
+       return -EINPROGRESS;
+}
+
+#if 0
+static int set_ap_scan(struct supplicant_task *task)
+{
+       DBusMessage *message, *reply;
+       DBusError error;
+       guint32 ap_scan = 1;
+
+       DBG("task %p", task);
+
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, task->path,
+                               SUPPLICANT_INTF ".Interface", "setAPScan");
+       if (message == NULL)
+               return -ENOMEM;
+
+       dbus_message_append_args(message, DBUS_TYPE_UINT32, &ap_scan,
+                                                       DBUS_TYPE_INVALID);
+
+       dbus_error_init(&error);
+
+       reply = dbus_connection_send_with_reply_and_block(connection,
+                                                       message, -1, &error);
+       if (reply == NULL) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       connman_error("%s", error.message);
+                       dbus_error_free(&error);
+               } else
+                       connman_error("Failed to set AP scan");
+               dbus_message_unref(message);
+               return -EIO;
+       }
+
+       dbus_message_unref(message);
+
+       dbus_message_unref(reply);
 
        return 0;
 }
+#endif
 
-static gboolean control_event(GIOChannel *chan,
-                               GIOCondition cond, gpointer data)
+static int add_network(struct supplicant_task *task)
 {
-       struct supplicant_task *task = data;
-       char buf[256];
-       gsize len;
-       GIOError err;
+       DBusMessage *message, *reply;
+       DBusError error;
+       const char *path;
+
+       DBG("task %p", task);
+
+       if (task->network != NULL)
+               return -EALREADY;
 
-       if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR)) {
-               g_io_channel_unref(chan);
-               return FALSE;
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, task->path,
+                               SUPPLICANT_INTF ".Interface", "addNetwork");
+       if (message == NULL)
+               return -ENOMEM;
+
+       dbus_error_init(&error);
+
+       reply = dbus_connection_send_with_reply_and_block(connection,
+                                                       message, -1, &error);
+       if (reply == NULL) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       connman_error("%s", error.message);
+                       dbus_error_free(&error);
+               } else
+                       connman_error("Failed to add network");
+               dbus_message_unref(message);
+               return -EIO;
        }
 
-       memset(buf, 0, sizeof(buf));
+       dbus_message_unref(message);
 
-       err = g_io_channel_read(chan, buf, sizeof(buf), &len);
-       if (err) {
-               if (err == G_IO_ERROR_AGAIN)
-                       return TRUE;
-               g_io_channel_unref(chan);
-               return FALSE;
+       dbus_error_init(&error);
+
+       if (dbus_message_get_args(reply, &error, DBUS_TYPE_OBJECT_PATH, &path,
+                                               DBUS_TYPE_INVALID) == FALSE) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       connman_error("%s", error.message);
+                       dbus_error_free(&error);
+               } else
+                       connman_error("Wrong arguments for network");
+               dbus_message_unref(reply);
+               return -EIO;
        }
 
-       if (buf[0] != '<')
-               return TRUE;
+       DBG("path %s", path);
+
+       task->network = g_strdup(path);
 
-       printf("[SUPPLICANT] %s\n", buf + 3);
+       dbus_message_unref(reply);
+
+       return 0;
+}
+
+static int remove_network(struct supplicant_task *task)
+{
+       DBusMessage *message, *reply;
+       DBusError error;
 
-       if (g_str_has_prefix(buf + 3, "CTRL-EVENT-CONNECTED") == TRUE) {
-               printf("[SUPPLICANT] connected\n");
-               connman_iface_update(task->iface,
-                                       CONNMAN_IFACE_STATE_CONNECTED);
+       DBG("task %p", task);
+
+       if (task->network == NULL)
+               return -EINVAL;
+
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, task->path,
+                               SUPPLICANT_INTF ".Interface", "removeNetwork");
+       if (message == NULL)
+               return -ENOMEM;
+
+       dbus_message_append_args(message, DBUS_TYPE_OBJECT_PATH, &task->network,
+                                                       DBUS_TYPE_INVALID);
+
+       dbus_error_init(&error);
+
+       reply = dbus_connection_send_with_reply_and_block(connection,
+                                                       message, -1, &error);
+       if (reply == NULL) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       connman_error("%s", error.message);
+                       dbus_error_free(&error);
+               } else
+                       connman_error("Failed to remove network");
+               dbus_message_unref(message);
+               return -EIO;
        }
 
-       if (g_str_has_prefix(buf + 3, "CTRL-EVENT-DISCONNECTED") == TRUE) {
-               printf("[SUPPLICANT] disconnected\n");
+       dbus_message_unref(message);
+
+       dbus_message_unref(reply);
+
+       g_free(task->network);
+       task->network = NULL;
+
+       return 0;
+}
+
+static int select_network(struct supplicant_task *task)
+{
+       DBusMessage *message, *reply;
+       DBusError error;
+
+       DBG("task %p", task);
+
+       if (task->network == NULL)
+               return -EINVAL;
+
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, task->path,
+                               SUPPLICANT_INTF ".Interface", "selectNetwork");
+       if (message == NULL)
+               return -ENOMEM;
+
+       dbus_message_append_args(message, DBUS_TYPE_OBJECT_PATH, &task->network,
+                                                       DBUS_TYPE_INVALID);
+
+       dbus_error_init(&error);
+
+       reply = dbus_connection_send_with_reply_and_block(connection,
+                                                       message, -1, &error);
+       if (reply == NULL) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       connman_error("%s", error.message);
+                       dbus_error_free(&error);
+               } else
+                       connman_error("Failed to select network");
+               dbus_message_unref(message);
+               return -EIO;
        }
 
-       if (g_str_has_prefix(buf + 3, "CTRL-EVENT-TERMINATING") == TRUE) {
-               printf("[SUPPLICANT] terminating\n");
+       dbus_message_unref(message);
+
+       dbus_message_unref(reply);
+
+       return 0;
+}
+
+static int enable_network(struct supplicant_task *task)
+{
+       DBusMessage *message, *reply;
+       DBusError error;
+
+       DBG("task %p", task);
+
+       if (task->network == NULL)
+               return -EINVAL;
+
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, task->network,
+                                       SUPPLICANT_INTF ".Network", "enable");
+       if (message == NULL)
+               return -ENOMEM;
+
+       dbus_error_init(&error);
+
+       reply = dbus_connection_send_with_reply_and_block(connection,
+                                                       message, -1, &error);
+       if (reply == NULL) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       connman_error("%s", error.message);
+                       dbus_error_free(&error);
+               } else
+                       connman_error("Failed to enable network");
+               dbus_message_unref(message);
+               return -EIO;
        }
 
-       return TRUE;
+       dbus_message_unref(message);
+
+       dbus_message_unref(reply);
+
+       return 0;
 }
 
-static int open_control(struct supplicant_task *task)
+static int disable_network(struct supplicant_task *task)
 {
-       struct sockaddr_un addr;
-       int sk;
+       DBusMessage *message, *reply;
+       DBusError error;
 
-       printf("[SUPPLICANT] open control for %s\n", task->ifname);
+       DBG("task %p", task);
 
-       sk = socket(PF_UNIX, SOCK_DGRAM, 0);
-       if (sk < 0)
-               return -1;
+       if (task->network == NULL)
+               return -EINVAL;
 
-       memset(&addr, 0, sizeof(addr));
-       addr.sun_family = AF_UNIX;
-       snprintf(addr.sun_path, sizeof(addr.sun_path),
-                                       "%s/%s.cli", STATEDIR, task->ifname);
-       //unlink(addr.sun_path);
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, task->network,
+                                       SUPPLICANT_INTF ".Network", "disable");
+       if (message == NULL)
+               return -ENOMEM;
 
-       if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               close(sk);
-               return -1;
+       dbus_error_init(&error);
+
+       reply = dbus_connection_send_with_reply_and_block(connection,
+                                                       message, -1, &error);
+       if (reply == NULL) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       connman_error("%s", error.message);
+                       dbus_error_free(&error);
+               } else
+                       connman_error("Failed to disable network");
+               dbus_message_unref(message);
+               return -EIO;
        }
 
-       memset(&addr, 0, sizeof(addr));
-       addr.sun_family = AF_UNIX;
-       snprintf(addr.sun_path, sizeof(addr.sun_path),
-                                       "%s/%s", STATEDIR, task->ifname);
+       dbus_message_unref(message);
+
+       dbus_message_unref(reply);
+
+       return 0;
+}
+
+static int set_network(struct supplicant_task *task,
+                               const unsigned char *network, int len,
+                               const char *security, const char *passphrase)
+{
+       DBusMessage *message, *reply;
+       DBusMessageIter array, dict;
+       DBusError error;
 
-       if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               close(sk);
-               return -1;
+       DBG("task %p", task);
+
+       if (task->network == NULL)
+               return -EINVAL;
+
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, task->network,
+                                       SUPPLICANT_INTF ".Network", "set");
+       if (message == NULL)
+               return -ENOMEM;
+
+       dbus_message_iter_init_append(message, &array);
+
+       dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
+                       DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+                       DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
+                       DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+
+       connman_dbus_dict_append_array(&dict, "ssid",
+                                       DBUS_TYPE_BYTE, &network, len);
+
+       if (g_ascii_strcasecmp(security, "wpa") == 0 ||
+                               g_ascii_strcasecmp(security, "wpa2") == 0) {
+               const char *key_mgmt = "WPA-PSK";
+               connman_dbus_dict_append_variant(&dict, "key_mgmt",
+                                               DBUS_TYPE_STRING, &key_mgmt);
+
+               if (passphrase && strlen(passphrase) > 0)
+                       connman_dbus_dict_append_variant(&dict, "psk",
+                                               DBUS_TYPE_STRING, &passphrase);
+       } else if (g_ascii_strcasecmp(security, "wep") == 0) {
+               const char *key_mgmt = "NONE", *index = "0";
+               connman_dbus_dict_append_variant(&dict, "key_mgmt",
+                                               DBUS_TYPE_STRING, &key_mgmt);
+
+               if (passphrase) {
+                       int size = strlen(passphrase);
+                       if (size == 10 || size == 26) {
+                               unsigned char *key = malloc(13);
+                               char tmp[3];
+                               int i;
+                               memset(tmp, 0, sizeof(tmp));
+                               if (key == NULL)
+                                       size = 0;
+                               for (i = 0; i < size / 2; i++) {
+                                       memcpy(tmp, passphrase + (i * 2), 2);
+                                       key[i] = (unsigned char) strtol(tmp,
+                                                               NULL, 16);
+                               }
+                               connman_dbus_dict_append_array(&dict,
+                                               "wep_key0", DBUS_TYPE_BYTE,
+                                                       &key, size / 2);
+                               free(key);
+                       } else
+                               connman_dbus_dict_append_variant(&dict,
+                                               "wep_key0", DBUS_TYPE_STRING,
+                                                               &passphrase);
+                       connman_dbus_dict_append_variant(&dict, "wep_tx_keyidx",
+                                               DBUS_TYPE_STRING, &index);
+               }
+       } else {
+               const char *key_mgmt = "NONE";
+               connman_dbus_dict_append_variant(&dict, "key_mgmt",
+                                               DBUS_TYPE_STRING, &key_mgmt);
        }
 
-       task->socket = sk;
+       dbus_message_iter_close_container(&array, &dict);
 
-       task->channel = g_io_channel_unix_new(sk);
-       g_io_channel_set_close_on_unref(task->channel, TRUE);
+       dbus_error_init(&error);
 
-       g_io_add_watch(task->channel,
-                       G_IO_IN | G_IO_NVAL | G_IO_HUP | G_IO_ERR,
-                                               control_event, task);
+       reply = dbus_connection_send_with_reply_and_block(connection,
+                                                       message, -1, &error);
+       if (reply == NULL) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       connman_error("%s", error.message);
+                       dbus_error_free(&error);
+               } else
+                       connman_error("Failed to set network options");
+               dbus_message_unref(message);
+               return -EIO;
+       }
 
-       exec_cmd(task, "ATTACH");
-       exec_cmd(task, "ADD_NETWORK");
+       dbus_message_unref(message);
 
-       g_io_channel_unref(task->channel);
+       dbus_message_unref(reply);
 
        return 0;
 }
 
-int __supplicant_start(struct connman_iface *iface)
+static int initiate_scan(struct supplicant_task *task)
 {
-       struct ifreq ifr;
-       struct supplicant_task *task;
-       char *argv[9];
-       int sk, err;
+       DBusMessage *message;
+       DBusPendingCall *call;
+
+       DBG("task %p", task);
+
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, task->path,
+                                       SUPPLICANT_INTF ".Interface", "scan");
+       if (message == NULL)
+               return -ENOMEM;
 
-       sk = socket(PF_INET, SOCK_DGRAM, 0);
-       if (sk < 0)
+       if (dbus_connection_send_with_reply(connection, message,
+                                               &call, TIMEOUT) == FALSE) {
+               connman_error("Failed to initiate scan");
+               dbus_message_unref(message);
                return -EIO;
+       }
 
-       memset(&ifr, 0, sizeof(ifr));
-       ifr.ifr_ifindex = iface->index;
+       dbus_message_unref(message);
 
-       err = ioctl(sk, SIOCGIFNAME, &ifr);
+       return 0;
+}
 
-       close(sk);
+static void extract_ssid(struct supplicant_network *network,
+                                               DBusMessageIter *value)
+{
+       DBusMessageIter array;
+       unsigned char *ssid;
+       int ssid_len;
 
-       if (err < 0)
+       dbus_message_iter_recurse(value, &array);
+       dbus_message_iter_get_fixed_array(&array, &ssid, &ssid_len);
+
+       if (ssid_len < 1)
+               return;
+
+       network->ssid = g_try_malloc(ssid_len);
+       if (network->ssid == NULL)
+               return;
+
+       memcpy(network->ssid, ssid, ssid_len);
+       network->ssid_len = ssid_len;
+
+       network->identifier = g_try_malloc0(ssid_len + 1);
+       if (network->identifier == NULL)
+               return;
+
+       memcpy(network->identifier, ssid, ssid_len);
+}
+
+static void extract_wpaie(struct supplicant_network *network,
+                                               DBusMessageIter *value)
+{
+       DBusMessageIter array;
+       unsigned char *ie;
+       int ie_len;
+
+       dbus_message_iter_recurse(value, &array);
+       dbus_message_iter_get_fixed_array(&array, &ie, &ie_len);
+
+       if (ie_len > 0)
+               network->has_wpa = TRUE;
+}
+
+static void extract_rsnie(struct supplicant_network *network,
+                                               DBusMessageIter *value)
+{
+       DBusMessageIter array;
+       unsigned char *ie;
+       int ie_len;
+
+       dbus_message_iter_recurse(value, &array);
+       dbus_message_iter_get_fixed_array(&array, &ie, &ie_len);
+
+       if (ie_len > 0)
+               network->has_rsn = TRUE;
+}
+
+static void extract_capabilites(struct supplicant_network *network,
+                                               DBusMessageIter *value)
+{
+       dbus_message_iter_get_basic(value, &network->capabilities);
+
+       if (network->capabilities & IEEE80211_CAP_ESS)
+               network->adhoc = FALSE;
+       else if (network->capabilities & IEEE80211_CAP_IBSS)
+               network->adhoc = TRUE;
+
+       if (network->capabilities & IEEE80211_CAP_PRIVACY)
+               network->has_wep = TRUE;
+}
+
+static void properties_reply(DBusPendingCall *call, void *user_data)
+{
+       struct supplicant_task *task = user_data;
+       struct supplicant_network *network;
+       DBusMessage *reply;
+       DBusMessageIter array, dict;
+
+       DBG("task %p", task);
+
+       reply = dbus_pending_call_steal_reply(call);
+
+       network = g_try_new0(struct supplicant_network, 1);
+       if (network == NULL)
+               goto done;
+
+       dbus_message_iter_init(reply, &array);
+
+       dbus_message_iter_recurse(&array, &dict);
+
+       while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
+               DBusMessageIter entry, value;
+               const char *key;
+
+               dbus_message_iter_recurse(&dict, &entry);
+               dbus_message_iter_get_basic(&entry, &key);
+
+               dbus_message_iter_next(&entry);
+
+               dbus_message_iter_recurse(&entry, &value);
+
+               //type = dbus_message_iter_get_arg_type(&value);
+               //dbus_message_iter_get_basic(&value, &val);
+
+               /* 
+                * bssid        : a (97)
+                * ssid         : a (97)
+                * wpaie        : a (97)
+                * rsnie        : a (97)
+                * frequency    : i (105)
+                * capabilities : q (113)
+                * quality      : i (105)
+                * noise        : i (105)
+                * level        : i (105)
+                * maxrate      : i (105)
+                */
+
+               if (g_str_equal(key, "ssid") == TRUE)
+                       extract_ssid(network, &value);
+               else if (g_str_equal(key, "wpaie") == TRUE)
+                       extract_wpaie(network, &value);
+               else if (g_str_equal(key, "rsnie") == TRUE)
+                       extract_rsnie(network, &value);
+               else if (g_str_equal(key, "capabilities") == TRUE)
+                       extract_capabilites(network, &value);
+               else if (g_str_equal(key, "quality") == TRUE)
+                       dbus_message_iter_get_basic(&value, &network->quality);
+               else if (g_str_equal(key, "noise") == TRUE)
+                       dbus_message_iter_get_basic(&value, &network->noise);
+               else if (g_str_equal(key, "level") == TRUE)
+                       dbus_message_iter_get_basic(&value, &network->level);
+               else if (g_str_equal(key, "maxrate") == TRUE)
+                       dbus_message_iter_get_basic(&value, &network->maxrate);
+
+
+               dbus_message_iter_next(&dict);
+       }
+
+       process_scan_result(task->device, network);
+
+       g_free(network->identifier);
+       g_free(network->ssid);
+       g_free(network);
+
+done:
+       dbus_message_unref(reply);
+}
+
+static int get_network_properties(struct supplicant_task *task,
+                                                       const char *path)
+{
+       DBusMessage *message;
+       DBusPendingCall *call;
+
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, path,
+                                               SUPPLICANT_INTF ".BSSID",
+                                                               "properties");
+       if (message == NULL)
+               return -ENOMEM;
+
+       if (dbus_connection_send_with_reply(connection, message,
+                                               &call, TIMEOUT) == FALSE) {
+               connman_error("Failed to get network properties");
+               dbus_message_unref(message);
                return -EIO;
+       }
+
+       dbus_pending_call_set_notify(call, properties_reply, task, NULL);
+
+       dbus_message_unref(message);
+
+       return 0;
+}
+
+static void scan_results_reply(DBusPendingCall *call, void *user_data)
+{
+       struct supplicant_task *task = user_data;
+       DBusMessage *reply;
+       DBusError error;
+       char **results;
+       int i, num_results;
+
+       DBG("task %p", task);
+
+       reply = dbus_pending_call_steal_reply(call);
+
+       dbus_error_init(&error);
+
+       if (dbus_message_get_args(reply, &error,
+                               DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH,
+                                               &results, &num_results,
+                                               DBUS_TYPE_INVALID) == FALSE) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       connman_error("%s", error.message);
+                       dbus_error_free(&error);
+               } else
+                       connman_error("Wrong arguments for scan result");
+               goto done;
+       }
+
+       process_clear_results(task->device);
 
-       printf("[SUPPLICANT] start %s\n", ifr.ifr_name);
+       for (i = 0; i < num_results; i++)
+               get_network_properties(task, results[i]);
+
+       g_strfreev(results);
+
+done:
+       dbus_message_unref(reply);
+}
+
+static int scan_results_available(struct supplicant_task *task)
+{
+       DBusMessage *message;
+       DBusPendingCall *call;
+
+       DBG("task %p", task);
+
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, task->path,
+                                               SUPPLICANT_INTF ".Interface",
+                                                       "scanResults");
+       if (message == NULL)
+               return -ENOMEM;
+
+       if (dbus_connection_send_with_reply(connection, message,
+                                               &call, TIMEOUT) == FALSE) {
+               connman_error("Failed to request scan result");
+               dbus_message_unref(message);
+               return -EIO;
+       }
+
+       dbus_pending_call_set_notify(call, scan_results_reply, task, NULL);
+
+       dbus_message_unref(message);
+
+       return 0;
+}
+
+static void state_change(struct supplicant_task *task, DBusMessage *msg)
+{
+       DBusError error;
+       const char *state, *previous;
+
+       dbus_error_init(&error);
+
+       if (dbus_message_get_args(msg, &error, DBUS_TYPE_STRING, &state,
+                                               DBUS_TYPE_STRING, &previous,
+                                               DBUS_TYPE_INVALID) == FALSE) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       connman_error("%s", error.message);
+                       dbus_error_free(&error);
+               } else
+                       connman_error("Wrong arguments for state change");
+               return;
+       }
+
+       DBG("state %s ==> %s", previous, state);
+
+       if (g_str_equal(state, "INACTIVE") == TRUE)
+               task->state = STATE_INACTIVE;
+       else if (g_str_equal(state, "SCANNING") == TRUE)
+               task->state = STATE_SCANNING;
+       else if (g_str_equal(state, "ASSOCIATING") == TRUE)
+               task->state = STATE_ASSOCIATING;
+       else if (g_str_equal(state, "ASSOCIATED") == TRUE)
+               task->state = STATE_ASSOCIATED;
+       else if (g_str_equal(state, "GROUP_HANDSHAKE") == TRUE)
+               task->state = STATE_4WAY_HANDSHAKE;
+       else if (g_str_equal(state, "4WAY_HANDSHAKE") == TRUE)
+               task->state = STATE_4WAY_HANDSHAKE;
+       else if (g_str_equal(state, "COMPLETED") == TRUE)
+               task->state = STATE_COMPLETED;
+       else if (g_str_equal(state, "DISCONNECTED") == TRUE)
+               task->state = STATE_DISCONNECTED;
+
+       process_state_change(task->device, task->state);
+
+       switch (task->state) {
+       case STATE_COMPLETED:
+               /* carrier on */
+               break;
+       case STATE_DISCONNECTED:
+               /* carrier off */
+               break;
+       default:
+               break;
+       }
+}
+
+static DBusHandlerResult supplicant_filter(DBusConnection *conn,
+                                               DBusMessage *msg, void *data)
+{
+       struct supplicant_task *task;
+       const char *member, *path;
+
+       if (dbus_message_has_interface(msg,
+                               SUPPLICANT_INTF ".Interface") == FALSE)
+               return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+       member = dbus_message_get_member(msg);
+       if (member == NULL)
+               return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+       path = dbus_message_get_path(msg);
+       if (path == NULL)
+               return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+       task = find_task_by_path(path);
+       if (task == NULL)
+               return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+       DBG("task %p member %s", task, member);
+
+       if (g_str_equal(member, "ScanResultsAvailable") == TRUE)
+               scan_results_available(task);
+       else if (g_str_equal(member, "StateChange") == TRUE)
+               state_change(task, msg);
+
+       return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+int supplicant_start(struct connman_device *device)
+{
+       struct supplicant_task *task;
+
+       DBG("device %p", device);
 
        task = g_try_new0(struct supplicant_task, 1);
        if (task == NULL)
                return -ENOMEM;
 
-       task->ifindex = iface->index;
-       task->ifname = strdup(ifr.ifr_name);
-       task->iface = iface;
+       task->ifindex = connman_device_get_index(device);
+       task->ifname = inet_index2name(task->ifindex);
+       task->device = device;
 
        if (task->ifname == NULL) {
                g_free(task);
                return -ENOMEM;
        }
 
-       argv[0] = "/sbin/wpa_supplicant";
-       argv[1] = "-qq";
-       argv[2] = "-C";
-       argv[3] = STATEDIR;
-       argv[4] = "-D";
-       argv[5] = "wext";
-       argv[6] = "-i";
-       argv[7] = task->ifname;
-       argv[8] = NULL;
+       task->created = FALSE;
+       task->state = STATE_INACTIVE;
 
-       if (g_spawn_async(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD,
-                               NULL, NULL, &task->pid, NULL) == FALSE) {
-               printf("Failed to spawn wpa_supplicant\n");
-               return -1;
-       }
+       task_list = g_slist_append(task_list, task);
 
-       tasks = g_slist_append(tasks, task);
+       return create_interface(task);
+}
 
-       printf("[SUPPLICANT] executed with pid %d\n", task->pid);
+int supplicant_stop(struct connman_device *device)
+{
+       int index = connman_device_get_index(device);
+       struct supplicant_task *task;
 
-       sleep(1);
+       DBG("device %p", device);
 
-       task->socket = -1;
+       task = find_task_by_index(index);
+       if (task == NULL)
+               return -ENODEV;
 
-       if (open_control(task) < 0)
-               printf("[SUPPLICANT] control failed\n");
+       task_list = g_slist_remove(task_list, task);
 
-       return 0;
+       disable_network(task);
+
+       remove_network(task);
+
+       return remove_interface(task);
 }
 
-int __supplicant_stop(struct connman_iface *iface)
+int supplicant_scan(struct connman_device *device)
 {
+       int index = connman_device_get_index(device);
        struct supplicant_task *task;
-       char pathname[PATH_MAX];
+       int err;
+
+       DBG("device %p", device);
 
-       task = find_task(iface->index);
+       task = find_task_by_index(index);
        if (task == NULL)
                return -ENODEV;
 
-       printf("[SUPPLICANT] stop %s\n", task->ifname);
+       switch (task->state) {
+       case STATE_SCANNING:
+               return -EALREADY;
+       case STATE_ASSOCIATING:
+       case STATE_ASSOCIATED:
+       case STATE_4WAY_HANDSHAKE:
+       case STATE_GROUP_HANDSHAKE:
+               return -EBUSY;
+       default:
+               break;
+       }
 
-       tasks = g_slist_remove(tasks, task);
+       err = initiate_scan(task);
 
-       exec_cmd(task, "DETACH");
+       return 0;
+}
 
-       //close(task->socket);
-       g_io_channel_unref(task->channel);
+int __supplicant_connect(struct connman_element *element,
+                               const unsigned char *ssid, int ssid_len,
+                               const char *security, const char *passphrase)
+{
+       struct supplicant_task *task;
 
-       snprintf(pathname, sizeof(pathname),
-                                       "%s/%s.cli", STATEDIR, task->ifname);
-       unlink(pathname);
+       DBG("element %p", element);
 
-       kill(task->pid, SIGTERM);
+       task = find_task_by_index(element->index);
+       if (task == NULL)
+               return -ENODEV;
 
-       free(task->ifname);
+       add_network(task);
 
-       g_free(task);
+       select_network(task);
+       disable_network(task);
+
+       set_network(task, ssid, ssid_len, security, passphrase);
+
+       enable_network(task);
 
        return 0;
 }
 
-int __supplicant_connect(struct connman_iface *iface)
+int __supplicant_disconnect(struct connman_element *element)
 {
        struct supplicant_task *task;
 
-       task = find_task(iface->index);
+       DBG("element %p", element);
+
+       task = find_task_by_index(element->index);
        if (task == NULL)
                return -ENODEV;
 
-       printf("[SUPPLICANT] connect %s\n", task->ifname);
+       disable_network(task);
+
+       remove_network(task);
+
+       return 0;
+}
+
+static void supplicant_activate(DBusConnection *conn)
+{
+       DBusMessage *message;
+
+       DBG("conn %p", conn);
+
+       message = dbus_message_new_method_call(SUPPLICANT_NAME, "/",
+                               DBUS_INTERFACE_INTROSPECTABLE, "Introspect");
+       if (message == NULL)
+               return;
+
+       dbus_message_set_no_reply(message, TRUE);
+
+       dbus_connection_send(conn, message, NULL);
+
+       dbus_message_unref(message);
+}
+
+static void supplicant_probe(DBusConnection *conn, void *user_data)
+{
+       GSList *list;
+
+       DBG("conn %p", conn);
+
+       for (list = driver_list; list; list = list->next) {
+               struct supplicant_driver *driver = list->data;
+
+               DBG("driver %p name %s", driver, driver->name);
+
+               if (driver->probe)
+                       driver->probe();
+       }
+}
+
+static void supplicant_remove(DBusConnection *conn, void *user_data)
+{
+       GSList *list;
+
+       DBG("conn %p", conn);
 
-       exec_cmd(task, "DISABLE_NETWORK 0");
+       for (list = driver_list; list; list = list->next) {
+               struct supplicant_driver *driver = list->data;
+
+               DBG("driver %p name %s", driver, driver->name);
+
+               if (driver->remove)
+                       driver->remove();
+       }
+}
+
+static const char *supplicant_rule = "type=signal,"
+                               "interface=" SUPPLICANT_INTF ".Interface";
+static guint watch;
+
+static int supplicant_create(void)
+{
+       if (g_slist_length(driver_list) > 0)
+               return 0;
+
+       connection = connman_dbus_get_connection();
+       if (connection == NULL)
+               return -EIO;
+
+       DBG("connection %p", connection);
+
+       if (dbus_connection_add_filter(connection,
+                               supplicant_filter, NULL, NULL) == FALSE) {
+               connection = connman_dbus_get_connection();
+               return -EIO;
+       }
+
+       dbus_bus_add_match(connection, supplicant_rule, NULL);
+       dbus_connection_flush(connection);
+
+       watch = g_dbus_add_service_watch(connection, SUPPLICANT_NAME,
+                       supplicant_probe, supplicant_remove, NULL, NULL);
 
        return 0;
 }
+
+static void supplicant_destroy(void)
+{
+       if (g_slist_length(driver_list) > 0)
+               return;
+
+       DBG("connection %p", connection);
+
+       if (watch > 0)
+               g_dbus_remove_watch(connection, watch);
+
+       dbus_bus_remove_match(connection, supplicant_rule, NULL);
+       dbus_connection_flush(connection);
+
+       dbus_connection_remove_filter(connection, supplicant_filter, NULL);
+
+       dbus_connection_unref(connection);
+       connection = NULL;
+}
+
+int supplicant_register(struct supplicant_driver *driver)
+{
+       int err;
+
+       DBG("driver %p name %s", driver, driver->name);
+
+       err = supplicant_create();
+       if (err < 0)
+               return err;
+
+       driver_list = g_slist_append(driver_list, driver);
+
+       if (g_dbus_check_service(connection, SUPPLICANT_NAME) == TRUE)
+               supplicant_probe(connection, NULL);
+       else
+               supplicant_activate(connection);
+
+       return 0;
+}
+
+void supplicant_unregister(struct supplicant_driver *driver)
+{
+       DBG("driver %p name %s", driver, driver->name);
+
+       supplicant_remove(connection, NULL);
+
+       driver_list = g_slist_remove(driver_list, driver);
+
+       supplicant_destroy();
+}