*
* 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 <gdbus.h>
#include <connman/log.h>
+#include "inet.h"
#include "supplicant.h"
-enum supplicant_state {
- STATE_INACTIVE,
- STATE_SCANNING,
- STATE_ASSOCIATING,
- STATE_ASSOCIATED,
- STATE_4WAY_HANDSHAKE,
- STATE_GROUP_HANDSHAKE,
- STATE_COMPLETED,
- STATE_DISCONNECTED,
-};
-
-// COMPLETED ==> ASSOCIATING
-// ASSOCIATED ==> DISCONNECTED
-// DISCONNECTED ==> INACTIVE
-
-// DISCONNECTED ==> SCANNING
-// SCANNING ==> ASSOCIATED
+#define TIMEOUT 5000
-// ASSOCIATING ==> ASSOCIATED
-// ASSOCIATED ==> 4WAY_HANDSHAKE
-// 4WAY_HANDSHAKE ==> GROUP_HANDSHAKE
-// GROUP_HANDSHAKE ==> COMPLETED
+#define IEEE80211_CAP_ESS 0x0001
+#define IEEE80211_CAP_IBSS 0x0002
+#define IEEE80211_CAP_PRIVACY 0x0010
struct supplicant_task {
DBusConnection *conn;
int ifindex;
gchar *ifname;
- struct connman_iface *iface;
+ 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;
-struct supplicant_ap {
- gchar *identifier;
- GByteArray *ssid;
- guint capabilities;
- gboolean has_wep;
- gboolean has_wpa;
- gboolean has_rsn;
-};
-
-#define IEEE80211_CAP_ESS 0x0001
-#define IEEE80211_CAP_IBSS 0x0002
-#define IEEE80211_CAP_PRIVACY 0x0010
-
-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 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;
+
+ 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");
+ dbus_message_unref(message);
+ return -EIO;
+ }
+
+ 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;
+ }
+
+ dbus_message_unref(message);
+
+ dbus_message_unref(reply);
+
+ return 0;
+}
+
static int add_network(struct supplicant_task *task)
{
DBusMessage *message, *reply;
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)
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)
dbus_message_unref(reply);
+ g_free(task->network);
+ task->network = NULL;
+
return 0;
}
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)
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)
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)
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)
append_entry(&dict, "ssid", DBUS_TYPE_STRING, &network);
if (passphrase && strlen(passphrase) > 0) {
- //exec_cmd(task, "SET_NETWORK 0 proto RSN WPA");
- //exec_cmd(task, "SET_NETWORK 0 key_mgmt WPA-PSK");
-
+ 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 {
- //exec_cmd(task, "SET_NETWORK 0 proto RSN WPA");
- //exec_cmd(task, "SET_NETWORK 0 key_mgmt NONE");
+ const char *key_mgmt = "NONE";
+ append_entry(&dict, "key_mgmt", DBUS_TYPE_STRING, &key_mgmt);
}
dbus_message_iter_close_container(&array, &dict);
static int initiate_scan(struct supplicant_task *task)
{
- DBusMessage *message, *reply;
- DBusError error;
+ DBusMessage *message;
+ DBusPendingCall *call;
DBG("task %p", 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(task->conn, 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(struct supplicant_network *network,
+ DBusMessageIter *value)
{
DBusMessageIter array;
unsigned char *ssid;
dbus_message_iter_recurse(value, &array);
dbus_message_iter_get_fixed_array(&array, &ssid, &ssid_len);
- ap->identifier = g_strdup((char *) ssid);
+ network->identifier = g_strdup((char *) ssid);
}
-static void extract_wpaie(struct supplicant_ap *ap, DBusMessageIter *value)
+static void extract_wpaie(struct supplicant_network *network,
+ DBusMessageIter *value)
{
DBusMessageIter array;
unsigned char *ie;
dbus_message_iter_get_fixed_array(&array, &ie, &ie_len);
if (ie_len > 0)
- ap->has_wpa = TRUE;
+ network->has_wpa = TRUE;
}
-static void extract_rsnie(struct supplicant_ap *ap, DBusMessageIter *value)
+static void extract_rsnie(struct supplicant_network *network,
+ DBusMessageIter *value)
{
DBusMessageIter array;
unsigned char *ie;
dbus_message_iter_get_fixed_array(&array, &ie, &ie_len);
if (ie_len > 0)
- ap->has_rsn = TRUE;
+ network->has_rsn = TRUE;
}
-static void extract_capabilites(struct supplicant_ap *ap,
+static void extract_capabilites(struct supplicant_network *network,
DBusMessageIter *value)
{
guint capabilities;
dbus_message_iter_get_basic(value, &capabilities);
- ap->capabilities = capabilities;
+ network->capabilities = capabilities;
if (capabilities & IEEE80211_CAP_PRIVACY)
- ap->has_wep = TRUE;
+ network->has_wep = TRUE;
}
-static int parse_network_properties(struct supplicant_task *task,
- DBusMessage *message)
+static void properties_reply(DBusPendingCall *call, void *user_data)
{
+ struct supplicant_task *task = user_data;
+ struct supplicant_network *network;
+ DBusMessage *reply;
DBusMessageIter array, dict;
- struct supplicant_ap *ap;
- int security = 0;
DBG("task %p", task);
- ap = g_try_new0(struct supplicant_ap, 1);
- if (ap == NULL)
- return -ENOMEM;
+ reply = dbus_pending_call_steal_reply(call);
+
+ network = g_try_new0(struct supplicant_network, 1);
+ if (network == NULL)
+ goto done;
- dbus_message_iter_init(message, &array);
+ dbus_message_iter_init(reply, &array);
dbus_message_iter_recurse(&array, &dict);
//dbus_message_iter_get_basic(&value, &val);
if (g_str_equal(key, "ssid") == TRUE)
- extract_ssid(ap, &value);
+ extract_ssid(network, &value);
else if (g_str_equal(key, "wpaie") == TRUE)
- extract_wpaie(ap, &value);
+ extract_wpaie(network, &value);
else if (g_str_equal(key, "rsnie") == TRUE)
- extract_rsnie(ap, &value);
+ extract_rsnie(network, &value);
else if (g_str_equal(key, "capabilities") == TRUE)
- extract_capabilites(ap, &value);
+ extract_capabilites(network, &value);
dbus_message_iter_next(&dict);
}
- DBG("SSID %s", ap->identifier);
+ if (task->callback && task->callback->scan_result)
+ task->callback->scan_result(task->element, network);
- if (ap->has_wep)
- security |= 0x01;
- if (ap->has_wpa)
- security |= 0x02;
- if (ap->has_rsn)
- security |= 0x04;
+ g_free(network);
- connman_iface_indicate_station(task->iface,
- ap->identifier, 25, security);
-
- g_free(ap);
-
- return 0;
+done:
+ dbus_message_unref(reply);
}
static int get_network_properties(struct supplicant_task *task,
const char *path)
{
- DBusMessage *message, *reply;
- DBusError error;
-
- DBG("task %p", task);
+ DBusMessage *message;
+ DBusPendingCall *call;
message = dbus_message_new_method_call(SUPPLICANT_NAME, path,
SUPPLICANT_INTF ".BSSID",
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 get network properties");
+ 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;
}
- dbus_message_unref(message);
-
- parse_network_properties(task, reply);
+ dbus_pending_call_set_notify(call, properties_reply, task, NULL);
- dbus_message_unref(reply);
+ dbus_message_unref(message);
return 0;
}
-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;
-
- 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);
+ reply = dbus_pending_call_steal_reply(call);
dbus_error_init(&error);
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++)
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;
+ }
+
+ dbus_pending_call_set_notify(call, scan_results_reply, task, NULL);
+
+ dbus_message_unref(message);
return 0;
}
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,
return 0;
}
-int __supplicant_start(struct connman_iface *iface)
+static int remove_filter(struct supplicant_task *task)
{
- struct ifreq ifr;
- struct supplicant_task *task;
- int sk, err;
+ DBusError error;
+ gchar *filter;
- sk = socket(PF_INET, SOCK_DGRAM, 0);
- if (sk < 0)
- return -EIO;
+ filter = g_strdup_printf("type=signal,interface=%s.Interface,path=%s",
+ SUPPLICANT_INTF, task->path);
- memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = iface->index;
+ DBG("filter %s", filter);
- err = ioctl(sk, SIOCGIFNAME, &ifr);
+ dbus_error_init(&error);
- close(sk);
+ dbus_bus_add_match(task->conn, filter, &error);
- if (err < 0)
- return -EIO;
+ g_free(filter);
+
+ if (dbus_error_is_set(&error) == TRUE) {
+ connman_error("Can't add match: %s", error.message);
+ dbus_error_free(&error);
+ }
- DBG("interface %s", ifr.ifr_name);
+ 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 = g_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);
}
task->created = FALSE;
+ task->state = STATE_INACTIVE;
+
+ g_static_mutex_lock(&task_mutex);
+ task_list = g_slist_append(task_list, task);
+ g_static_mutex_unlock(&task_mutex);
err = get_interface(task);
if (err < 0) {
}
}
- task->state = STATE_INACTIVE;
-
- tasks = g_slist_append(tasks, task);
-
add_filter(task);
- add_network(task);
-
- select_network(task);
- disable_network(task);
+ set_ap_scan(task);
return 0;
}
-int __supplicant_stop(struct connman_iface *iface)
+int __supplicant_stop(struct connman_element *element)
{
struct supplicant_task *task;
- 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;
- DBG("interface %s", 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);
remove_network(task);
+ remove_filter(task);
+
+ remove_interface(task);
+
dbus_connection_unref(task->conn);
g_free(task->ifname);
- g_free(task->network);
g_free(task->path);
g_free(task);
return 0;
}
-int __supplicant_scan(struct connman_iface *iface)
+int __supplicant_scan(struct connman_element *element)
{
struct supplicant_task *task;
int err;
- 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;
- DBG("interface %s", task->ifname);
-
switch (task->state) {
case STATE_SCANNING:
return -EALREADY;
return 0;
}
-int __supplicant_connect(struct connman_iface *iface,
- const char *network, const char *passphrase)
+int __supplicant_connect(struct connman_element *element, const char *ssid)
{
struct supplicant_task *task;
- 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;
- DBG("interface %s", task->ifname);
+ add_network(task);
+
+ select_network(task);
+ disable_network(task);
- set_network(task, network, passphrase);
+ set_network(task, ssid, NULL);
enable_network(task);
return 0;
}
-int __supplicant_disconnect(struct connman_iface *iface)
+int __supplicant_disconnect(struct connman_element *element)
{
struct supplicant_task *task;
- 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;
- DBG("interface %s", task->ifname);
-
disable_network(task);
+ remove_network(task);
+
return 0;
}
projects / connman / blobdiff