*
* Connection Manager
*
- * Copyright (C) 2007 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2008 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 <dbus/dbus.h>
-#include <glib.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
+
struct supplicant_task {
- GPid pid;
+ DBusConnection *conn;
int ifindex;
- char *ifname;
- struct connman_iface *iface;
- int socket;
- GIOChannel *channel;
+ gchar *ifname;
+ struct connman_element *element;
+ struct supplicant_callback *callback;
+ gchar *path;
+ gboolean created;
+ gchar *network;
+ enum supplicant_state state;
};
-static GSList *tasks = NULL;
+static GStaticMutex task_mutex = G_STATIC_MUTEX_INIT;
+static GSList *task_list = NULL;
-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 int get_interface(struct supplicant_task *task)
{
- write(task->socket, cmd, strlen(cmd));
+ DBusMessage *message, *reply;
+ DBusError error;
+ const char *path;
+
+ 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);
+
+ 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 get interface");
+ dbus_message_unref(message);
+ return -EIO;
+ }
+
+ dbus_message_unref(message);
+
+ 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");
+ dbus_message_unref(reply);
+ return -EIO;
+ }
+
+ DBG("path %s", path);
+
+ task->path = g_strdup(path);
+ task->created = FALSE;
+
+ dbus_message_unref(reply);
return 0;
}
-static gboolean control_event(GIOChannel *chan,
- GIOCondition cond, gpointer data)
+static int add_interface(struct supplicant_task *task)
{
- struct supplicant_task *task = data;
- char buf[256];
- gsize len;
- GIOError err;
+ DBusMessage *message, *reply;
+ DBusError error;
+ const char *path;
- if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR)) {
- g_io_channel_unref(chan);
- return FALSE;
+ DBG("task %p", task);
+
+ message = dbus_message_new_method_call(SUPPLICANT_NAME, SUPPLICANT_PATH,
+ SUPPLICANT_INTF, "addInterface");
+ 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");
+ dbus_message_unref(message);
+ return -EIO;
}
- memset(buf, 0, sizeof(buf));
+ dbus_message_unref(message);
+
+ dbus_error_init(&error);
- 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;
+ 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");
+ dbus_message_unref(reply);
+ return -EIO;
}
- if (buf[0] != '<')
- return TRUE;
+ DBG("path %s", path);
+
+ task->path = g_strdup(path);
+ task->created = TRUE;
+
+ dbus_message_unref(reply);
+
+ return 0;
+}
+
+static int remove_interface(struct supplicant_task *task)
+{
+ DBusMessage *message, *reply;
+ DBusError error;
+
+ DBG("task %p", task);
+
+ if (task->created == FALSE)
+ return -EINVAL;
+
+ message = dbus_message_new_method_call(SUPPLICANT_NAME, SUPPLICANT_PATH,
+ SUPPLICANT_INTF, "removeInterface");
+ if (message == NULL)
+ return -ENOMEM;
- printf("[SUPPLICANT] %s\n", buf + 3);
+ dbus_message_append_args(message, DBUS_TYPE_OBJECT_PATH, &task->path,
+ DBUS_TYPE_INVALID);
- if (g_str_has_prefix(buf + 3, "CTRL-EVENT-CONNECTED") == TRUE) {
- printf("[SUPPLICANT] connected\n");
- connman_iface_update(task->iface,
- CONNMAN_IFACE_STATE_CONNECTED);
+ 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");
+ 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);
+
+ return 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(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 set AP scan");
+ 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 add_network(struct supplicant_task *task)
+{
+ DBusMessage *message, *reply;
+ DBusError error;
+ const char *path;
+
+ DBG("task %p", task);
+
+ if (task->network != NULL)
+ return -EALREADY;
+
+ 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(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 network");
+ dbus_message_unref(message);
+ return -EIO;
+ }
+
+ dbus_message_unref(message);
+
+ 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;
}
- return TRUE;
+ DBG("path %s", path);
+
+ task->network = g_strdup(path);
+
+ dbus_message_unref(reply);
+
+ return 0;
}
-static int open_control(struct supplicant_task *task)
+static int remove_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->path,
+ SUPPLICANT_INTF ".Interface", "removeNetwork");
+ if (message == NULL)
+ return -ENOMEM;
- if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- close(sk);
- return -1;
+ 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(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 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);
+
+ g_free(task->network);
+ task->network = NULL;
+
+ return 0;
+}
+
+static int select_network(struct supplicant_task *task)
+{
+ DBusMessage *message, *reply;
+ 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->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(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 select network");
+ dbus_message_unref(message);
+ return -EIO;
}
- task->socket = sk;
+ dbus_message_unref(message);
- task->channel = g_io_channel_unix_new(sk);
- g_io_channel_set_close_on_unref(task->channel, TRUE);
+ dbus_message_unref(reply);
- g_io_add_watch(task->channel,
- G_IO_IN | G_IO_NVAL | G_IO_HUP | G_IO_ERR,
- control_event, task);
+ return 0;
+}
- exec_cmd(task, "ATTACH");
- exec_cmd(task, "ADD_NETWORK");
+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(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 enable network");
+ dbus_message_unref(message);
+ return -EIO;
+ }
+
+ 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 disable_network(struct supplicant_task *task)
{
- struct ifreq ifr;
- struct supplicant_task *task;
- char *argv[9];
- int sk, err;
+ 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", "disable");
+ 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 disable network");
+ dbus_message_unref(message);
+ return -EIO;
+ }
+
+ dbus_message_unref(message);
+
+ dbus_message_unref(reply);
+
+ 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)
+{
+ DBusMessage *message, *reply;
+ DBusMessageIter array, dict;
+ 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", "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);
+
+ append_entry(&dict, "ssid", DBUS_TYPE_STRING, &network);
+
+ if (passphrase && strlen(passphrase) > 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);
+ } else {
+ const char *key_mgmt = "NONE";
+ append_entry(&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,
+ 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;
+ }
+
+ dbus_message_unref(message);
+
+ dbus_message_unref(reply);
+
+ return 0;
+}
+
+static int initiate_scan(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", "scan");
+ if (message == NULL)
+ return -ENOMEM;
+
+ if (dbus_connection_send_with_reply(task->conn, message,
+ &call, TIMEOUT) == FALSE) {
+ connman_error("Failed to initiate scan");
+ dbus_message_unref(message);
+ return -EIO;
+ }
+
+ dbus_message_unref(message);
+
+ return 0;
+}
+
+static void extract_ssid(struct supplicant_network *network,
+ DBusMessageIter *value)
+{
+ DBusMessageIter array;
+ unsigned char *ssid;
+ int ssid_len;
+
+ dbus_message_iter_recurse(value, &array);
+ dbus_message_iter_get_fixed_array(&array, &ssid, &ssid_len);
+
+ network->identifier = g_strdup((char *) ssid);
+}
+
+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)
+{
+ guint capabilities;
+
+ dbus_message_iter_get_basic(value, &capabilities);
+
+ network->capabilities = capabilities;
+
+ if (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);
- sk = socket(PF_INET, SOCK_DGRAM, 0);
- if (sk < 0)
+ //type = dbus_message_iter_get_arg_type(&value);
+ //dbus_message_iter_get_basic(&value, &val);
+
+ 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);
+
+ dbus_message_iter_next(&dict);
+ }
+
+ if (task->callback && task->callback->scan_result)
+ task->callback->scan_result(task->element, network);
+
+ 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(task->conn, message,
+ &call, TIMEOUT) == FALSE) {
+ connman_error("Failed to get network properties");
+ dbus_message_unref(message);
return -EIO;
+ }
- memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = iface->index;
+ dbus_pending_call_set_notify(call, properties_reply, task, NULL);
- err = ioctl(sk, SIOCGIFNAME, &ifr);
+ 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;
+ }
- close(sk);
+ for (i = 0; i < num_results; i++)
+ get_network_properties(task, results[i]);
- if (err < 0)
+ 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(task->conn, message,
+ &call, TIMEOUT) == FALSE) {
+ connman_error("Failed to request scan result");
+ dbus_message_unref(message);
return -EIO;
+ }
- printf("[SUPPLICANT] start %s\n", ifr.ifr_name);
+ 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;
+
+ if (task->callback && task->callback->state_change)
+ task->callback->state_change(task->element, 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 = data;
+ const char *member;
+
+ 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;
+
+ 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;
+}
+
+static int add_filter(struct supplicant_task *task)
+{
+ DBusError error;
+ gchar *filter;
+
+ if (dbus_connection_add_filter(task->conn,
+ supplicant_filter, task, NULL) == FALSE)
+ return -EIO;
+
+ filter = g_strdup_printf("type=signal,interface=%s.Interface,path=%s",
+ SUPPLICANT_INTF, task->path);
+
+ DBG("filter %s", filter);
+
+ dbus_error_init(&error);
+
+ dbus_bus_add_match(task->conn, filter, &error);
+
+ g_free(filter);
+
+ if (dbus_error_is_set(&error) == TRUE) {
+ connman_error("Can't add match: %s", error.message);
+ dbus_error_free(&error);
+ }
+
+ return 0;
+}
+
+static int remove_filter(struct supplicant_task *task)
+{
+ DBusError error;
+ gchar *filter;
+
+ filter = g_strdup_printf("type=signal,interface=%s.Interface,path=%s",
+ SUPPLICANT_INTF, task->path);
+
+ DBG("filter %s", filter);
+
+ dbus_error_init(&error);
+
+ dbus_bus_add_match(task->conn, filter, &error);
+
+ g_free(filter);
+
+ if (dbus_error_is_set(&error) == TRUE) {
+ connman_error("Can't add match: %s", error.message);
+ dbus_error_free(&error);
+ }
+
+ dbus_connection_remove_filter(task->conn, supplicant_filter, task);
+
+ return 0;
+}
+
+int __supplicant_start(struct connman_element *element,
+ struct supplicant_callback *callback)
+{
+ struct supplicant_task *task;
+ int err;
+
+ DBG("element %p name %s", element, element->name);
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 = element->index;
+ task->ifname = inet_index2name(element->index);
+ task->element = element;
+ task->callback = callback;
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;
-
- 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->conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
+ if (task->conn == NULL) {
+ g_free(task);
+ return -EIO;
}
- tasks = g_slist_append(tasks, task);
+ task->created = FALSE;
+ task->state = STATE_INACTIVE;
- printf("[SUPPLICANT] executed with pid %d\n", task->pid);
+ g_static_mutex_lock(&task_mutex);
+ task_list = g_slist_append(task_list, task);
+ g_static_mutex_unlock(&task_mutex);
- sleep(1);
+ err = get_interface(task);
+ if (err < 0) {
+ err = add_interface(task);
+ if (err < 0) {
+ g_free(task);
+ return err;
+ }
+ }
- task->socket = -1;
+ add_filter(task);
- if (open_control(task) < 0)
- printf("[SUPPLICANT] control failed\n");
+ set_ap_scan(task);
return 0;
}
-int __supplicant_stop(struct connman_iface *iface)
+int __supplicant_stop(struct connman_element *element)
{
struct supplicant_task *task;
- char pathname[PATH_MAX];
- task = find_task(iface->index);
+ DBG("element %p name %s", element, element->name);
+
+ task = find_task_by_index(element->index);
if (task == NULL)
return -ENODEV;
- printf("[SUPPLICANT] stop %s\n", task->ifname);
+ g_static_mutex_lock(&task_mutex);
+ task_list = g_slist_remove(task_list, task);
+ g_static_mutex_unlock(&task_mutex);
- tasks = g_slist_remove(tasks, task);
+ disable_network(task);
- exec_cmd(task, "DETACH");
+ remove_network(task);
- //close(task->socket);
- g_io_channel_unref(task->channel);
+ remove_filter(task);
- snprintf(pathname, sizeof(pathname),
- "%s/%s.cli", STATEDIR, task->ifname);
- unlink(pathname);
+ remove_interface(task);
- kill(task->pid, SIGTERM);
-
- free(task->ifname);
+ dbus_connection_unref(task->conn);
+ g_free(task->ifname);
+ g_free(task->path);
g_free(task);
return 0;
}
-int __supplicant_connect(struct connman_iface *iface)
+int __supplicant_scan(struct connman_element *element)
{
struct supplicant_task *task;
+ int err;
+
+ DBG("element %p name %s", element, element->name);
+
+ task = find_task_by_index(element->index);
+ if (task == NULL)
+ return -ENODEV;
+
+ 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;
+ }
+
+ err = initiate_scan(task);
+
+ return 0;
+}
+
+int __supplicant_connect(struct connman_element *element, const char *ssid)
+{
+ struct supplicant_task *task;
+
+ DBG("element %p name %s", element, element->name);
+
+ task = find_task_by_index(element->index);
+ if (task == NULL)
+ return -ENODEV;
+
+ add_network(task);
+
+ select_network(task);
+ disable_network(task);
+
+ set_network(task, ssid, NULL);
+
+ enable_network(task);
+
+ return 0;
+}
+
+int __supplicant_disconnect(struct connman_element *element)
+{
+ struct supplicant_task *task;
+
+ DBG("element %p name %s", element, element->name);
- task = find_task(iface->index);
+ task = find_task_by_index(element->index);
if (task == NULL)
return -ENODEV;
- printf("[SUPPLICANT] connect %s\n", task->ifname);
+ disable_network(task);
- exec_cmd(task, "DISABLE_NETWORK 0");
+ remove_network(task);
return 0;
}
projects / connman / blobdiff