X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=plugins%2Fsupplicant.c;h=b5c96992806f4435dce0c4516ea5ea3d936fecb2;hb=72ed7e7dd6a3b944c7edc35c407b719aa679fbca;hp=cba93cd9522612f01ba8f3feefd005f37bd8f202;hpb=249a12194decb4b7a06d717bcd5284d1467e759b;p=connman

diff --git a/plugins/supplicant.c b/plugins/supplicant.c
index cba93cd..b5c9699 100644
--- a/plugins/supplicant.c
+++ b/plugins/supplicant.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,105 +23,211 @@
 #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 <dbus/dbus.h>
 #include <gdbus.h>
 
+#define CONNMAN_API_SUBJECT_TO_CHANGE
+#include <connman/device.h>
+#include <connman/dbus.h>
 #include <connman/log.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
+
+#define SUPPLICANT_NAME  "fi.epitest.hostap.WPASupplicant"
+#define SUPPLICANT_INTF  "fi.epitest.hostap.WPASupplicant"
+#define SUPPLICANT_PATH  "/fi/epitest/hostap/WPASupplicant"
+
+/* Taken from "WPA Supplicant - Common definitions" */
 enum supplicant_state {
-	STATE_INACTIVE,
-	STATE_SCANNING,
-	STATE_ASSOCIATING,
-	STATE_ASSOCIATED,
-	STATE_4WAY_HANDSHAKE,
-	STATE_GROUP_HANDSHAKE,
-	STATE_COMPLETED,
-	STATE_DISCONNECTED,
+	/**
+	 * WPA_DISCONNECTED - Disconnected state
+	 *
+	 * This state indicates that client is not associated, but is likely to
+	 * start looking for an access point. This state is entered when a
+	 * connection is lost.
+	 */
+	WPA_DISCONNECTED,
+
+	/**
+	 * WPA_INACTIVE - Inactive state (wpa_supplicant disabled)
+	 *
+	 * This state is entered if there are no enabled networks in the
+	 * configuration. wpa_supplicant is not trying to associate with a new
+	 * network and external interaction (e.g., ctrl_iface call to add or
+	 * enable a network) is needed to start association.
+	 */
+	WPA_INACTIVE,
+
+	/**
+	 * WPA_SCANNING - Scanning for a network
+	 *
+	 * This state is entered when wpa_supplicant starts scanning for a
+	 * network.
+	 */
+	WPA_SCANNING,
+
+	/**
+	 * WPA_ASSOCIATING - Trying to associate with a BSS/SSID
+	 *
+	 * This state is entered when wpa_supplicant has found a suitable BSS
+	 * to associate with and the driver is configured to try to associate
+	 * with this BSS in ap_scan=1 mode. When using ap_scan=2 mode, this
+	 * state is entered when the driver is configured to try to associate
+	 * with a network using the configured SSID and security policy.
+	 */
+	WPA_ASSOCIATING,
+
+	/**
+	 * WPA_ASSOCIATED - Association completed
+	 *
+	 * This state is entered when the driver reports that association has
+	 * been successfully completed with an AP. If IEEE 802.1X is used
+	 * (with or without WPA/WPA2), wpa_supplicant remains in this state
+	 * until the IEEE 802.1X/EAPOL authentication has been completed.
+	 */
+	WPA_ASSOCIATED,
+
+	/**
+	 * WPA_4WAY_HANDSHAKE - WPA 4-Way Key Handshake in progress
+	 *
+	 * This state is entered when WPA/WPA2 4-Way Handshake is started. In
+	 * case of WPA-PSK, this happens when receiving the first EAPOL-Key
+	 * frame after association. In case of WPA-EAP, this state is entered
+	 * when the IEEE 802.1X/EAPOL authentication has been completed.
+	 */
+	WPA_4WAY_HANDSHAKE,
+
+	/**
+	 * WPA_GROUP_HANDSHAKE - WPA Group Key Handshake in progress
+	 *
+	 * This state is entered when 4-Way Key Handshake has been completed
+	 * (i.e., when the supplicant sends out message 4/4) and when Group
+	 * Key rekeying is started by the AP (i.e., when supplicant receives
+	 * message 1/2).
+	 */
+	WPA_GROUP_HANDSHAKE,
+
+	/**
+	 * WPA_COMPLETED - All authentication completed
+	 *
+	 * This state is entered when the full authentication process is
+	 * completed. In case of WPA2, this happens when the 4-Way Handshake is
+	 * successfully completed. With WPA, this state is entered after the
+	 * Group Key Handshake; with IEEE 802.1X (non-WPA) connection is
+	 * completed after dynamic keys are received (or if not used, after
+	 * the EAP authentication has been completed). With static WEP keys and
+	 * plaintext connections, this state is entered when an association
+	 * has been completed.
+	 *
+	 * This state indicates that the supplicant has completed its
+	 * processing for the association phase and that data connection is
+	 * fully configured.
+	 */
+	WPA_COMPLETED,
+
+	/**
+	 * WPA_INVALID - Invalid state (parsing error)
+	 *
+	 * This state is returned if the string input is invalid. It is not
+	 * an official wpa_supplicant state.
+	 */
+	WPA_INVALID,
+};
+
+struct supplicant_result {
+	char *identifier;
+	unsigned char *ssid;
+	unsigned int ssid_len;
+	dbus_uint16_t capabilities;
+	gboolean adhoc;
+	gboolean has_wep;
+	gboolean has_wpa;
+	gboolean has_rsn;
+	dbus_int32_t quality;
+	dbus_int32_t noise;
+	dbus_int32_t level;
+	dbus_int32_t maxrate;
 };
 
 struct supplicant_task {
-	DBusConnection *conn;
 	int ifindex;
-	gchar *ifname;
-	struct connman_iface *iface;
-	gchar *path;
+	char *ifname;
+	struct connman_device *device;
+	struct connman_network *network;
+	char *path;
+	char *netpath;
 	gboolean created;
-	gchar *network;
 	enum supplicant_state state;
+	gboolean noscan;
+	GSList *scan_results;
 };
 
-static GSList *tasks = NULL;
+static GSList *task_list = NULL;
 
-struct supplicant_ap {
-	gchar *identifier;
-	GByteArray *ssid;
-	guint capabilities;
-	gboolean has_wep;
-	gboolean has_wpa;
-	gboolean has_rsn;
-};
+static DBusConnection *connection;
 
-#define IEEE80211_CAP_ESS       0x0001
-#define IEEE80211_CAP_IBSS      0x0002
-#define IEEE80211_CAP_PRIVACY   0x0010
+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 get_interface(struct supplicant_task *task)
+static struct supplicant_task *find_task_by_path(const char *path)
 {
-	DBusMessage *message, *reply;
-	DBusError error;
-	const char *path;
+	GSList *list;
 
-	DBG("task %p", task);
+	for (list = task_list; list; list = list->next) {
+		struct supplicant_task *task = list->data;
 
-	message = dbus_message_new_method_call(SUPPLICANT_NAME, SUPPLICANT_PATH,
-					SUPPLICANT_INTF, "getInterface");
-	if (message == NULL)
-		return -ENOMEM;
+		if (g_str_equal(task->path, path) == TRUE)
+			return task;
+	}
 
-	dbus_message_append_args(message, DBUS_TYPE_STRING, &task->ifname,
-							DBUS_TYPE_INVALID);
+	return NULL;
+}
 
-	dbus_error_init(&error);
+static void add_interface_reply(DBusPendingCall *call, void *user_data)
+{
+	struct supplicant_task *task = user_data;
+	DBusMessage *reply;
+	DBusError error;
+	const char *path;
 
-	reply = dbus_connection_send_with_reply_and_block(task->conn,
-							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 get interface");
-		dbus_message_unref(message);
-		return -EIO;
-	}
+	DBG("task %p", task);
 
-	dbus_message_unref(message);
+	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);
 
@@ -131,26 +237,25 @@ static int get_interface(struct supplicant_task *task)
 			connman_error("%s", error.message);
 			dbus_error_free(&error);
 		} else
-			connman_error("Wrong arguments for interface");
-		dbus_message_unref(reply);
-		return -EIO;
+			connman_error("Wrong arguments for add interface");
+		goto done;
 	}
 
 	DBG("path %s", path);
 
 	task->path = g_strdup(path);
-	task->created = FALSE;
+	task->created = TRUE;
 
-	dbus_message_unref(reply);
+	connman_device_set_powered(task->device, TRUE);
 
-	return 0;
+done:
+	dbus_message_unref(reply);
 }
 
 static int add_interface(struct supplicant_task *task)
 {
-	DBusMessage *message, *reply;
-	DBusError error;
-	const char *path;
+	DBusMessage *message;
+	DBusPendingCall *call;
 
 	DBG("task %p", task);
 
@@ -159,25 +264,41 @@ static int add_interface(struct supplicant_task *task)
 	if (message == NULL)
 		return -ENOMEM;
 
-	dbus_error_init(&error);
-
 	dbus_message_append_args(message, DBUS_TYPE_STRING, &task->ifname,
 							DBUS_TYPE_INVALID);
 
-	reply = dbus_connection_send_with_reply_and_block(task->conn,
-							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 interface");
+	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,
@@ -186,30 +307,77 @@ static int add_interface(struct supplicant_task *task)
 			connman_error("%s", error.message);
 			dbus_error_free(&error);
 		} else
-			connman_error("Wrong arguments for interface");
-		dbus_message_unref(reply);
-		return -EIO;
+			connman_error("Wrong arguments for get interface");
+		goto done;
 	}
 
 	DBG("path %s", path);
 
 	task->path = g_strdup(path);
-	task->created = TRUE;
+	task->created = FALSE;
+
+	connman_device_set_powered(task->device, TRUE);
 
+done:
 	dbus_message_unref(reply);
+}
 
-	return 0;
+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)
 {
-	DBusMessage *message, *reply;
-	DBusError error;
+	DBusMessage *message;
+	DBusPendingCall *call;
 
 	DBG("task %p", task);
 
-	if (task->created == FALSE)
-		return -EINVAL;
+	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");
@@ -219,27 +387,21 @@ static int remove_interface(struct supplicant_task *task)
 	dbus_message_append_args(message, DBUS_TYPE_OBJECT_PATH, &task->path,
 							DBUS_TYPE_INVALID);
 
-	dbus_error_init(&error);
-
-	reply = dbus_connection_send_with_reply_and_block(task->conn,
-							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 interface");
+	if (dbus_connection_send_with_reply(connection, message,
+						&call, TIMEOUT) == FALSE) {
+		connman_error("Failed to remove interface");
 		dbus_message_unref(message);
 		return -EIO;
 	}
 
-	dbus_message_unref(message);
+	dbus_pending_call_set_notify(call, remove_interface_reply, task, NULL);
 
-	dbus_message_unref(reply);
+	dbus_message_unref(message);
 
-	return 0;
+	return -EINPROGRESS;
 }
 
+#if 0
 static int set_ap_scan(struct supplicant_task *task)
 {
 	DBusMessage *message, *reply;
@@ -258,7 +420,7 @@ static int set_ap_scan(struct supplicant_task *task)
 
 	dbus_error_init(&error);
 
-	reply = dbus_connection_send_with_reply_and_block(task->conn,
+	reply = dbus_connection_send_with_reply_and_block(connection,
 							message, -1, &error);
 	if (reply == NULL) {
 		if (dbus_error_is_set(&error) == TRUE) {
@@ -276,6 +438,7 @@ static int set_ap_scan(struct supplicant_task *task)
 
 	return 0;
 }
+#endif
 
 static int add_network(struct supplicant_task *task)
 {
@@ -285,7 +448,7 @@ static int add_network(struct supplicant_task *task)
 
 	DBG("task %p", task);
 
-	if (task->network != NULL)
+	if (task->netpath != NULL)
 		return -EALREADY;
 
 	message = dbus_message_new_method_call(SUPPLICANT_NAME, task->path,
@@ -295,7 +458,7 @@ static int add_network(struct supplicant_task *task)
 
 	dbus_error_init(&error);
 
-	reply = dbus_connection_send_with_reply_and_block(task->conn,
+	reply = dbus_connection_send_with_reply_and_block(connection,
 							message, -1, &error);
 	if (reply == NULL) {
 		if (dbus_error_is_set(&error) == TRUE) {
@@ -324,7 +487,7 @@ static int add_network(struct supplicant_task *task)
 
 	DBG("path %s", path);
 
-	task->network = g_strdup(path);
+	task->netpath = g_strdup(path);
 
 	dbus_message_unref(reply);
 
@@ -338,7 +501,7 @@ static int remove_network(struct supplicant_task *task)
 
 	DBG("task %p", task);
 
-	if (task->network == NULL)
+	if (task->netpath == NULL)
 		return -EINVAL;
 
 	message = dbus_message_new_method_call(SUPPLICANT_NAME, task->path,
@@ -346,12 +509,12 @@ static int remove_network(struct supplicant_task *task)
 	if (message == NULL)
 		return -ENOMEM;
 
-	dbus_message_append_args(message, DBUS_TYPE_OBJECT_PATH, &task->network,
+	dbus_message_append_args(message, DBUS_TYPE_OBJECT_PATH, &task->netpath,
 							DBUS_TYPE_INVALID);
 
 	dbus_error_init(&error);
 
-	reply = dbus_connection_send_with_reply_and_block(task->conn,
+	reply = dbus_connection_send_with_reply_and_block(connection,
 							message, -1, &error);
 	if (reply == NULL) {
 		if (dbus_error_is_set(&error) == TRUE) {
@@ -367,8 +530,8 @@ static int remove_network(struct supplicant_task *task)
 
 	dbus_message_unref(reply);
 
-	g_free(task->network);
-	task->network = NULL;
+	g_free(task->netpath);
+	task->netpath = NULL;
 
 	return 0;
 }
@@ -380,7 +543,7 @@ static int select_network(struct supplicant_task *task)
 
 	DBG("task %p", task);
 
-	if (task->network == NULL)
+	if (task->netpath == NULL)
 		return -EINVAL;
 
 	message = dbus_message_new_method_call(SUPPLICANT_NAME, task->path,
@@ -388,12 +551,12 @@ static int select_network(struct supplicant_task *task)
 	if (message == NULL)
 		return -ENOMEM;
 
-	dbus_message_append_args(message, DBUS_TYPE_OBJECT_PATH, &task->network,
+	dbus_message_append_args(message, DBUS_TYPE_OBJECT_PATH, &task->netpath,
 							DBUS_TYPE_INVALID);
 
 	dbus_error_init(&error);
 
-	reply = dbus_connection_send_with_reply_and_block(task->conn,
+	reply = dbus_connection_send_with_reply_and_block(connection,
 							message, -1, &error);
 	if (reply == NULL) {
 		if (dbus_error_is_set(&error) == TRUE) {
@@ -419,17 +582,17 @@ static int enable_network(struct supplicant_task *task)
 
 	DBG("task %p", task);
 
-	if (task->network == NULL)
+	if (task->netpath == NULL)
 		return -EINVAL;
 
-	message = dbus_message_new_method_call(SUPPLICANT_NAME, task->network,
+	message = dbus_message_new_method_call(SUPPLICANT_NAME, task->netpath,
 					SUPPLICANT_INTF ".Network", "enable");
 	if (message == NULL)
 		return -ENOMEM;
 
 	dbus_error_init(&error);
 
-	reply = dbus_connection_send_with_reply_and_block(task->conn,
+	reply = dbus_connection_send_with_reply_and_block(connection,
 							message, -1, &error);
 	if (reply == NULL) {
 		if (dbus_error_is_set(&error) == TRUE) {
@@ -455,17 +618,17 @@ static int disable_network(struct supplicant_task *task)
 
 	DBG("task %p", task);
 
-	if (task->network == NULL)
+	if (task->netpath == NULL)
 		return -EINVAL;
 
-	message = dbus_message_new_method_call(SUPPLICANT_NAME, task->network,
+	message = dbus_message_new_method_call(SUPPLICANT_NAME, task->netpath,
 					SUPPLICANT_INTF ".Network", "disable");
 	if (message == NULL)
 		return -ENOMEM;
 
 	dbus_error_init(&error);
 
-	reply = dbus_connection_send_with_reply_and_block(task->conn,
+	reply = dbus_connection_send_with_reply_and_block(connection,
 							message, -1, &error);
 	if (reply == NULL) {
 		if (dbus_error_is_set(&error) == TRUE) {
@@ -484,39 +647,9 @@ static int disable_network(struct supplicant_task *task)
 	return 0;
 }
 
-static void append_entry(DBusMessageIter *dict,
-				const char *key, int type, void *val)
-{
-	DBusMessageIter entry, value;
-	const char *signature;
-
-	dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
-								NULL, &entry);
-
-	dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
-	switch (type) {
-	case DBUS_TYPE_STRING:
-		signature = DBUS_TYPE_STRING_AS_STRING;
-		break;
-	case DBUS_TYPE_UINT16:
-		signature = DBUS_TYPE_UINT16_AS_STRING;
-		break;
-	default:
-		signature = DBUS_TYPE_VARIANT_AS_STRING;
-		break;
-	}
-
-	dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-							signature, &value);
-	dbus_message_iter_append_basic(&value, type, val);
-	dbus_message_iter_close_container(&entry, &value);
-
-	dbus_message_iter_close_container(dict, &entry);
-}
-
-static int set_network(struct supplicant_task *task, const char *network,
-						const char *passphrase)
+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;
@@ -524,10 +657,10 @@ static int set_network(struct supplicant_task *task, const char *network,
 
 	DBG("task %p", task);
 
-	if (task->network == NULL)
+	if (task->netpath == NULL)
 		return -EINVAL;
 
-	message = dbus_message_new_method_call(SUPPLICANT_NAME, task->network,
+	message = dbus_message_new_method_call(SUPPLICANT_NAME, task->netpath,
 					SUPPLICANT_INTF ".Network", "set");
 	if (message == NULL)
 		return -ENOMEM;
@@ -539,22 +672,59 @@ static int set_network(struct supplicant_task *task, const char *network,
 			DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
 			DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
 
-	append_entry(&dict, "ssid", DBUS_TYPE_STRING, &network);
+	connman_dbus_dict_append_array(&dict, "ssid",
+					DBUS_TYPE_BYTE, &network, len);
 
-	if (passphrase && strlen(passphrase) > 0) {
+	if (g_ascii_strcasecmp(security, "wpa") == 0 ||
+				g_ascii_strcasecmp(security, "wpa2") == 0) {
 		const char *key_mgmt = "WPA-PSK";
-		append_entry(&dict, "key_mgmt", DBUS_TYPE_STRING, &key_mgmt);
-		append_entry(&dict, "psk", DBUS_TYPE_STRING, &passphrase);
+		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";
-		append_entry(&dict, "key_mgmt", DBUS_TYPE_STRING, &key_mgmt);
+		connman_dbus_dict_append_variant(&dict, "key_mgmt",
+						DBUS_TYPE_STRING, &key_mgmt);
 	}
 
 	dbus_message_iter_close_container(&array, &dict);
 
 	dbus_error_init(&error);
 
-	reply = dbus_connection_send_with_reply_and_block(task->conn,
+	reply = dbus_connection_send_with_reply_and_block(connection,
 							message, -1, &error);
 	if (reply == NULL) {
 		if (dbus_error_is_set(&error) == TRUE) {
@@ -575,8 +745,8 @@ static int set_network(struct supplicant_task *task, const char *network,
 
 static int initiate_scan(struct supplicant_task *task)
 {
-	DBusMessage *message, *reply;
-	DBusError error;
+	DBusMessage *message;
+	DBusPendingCall *call;
 
 	DBG("task %p", task);
 
@@ -585,28 +755,20 @@ static int initiate_scan(struct supplicant_task *task)
 	if (message == NULL)
 		return -ENOMEM;
 
-	dbus_error_init(&error);
-
-	reply = dbus_connection_send_with_reply_and_block(task->conn,
-							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 initiate scan");
+	if (dbus_connection_send_with_reply(connection, message,
+						&call, TIMEOUT) == FALSE) {
+		connman_error("Failed to initiate scan");
 		dbus_message_unref(message);
 		return -EIO;
 	}
 
 	dbus_message_unref(message);
 
-	dbus_message_unref(reply);
-
 	return 0;
 }
 
-static void extract_ssid(struct supplicant_ap *ap, DBusMessageIter *value)
+static void extract_ssid(DBusMessageIter *value,
+					struct supplicant_result *result)
 {
 	DBusMessageIter array;
 	unsigned char *ssid;
@@ -615,10 +777,25 @@ static void extract_ssid(struct supplicant_ap *ap, DBusMessageIter *value)
 	dbus_message_iter_recurse(value, &array);
 	dbus_message_iter_get_fixed_array(&array, &ssid, &ssid_len);
 
-	ap->identifier = g_strdup((char *) ssid);
+	if (ssid_len < 1)
+		return;
+
+	result->ssid = g_try_malloc(ssid_len);
+	if (result->ssid == NULL)
+		return;
+
+	memcpy(result->ssid, ssid, ssid_len);
+	result->ssid_len = ssid_len;
+
+	result->identifier = g_try_malloc0(ssid_len + 1);
+	if (result->identifier == NULL)
+		return;
+
+	memcpy(result->identifier, ssid, ssid_len);
 }
 
-static void extract_wpaie(struct supplicant_ap *ap, DBusMessageIter *value)
+static void extract_wpaie(DBusMessageIter *value,
+					struct supplicant_result *result)
 {
 	DBusMessageIter array;
 	unsigned char *ie;
@@ -628,10 +805,11 @@ static void extract_wpaie(struct supplicant_ap *ap, DBusMessageIter *value)
 	dbus_message_iter_get_fixed_array(&array, &ie, &ie_len);
 
 	if (ie_len > 0)
-		ap->has_wpa = TRUE;
+		result->has_wpa = TRUE;
 }
 
-static void extract_rsnie(struct supplicant_ap *ap, DBusMessageIter *value)
+static void extract_rsnie(DBusMessageIter *value,
+					struct supplicant_result *result)
 {
 	DBusMessageIter array;
 	unsigned char *ie;
@@ -641,34 +819,52 @@ static void extract_rsnie(struct supplicant_ap *ap, DBusMessageIter *value)
 	dbus_message_iter_get_fixed_array(&array, &ie, &ie_len);
 
 	if (ie_len > 0)
-		ap->has_rsn = TRUE;
+		result->has_rsn = TRUE;
 }
 
-static void extract_capabilites(struct supplicant_ap *ap,
-						DBusMessageIter *value)
+static void extract_capabilites(DBusMessageIter *value,
+					struct supplicant_result *result)
 {
-	guint capabilities;
+	dbus_message_iter_get_basic(value, &result->capabilities);
 
-	dbus_message_iter_get_basic(value, &capabilities);
+	if (result->capabilities & IEEE80211_CAP_ESS)
+		result->adhoc = FALSE;
+	else if (result->capabilities & IEEE80211_CAP_IBSS)
+		result->adhoc = TRUE;
 
-	ap->capabilities = capabilities;
-
-	if (capabilities & IEEE80211_CAP_PRIVACY)
-		ap->has_wep = TRUE;
+	if (result->capabilities & IEEE80211_CAP_PRIVACY)
+		result->has_wep = TRUE;
 }
 
-static int parse_network_properties(struct supplicant_task *task,
-							DBusMessage *message)
+static void get_properties(struct supplicant_task *task);
+
+static void properties_reply(DBusPendingCall *call, void *user_data)
 {
+	struct supplicant_task *task = user_data;
+	struct supplicant_result result;
+	struct connman_network *network;
+	DBusMessage *reply;
 	DBusMessageIter array, dict;
-	struct supplicant_ap *ap;
-	int security = 0;
+	char *security;
+	unsigned char strength;
 
-	ap = g_try_new0(struct supplicant_ap, 1);
-	if (ap == NULL)
-		return -ENOMEM;
+	DBG("task %p", task);
 
-	dbus_message_iter_init(message, &array);
+	reply = dbus_pending_call_steal_reply(call);
+	if (reply == NULL) {
+		get_properties(task);
+		return;
+	}
+
+	if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
+		dbus_message_unref(reply);
+		get_properties(task);
+		return;
+	}
+
+	memset(&result, 0, sizeof(result));
+
+	dbus_message_iter_init(reply, &array);
 
 	dbus_message_iter_recurse(&array, &dict);
 
@@ -686,98 +882,157 @@ static int parse_network_properties(struct supplicant_task *task,
 		//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(ap, &value);
+			extract_ssid(&value, &result);
 		else if (g_str_equal(key, "wpaie") == TRUE)
-			extract_wpaie(ap, &value);
+			extract_wpaie(&value, &result);
 		else if (g_str_equal(key, "rsnie") == TRUE)
-			extract_rsnie(ap, &value);
+			extract_rsnie(&value, &result);
 		else if (g_str_equal(key, "capabilities") == TRUE)
-			extract_capabilites(ap, &value);
+			extract_capabilites(&value, &result);
+		else if (g_str_equal(key, "quality") == TRUE)
+			dbus_message_iter_get_basic(&value, &result.quality);
+		else if (g_str_equal(key, "noise") == TRUE)
+			dbus_message_iter_get_basic(&value, &result.noise);
+		else if (g_str_equal(key, "level") == TRUE)
+			dbus_message_iter_get_basic(&value, &result.level);
+		else if (g_str_equal(key, "maxrate") == TRUE)
+			dbus_message_iter_get_basic(&value, &result.maxrate);
 
 		dbus_message_iter_next(&dict);
 	}
 
-	if (ap->has_wep)
-		security |= 0x01;
-	if (ap->has_wpa)
-		security |= 0x02;
-	if (ap->has_rsn)
-		security |= 0x04;
+	if (result.identifier == NULL)
+		goto done;
 
-	connman_iface_indicate_station(task->iface,
-					ap->identifier, 25, security);
+	if (result.identifier[0] == '\0')
+		goto done;
 
-	g_free(ap);
+	strength = result.quality;
 
-	return 0;
+	if (result.has_rsn == TRUE)
+		security = "wpa2";
+	else if (result.has_wpa == TRUE)
+		security = "wpa";
+	else if (result.has_wep == TRUE)
+		security = "wep";
+	else
+		security = "none";
+
+	network = connman_device_get_network(task->device, result.identifier);
+	if (network == NULL) {
+		const char *mode;
+		int index;
+
+		network = connman_network_create(result.identifier,
+						CONNMAN_NETWORK_TYPE_WIFI);
+		if (network == NULL)
+			goto done;
+
+		index = connman_device_get_index(task->device);
+		connman_network_set_index(network, index);
+
+		connman_network_set_protocol(network,
+						CONNMAN_NETWORK_PROTOCOL_IP);
+
+		connman_network_set_string(network, "Name", result.identifier);
+
+		connman_network_set_blob(network, "WiFi.SSID",
+						result.ssid, result.ssid_len);
+
+		mode = (result.adhoc == TRUE) ? "adhoc" : "managed";
+		connman_network_set_string(network, "WiFi.Mode", mode);
+
+		DBG("%s (%s %s) strength %d", result.identifier, mode,
+							security, strength);
+
+		if (connman_device_add_network(task->device, network) < 0) {
+			connman_network_unref(network);
+			goto done;
+		}
+	}
+
+	connman_network_set_available(network, TRUE);
+	connman_network_set_uint8(network, "Strength", strength);
+
+	connman_network_set_string(network, "WiFi.Security", security);
+
+done:
+	g_free(result.identifier);
+	g_free(result.ssid);
+
+	dbus_message_unref(reply);
+
+	get_properties(task);
 }
 
-static int get_network_properties(struct supplicant_task *task,
-							const char *path)
+static void get_properties(struct supplicant_task *task)
 {
-	DBusMessage *message, *reply;
-	DBusError error;
+	DBusMessage *message;
+	DBusPendingCall *call;
+	char *path;
+
+	path = g_slist_nth_data(task->scan_results, 0);
+	if (path == NULL)
+		goto noscan;
 
 	message = dbus_message_new_method_call(SUPPLICANT_NAME, path,
 						SUPPLICANT_INTF ".BSSID",
 								"properties");
-	if (message == NULL)
-		return -ENOMEM;
 
-	dbus_error_init(&error);
+	task->scan_results = g_slist_remove(task->scan_results, path);
+	g_free(path);
 
-	reply = dbus_connection_send_with_reply_and_block(task->conn,
-							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 get network properties");
+	if (message == NULL)
+		goto noscan;
+
+	if (dbus_connection_send_with_reply(connection, message,
+						&call, TIMEOUT) == FALSE) {
+		connman_error("Failed to get network properties");
 		dbus_message_unref(message);
-		return -EIO;
+		goto noscan;
 	}
 
-	dbus_message_unref(message);
+	dbus_pending_call_set_notify(call, properties_reply, task, NULL);
 
-	parse_network_properties(task, reply);
+	dbus_message_unref(message);
 
-	dbus_message_unref(reply);
+	return;
 
-	return 0;
+noscan:
+	if (task->noscan == FALSE)
+		connman_device_set_scanning(task->device, FALSE);
 }
 
-static int scan_results_available(struct supplicant_task *task)
+static void scan_results_reply(DBusPendingCall *call, void *user_data)
 {
-	DBusMessage *message, *reply;
+	struct supplicant_task *task = user_data;
+	DBusMessage *reply;
 	DBusError error;
 	char **results;
 	int i, num_results;
 
 	DBG("task %p", task);
 
-	message = dbus_message_new_method_call(SUPPLICANT_NAME, task->path,
-						SUPPLICANT_INTF ".Interface",
-							"scanResults");
-	if (message == NULL)
-		return -ENOMEM;
+	reply = dbus_pending_call_steal_reply(call);
+	if (reply == NULL)
+		goto noscan;
 
-	dbus_error_init(&error);
-
-	reply = dbus_connection_send_with_reply_and_block(task->conn,
-							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 request scan result");
-		dbus_message_unref(message);
-		return -EIO;
-	}
-
-	dbus_message_unref(message);
+	if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR)
+		goto done;
 
 	dbus_error_init(&error);
 
@@ -790,29 +1045,96 @@ static int scan_results_available(struct supplicant_task *task)
 			dbus_error_free(&error);
 		} else
 			connman_error("Wrong arguments for scan result");
-		dbus_message_unref(reply);
-		return -EIO;
+		goto done;
 	}
 
-	for (i = 0; i < num_results; i++)
-		get_network_properties(task, results[i]);
+	if (num_results == 0)
+		goto done;
+
+	for (i = 0; i < num_results; i++) {
+		char *path = g_strdup(results[i]);
+		if (path == NULL)
+			continue;
+
+		task->scan_results = g_slist_append(task->scan_results, path);
+	}
 
 	g_strfreev(results);
 
 	dbus_message_unref(reply);
 
-	return 0;
+	get_properties(task);
+
+	return;
+
+done:
+	dbus_message_unref(reply);
+
+noscan:
+	if (task->noscan == FALSE)
+		connman_device_set_scanning(task->device, FALSE);
+}
+
+static void 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;
+
+	if (dbus_connection_send_with_reply(connection, message,
+						&call, TIMEOUT) == FALSE) {
+		connman_error("Failed to request scan result");
+		goto done;
+	}
+
+	if (task->noscan == FALSE)
+		connman_device_set_scanning(task->device, TRUE);
+
+	dbus_pending_call_set_notify(call, scan_results_reply, task, NULL);
+
+done:
+	dbus_message_unref(message);
+}
+
+static enum supplicant_state string2state(const char *state)
+{
+	if (g_str_equal(state, "INACTIVE") == TRUE)
+		return WPA_INACTIVE;
+	else if (g_str_equal(state, "SCANNING") == TRUE)
+		return WPA_SCANNING;
+	else if (g_str_equal(state, "ASSOCIATING") == TRUE)
+		return WPA_ASSOCIATING;
+	else if (g_str_equal(state, "ASSOCIATED") == TRUE)
+		return WPA_ASSOCIATED;
+	else if (g_str_equal(state, "GROUP_HANDSHAKE") == TRUE)
+		return WPA_GROUP_HANDSHAKE;
+	else if (g_str_equal(state, "4WAY_HANDSHAKE") == TRUE)
+		return WPA_4WAY_HANDSHAKE;
+	else if (g_str_equal(state, "COMPLETED") == TRUE)
+		return WPA_COMPLETED;
+	else if (g_str_equal(state, "DISCONNECTED") == TRUE)
+		return WPA_DISCONNECTED;
+	else
+		return WPA_INVALID;
 }
 
 static void state_change(struct supplicant_task *task, DBusMessage *msg)
 {
 	DBusError error;
-	const char *state, *previous;
+	const char *newstate, *oldstate;
+	enum supplicant_state state;
 
 	dbus_error_init(&error);
 
-	if (dbus_message_get_args(msg, &error, DBUS_TYPE_STRING, &state,
-						DBUS_TYPE_STRING, &previous,
+	if (dbus_message_get_args(msg, &error, DBUS_TYPE_STRING, &newstate,
+						DBUS_TYPE_STRING, &oldstate,
 						DBUS_TYPE_INVALID) == FALSE) {
 		if (dbus_error_is_set(&error) == TRUE) {
 			connman_error("%s", error.message);
@@ -822,31 +1144,50 @@ static void state_change(struct supplicant_task *task, DBusMessage *msg)
 		return;
 	}
 
-	DBG("state %s ==> %s", previous, state);
+	DBG("state %s ==> %s", oldstate, newstate);
 
-	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;
+	state = string2state(newstate);
+	if (state == WPA_INVALID)
+		return;
+
+	task->state = state;
 
 	switch (task->state) {
-	case STATE_COMPLETED:
-		connman_iface_indicate_carrier_on(task->iface);
+	case WPA_SCANNING:
+		task->noscan = TRUE;
+		connman_device_set_scanning(task->device, TRUE);
 		break;
-	case STATE_DISCONNECTED:
-		connman_iface_indicate_carrier_off(task->iface);
+	case WPA_ASSOCIATING:
+	case WPA_ASSOCIATED:
+	case WPA_4WAY_HANDSHAKE:
+	case WPA_GROUP_HANDSHAKE:
+		task->noscan = TRUE;
+		break;
+	case WPA_COMPLETED:
+	case WPA_DISCONNECTED:
+		task->noscan = FALSE;
+		break;
+	case WPA_INACTIVE:
+		task->noscan = FALSE;
+		connman_device_set_scanning(task->device, FALSE);
+		break;
+	case WPA_INVALID:
+		break;
+	}
+
+	if (task->network == NULL)
+		return;
+
+	switch (task->state) {
+	case WPA_COMPLETED:
+		/* carrier on */
+		connman_network_set_connected(task->network, TRUE);
+		connman_device_set_scanning(task->device, FALSE);
+		break;
+	case WPA_DISCONNECTED:
+		/* carrier off */
+		connman_network_set_connected(task->network, FALSE);
+		connman_device_set_scanning(task->device, FALSE);
 		break;
 	default:
 		break;
@@ -856,8 +1197,8 @@ static void state_change(struct supplicant_task *task, DBusMessage *msg)
 static DBusHandlerResult supplicant_filter(DBusConnection *conn,
 						DBusMessage *msg, void *data)
 {
-	struct supplicant_task *task = data;
-	const char *member;
+	struct supplicant_task *task;
+	const char *member, *path;
 
 	if (dbus_message_has_interface(msg,
 				SUPPLICANT_INTF ".Interface") == FALSE)
@@ -867,6 +1208,14 @@ static DBusHandlerResult supplicant_filter(DBusConnection *conn,
 	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)
@@ -877,216 +1226,278 @@ static DBusHandlerResult supplicant_filter(DBusConnection *conn,
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
-static int add_filter(struct supplicant_task *task)
+int supplicant_start(struct connman_device *device)
 {
-	DBusError error;
-	gchar *filter;
-
-	if (dbus_connection_add_filter(task->conn,
-				supplicant_filter, task, NULL) == FALSE)
-		return -EIO;
+	struct supplicant_task *task;
 
-	filter = g_strdup_printf("type=signal,interface=%s.Interface,path=%s",
-						SUPPLICANT_INTF, task->path);
+	DBG("device %p", device);
 
-	DBG("filter %s", filter);
+	task = g_try_new0(struct supplicant_task, 1);
+	if (task == NULL)
+		return -ENOMEM;
 
-	dbus_error_init(&error);
+	task->ifindex = connman_device_get_index(device);
+	task->ifname = inet_index2name(task->ifindex);
+	task->device = device;
 
-	dbus_bus_add_match(task->conn, filter, &error);
+	if (task->ifname == NULL) {
+		g_free(task);
+		return -ENOMEM;
+	}
 
-	g_free(filter);
+	task->created = FALSE;
+	task->noscan = FALSE;
+	task->state = WPA_INVALID;
 
-	if (dbus_error_is_set(&error) == TRUE) {
-		connman_error("Can't add match: %s", error.message);
-		dbus_error_free(&error);
-	}
+	task_list = g_slist_append(task_list, task);
 
-	return 0;
+	return create_interface(task);
 }
 
-static int remove_filter(struct supplicant_task *task)
+int supplicant_stop(struct connman_device *device)
 {
-	DBusError error;
-	gchar *filter;
+	int index = connman_device_get_index(device);
+	struct supplicant_task *task;
+
+	DBG("device %p", device);
 
-	filter = g_strdup_printf("type=signal,interface=%s.Interface,path=%s",
-						SUPPLICANT_INTF, task->path);
+	task = find_task_by_index(index);
+	if (task == NULL)
+		return -ENODEV;
 
-	DBG("filter %s", filter);
+	task_list = g_slist_remove(task_list, task);
 
-	dbus_error_init(&error);
+	disable_network(task);
 
-	dbus_bus_add_match(task->conn, filter, &error);
+	remove_network(task);
 
-	g_free(filter);
+	return remove_interface(task);
+}
 
-	if (dbus_error_is_set(&error) == TRUE) {
-		connman_error("Can't add match: %s", error.message);
-		dbus_error_free(&error);
+int supplicant_scan(struct connman_device *device)
+{
+	int index = connman_device_get_index(device);
+	struct supplicant_task *task;
+	int err;
+
+	DBG("device %p", device);
+
+	task = find_task_by_index(index);
+	if (task == NULL)
+		return -ENODEV;
+
+	switch (task->state) {
+	case WPA_SCANNING:
+		return -EALREADY;
+	case WPA_ASSOCIATING:
+	case WPA_ASSOCIATED:
+	case WPA_4WAY_HANDSHAKE:
+	case WPA_GROUP_HANDSHAKE:
+		return -EBUSY;
+	default:
+		break;
 	}
 
-	dbus_connection_remove_filter(task->conn, supplicant_filter, task);
+	err = initiate_scan(task);
 
 	return 0;
 }
 
-int __supplicant_start(struct connman_iface *iface)
+int supplicant_connect(struct connman_network *network)
 {
-	struct ifreq ifr;
 	struct supplicant_task *task;
-	int sk, err;
+	const char *security, *passphrase;
+	const void *ssid;
+	unsigned int ssid_len;
+	int index;
 
-	sk = socket(PF_INET, SOCK_DGRAM, 0);
-	if (sk < 0)
-		return -EIO;
+	DBG("network %p", network);
 
-	memset(&ifr, 0, sizeof(ifr));
-	ifr.ifr_ifindex = iface->index;
+	security = connman_network_get_string(network, "WiFi.Security");
+	passphrase = connman_network_get_string(network, "WiFi.Passphrase");
 
-	err = ioctl(sk, SIOCGIFNAME, &ifr);
+	ssid = connman_network_get_blob(network, "WiFi.SSID", &ssid_len);
 
-	close(sk);
+	DBG("security %s passphrase %s", security, passphrase);
 
-	if (err < 0)
-		return -EIO;
-
-	DBG("interface %s", ifr.ifr_name);
-
-	task = g_try_new0(struct supplicant_task, 1);
-	if (task == NULL)
-		return -ENOMEM;
+	if (security == NULL && passphrase == NULL)
+		return -EINVAL;
 
-	task->ifindex = iface->index;
-	task->ifname = g_strdup(ifr.ifr_name);
-	task->iface = iface;
+	if (g_str_equal(security, "none") == FALSE && passphrase == NULL)
+		return -EINVAL;
 
-	if (task->ifname == NULL) {
-		g_free(task);
-		return -ENOMEM;
-	}
+	index = connman_network_get_index(network);
 
-	task->conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
-	if (task->conn == NULL) {
-		g_free(task);
-		return -EIO;
-	}
-
-	task->created = FALSE;
+	task = find_task_by_index(index);
+	if (task == NULL)
+		return -ENODEV;
 
-	err = get_interface(task);
-	if (err < 0) {
-		err = add_interface(task);
-		if (err < 0) {
-			g_free(task);
-			return err;
-		}
-	}
+	task->network = connman_network_ref(network);
 
-	task->state = STATE_INACTIVE;
+	add_network(task);
 
-	tasks = g_slist_append(tasks, task);
+	select_network(task);
+	disable_network(task);
 
-	add_filter(task);
+	set_network(task, ssid, ssid_len, security, passphrase);
 
-	set_ap_scan(task);
+	enable_network(task);
 
 	return 0;
 }
 
-int __supplicant_stop(struct connman_iface *iface)
+int supplicant_disconnect(struct connman_network *network)
 {
 	struct supplicant_task *task;
+	int index;
 
-	task = find_task(iface->index);
-	if (task == NULL)
-		return -ENODEV;
+	DBG("network %p", network);
 
-	DBG("interface %s", task->ifname);
+	index = connman_network_get_index(network);
 
-	tasks = g_slist_remove(tasks, task);
+	task = find_task_by_index(index);
+	if (task == NULL)
+		return -ENODEV;
 
 	disable_network(task);
 
 	remove_network(task);
 
-	remove_filter(task);
+	connman_network_set_connected(task->network, FALSE);
 
-	remove_interface(task);
+	connman_network_unref(task->network);
 
-	dbus_connection_unref(task->conn);
+	return 0;
+}
 
-	g_free(task->ifname);
-	g_free(task->path);
-	g_free(task);
+static void supplicant_activate(DBusConnection *conn)
+{
+	DBusMessage *message;
 
-	return 0;
+	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);
 }
 
-int __supplicant_scan(struct connman_iface *iface)
+static GSList *driver_list = NULL;
+
+static void supplicant_probe(DBusConnection *conn, void *user_data)
 {
-	struct supplicant_task *task;
-	int err;
+	GSList *list;
 
-	task = find_task(iface->index);
-	if (task == NULL)
-		return -ENODEV;
+	DBG("conn %p", conn);
 
-	DBG("interface %s", task->ifname);
+	for (list = driver_list; list; list = list->next) {
+		struct supplicant_driver *driver = list->data;
 
-	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;
+		DBG("driver %p name %s", driver, driver->name);
+
+		if (driver->probe)
+			driver->probe();
 	}
+}
 
-	err = initiate_scan(task);
+static void supplicant_remove(DBusConnection *conn, void *user_data)
+{
+	GSList *list;
 
-	return 0;
+	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->remove)
+			driver->remove();
+	}
 }
 
-int __supplicant_connect(struct connman_iface *iface,
-				const char *network, const char *passphrase)
-{
-	struct supplicant_task *task;
+static const char *supplicant_rule = "type=signal,"
+				"interface=" SUPPLICANT_INTF ".Interface";
+static guint watch;
 
-	task = find_task(iface->index);
-	if (task == NULL)
-		return -ENODEV;
+static int supplicant_create(void)
+{
+	if (g_slist_length(driver_list) > 0)
+		return 0;
 
-	DBG("interface %s", task->ifname);
+	connection = connman_dbus_get_connection();
+	if (connection == NULL)
+		return -EIO;
 
-	add_network(task);
+	DBG("connection %p", connection);
 
-	select_network(task);
-	disable_network(task);
+	if (dbus_connection_add_filter(connection,
+				supplicant_filter, NULL, NULL) == FALSE) {
+		connection = connman_dbus_get_connection();
+		return -EIO;
+	}
 
-	set_network(task, network, passphrase);
+	dbus_bus_add_match(connection, supplicant_rule, NULL);
+	dbus_connection_flush(connection);
 
-	enable_network(task);
+	watch = g_dbus_add_service_watch(connection, SUPPLICANT_NAME,
+			supplicant_probe, supplicant_remove, NULL, NULL);
 
 	return 0;
 }
 
-int __supplicant_disconnect(struct connman_iface *iface)
+static void supplicant_destroy(void)
 {
-	struct supplicant_task *task;
+	if (g_slist_length(driver_list) > 0)
+		return;
 
-	task = find_task(iface->index);
-	if (task == NULL)
-		return -ENODEV;
+	DBG("connection %p", connection);
 
-	DBG("interface %s", task->ifname);
+	if (watch > 0)
+		g_dbus_remove_watch(connection, watch);
 
-	disable_network(task);
+	dbus_bus_remove_match(connection, supplicant_rule, NULL);
+	dbus_connection_flush(connection);
 
-	remove_network(task);
+	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();
+}