#endif
#include <stdio.h>
+#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <linux/if_arp.h>
+#include <linux/wireless.h>
#include <net/ethernet.h>
#include <gdbus.h>
#define CONNMAN_API_SUBJECT_TO_CHANGE
#include <connman/device.h>
+#include <connman/option.h>
+#include <connman/inet.h>
#include <connman/dbus.h>
#include <connman/log.h>
-#include "inet.h"
#include "supplicant.h"
#define TIMEOUT 5000
struct supplicant_result {
char *path;
char *name;
- char *addr;
+ unsigned char *addr;
+ unsigned int addr_len;
unsigned char *ssid;
unsigned int ssid_len;
dbus_uint16_t capabilities;
struct supplicant_task {
int ifindex;
char *ifname;
+ gboolean mac80211;
struct connman_device *device;
struct connman_network *network;
+ struct connman_network *pending_network;
char *path;
char *netpath;
gboolean created;
enum supplicant_state state;
- gboolean noscan;
+ gboolean scanning;
GSList *scan_results;
+ DBusPendingCall *scan_call;
+ DBusPendingCall *result_call;
+ struct iw_range *range;
+ gboolean disconnecting;
};
static GSList *task_list = NULL;
for (list = task_list; list; list = list->next) {
struct supplicant_task *task = list->data;
- if (g_str_equal(task->path, path) == TRUE)
+ if (g_strcmp0(task->path, path) == 0)
return task;
}
return NULL;
}
+static int get_range(struct supplicant_task *task)
+{
+ struct iwreq wrq;
+ int fd, err;
+
+ fd = socket(PF_INET, SOCK_DGRAM, 0);
+ if (fd < 0)
+ return -1;
+
+ memset(&wrq, 0, sizeof(struct iwreq));
+ strncpy(wrq.ifr_name, task->ifname, IFNAMSIZ);
+ wrq.u.data.pointer = task->range;
+ wrq.u.data.length = sizeof(struct iw_range);
+
+ err = ioctl(fd, SIOCGIWRANGE, &wrq);
+
+ close(fd);
+
+ return err;
+}
+
+static int get_bssid(struct connman_device *device,
+ unsigned char *bssid, unsigned int *bssid_len)
+{
+ struct iwreq wrq;
+ char *ifname;
+ int ifindex;
+ int fd, err;
+
+ ifindex = connman_device_get_index(device);
+ if (ifindex < 0)
+ return -EINVAL;
+
+ ifname = connman_inet_ifname(ifindex);
+ if (ifname == NULL)
+ return -EINVAL;
+
+ fd = socket(PF_INET, SOCK_DGRAM, 0);
+ if (fd < 0) {
+ g_free(ifname);
+ return -EINVAL;
+ }
+
+ memset(&wrq, 0, sizeof(wrq));
+ strncpy(wrq.ifr_name, ifname, IFNAMSIZ);
+
+ err = ioctl(fd, SIOCGIWAP, &wrq);
+
+ g_free(ifname);
+ close(fd);
+
+ if (err < 0)
+ return -EIO;
+
+ memcpy(bssid, wrq.u.ap_addr.sa_data, ETH_ALEN);
+ *bssid_len = ETH_ALEN;
+
+ return 0;
+}
+
static void add_interface_reply(DBusPendingCall *call, void *user_data)
{
struct supplicant_task *task = user_data;
return;
if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR)
- goto done;
+ goto failed;
dbus_error_init(&error);
dbus_error_free(&error);
} else
connman_error("Wrong arguments for add interface");
- goto done;
+ goto failed;
}
DBG("path %s", path);
connman_device_set_powered(task->device, TRUE);
-done:
dbus_message_unref(reply);
+
+ return;
+
+failed:
+ dbus_message_unref(reply);
+
+ task_list = g_slist_remove(task_list, task);
+
+ connman_device_unref(task->device);
+
+ free_task(task);
}
static int add_interface(struct supplicant_task *task)
{
+ const char *driver = connman_option_get_string("wifi");
DBusMessage *message;
+ DBusMessageIter array, dict;
DBusPendingCall *call;
DBG("task %p", task);
if (message == NULL)
return -ENOMEM;
- dbus_message_append_args(message, DBUS_TYPE_STRING, &task->ifname,
- DBUS_TYPE_INVALID);
+ dbus_message_set_auto_start(message, FALSE);
+
+ dbus_message_iter_init_append(message, &array);
+
+ dbus_message_iter_append_basic(&array,
+ DBUS_TYPE_STRING, &task->ifname);
+
+ dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
+ DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+ DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
+ DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+
+ connman_dbus_dict_append_variant(&dict, "driver",
+ DBUS_TYPE_STRING, &driver);
+
+ dbus_message_iter_close_container(&array, &dict);
if (dbus_connection_send_with_reply(connection, message,
&call, TIMEOUT) == FALSE) {
if (message == NULL)
return -ENOMEM;
+ dbus_message_set_auto_start(message, FALSE);
+
dbus_message_append_args(message, DBUS_TYPE_STRING, &task->ifname,
DBUS_TYPE_INVALID);
connman_device_unref(task->device);
- inet_ifdown(task->ifindex);
+ connman_inet_ifdown(task->ifindex);
free_task(task);
DBG("task %p", task);
+#if 0
if (task->created == FALSE) {
connman_device_set_powered(task->device, FALSE);
return 0;
}
+#endif
message = dbus_message_new_method_call(SUPPLICANT_NAME, SUPPLICANT_PATH,
SUPPLICANT_INTF, "removeInterface");
if (message == NULL)
return -ENOMEM;
+ dbus_message_set_auto_start(message, FALSE);
+
dbus_message_append_args(message, DBUS_TYPE_OBJECT_PATH, &task->path,
DBUS_TYPE_INVALID);
return -EINPROGRESS;
}
-#if 0
static int set_ap_scan(struct supplicant_task *task)
{
DBusMessage *message, *reply;
if (message == NULL)
return -ENOMEM;
+ dbus_message_set_auto_start(message, FALSE);
+
dbus_message_append_args(message, DBUS_TYPE_UINT32, &ap_scan,
DBUS_TYPE_INVALID);
return 0;
}
-#endif
static int add_network(struct supplicant_task *task)
{
if (message == NULL)
return -ENOMEM;
+ dbus_message_set_auto_start(message, FALSE);
+
dbus_error_init(&error);
reply = dbus_connection_send_with_reply_and_block(connection,
if (message == NULL)
return -ENOMEM;
+ dbus_message_set_auto_start(message, FALSE);
+
dbus_message_append_args(message, DBUS_TYPE_OBJECT_PATH, &task->netpath,
DBUS_TYPE_INVALID);
if (message == NULL)
return -ENOMEM;
+ dbus_message_set_auto_start(message, FALSE);
+
dbus_message_append_args(message, DBUS_TYPE_OBJECT_PATH, &task->netpath,
DBUS_TYPE_INVALID);
return 0;
}
-static int enable_network(struct supplicant_task *task)
+static int disconnect_network(struct supplicant_task *task)
{
DBusMessage *message, *reply;
DBusError error;
DBG("task %p", task);
- if (task->netpath == NULL)
- return -EINVAL;
-
- message = dbus_message_new_method_call(SUPPLICANT_NAME, task->netpath,
- SUPPLICANT_INTF ".Network", "enable");
+ message = dbus_message_new_method_call(SUPPLICANT_NAME, task->path,
+ SUPPLICANT_INTF ".Interface", "disconnect");
if (message == NULL)
return -ENOMEM;
- dbus_error_init(&error);
-
- reply = dbus_connection_send_with_reply_and_block(connection,
- message, -1, &error);
- if (reply == NULL) {
- if (dbus_error_is_set(&error) == TRUE) {
- connman_error("%s", error.message);
- dbus_error_free(&error);
- } else
- connman_error("Failed to enable network");
- dbus_message_unref(message);
- return -EIO;
- }
-
- dbus_message_unref(message);
-
- dbus_message_unref(reply);
-
- return 0;
-}
-
-static int disable_network(struct supplicant_task *task)
-{
- DBusMessage *message, *reply;
- DBusError error;
-
- DBG("task %p", task);
-
- if (task->netpath == NULL)
- return -EINVAL;
-
- message = dbus_message_new_method_call(SUPPLICANT_NAME, task->netpath,
- SUPPLICANT_INTF ".Network", "disable");
- if (message == NULL)
- return -ENOMEM;
+ dbus_message_set_auto_start(message, FALSE);
dbus_error_init(&error);
connman_error("%s", error.message);
dbus_error_free(&error);
} else
- connman_error("Failed to disable network");
+ connman_error("Failed to disconnect network");
dbus_message_unref(message);
return -EIO;
}
DBusMessage *message, *reply;
DBusMessageIter array, dict;
DBusError error;
+ dbus_uint32_t scan_ssid = 1;
DBG("task %p", task);
if (message == NULL)
return -ENOMEM;
+ dbus_message_set_auto_start(message, FALSE);
+
dbus_message_iter_init_append(message, &array);
dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
- if (address == NULL) {
- dbus_uint32_t scan_ssid = 1;
- connman_dbus_dict_append_variant(&dict, "scan_ssid",
- DBUS_TYPE_UINT32, &scan_ssid);
- } else
+ connman_dbus_dict_append_variant(&dict, "scan_ssid",
+ DBUS_TYPE_UINT32, &scan_ssid);
+
+ if (network)
+ connman_dbus_dict_append_array(&dict, "ssid",
+ DBUS_TYPE_BYTE, &network, len);
+ else if (address)
connman_dbus_dict_append_variant(&dict, "bssid",
DBUS_TYPE_STRING, &address);
- connman_dbus_dict_append_array(&dict, "ssid",
- DBUS_TYPE_BYTE, &network, len);
-
if (g_ascii_strcasecmp(security, "wpa") == 0 ||
g_ascii_strcasecmp(security, "rsn") == 0) {
const char *key_mgmt = "WPA-PSK";
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";
+ const char *key_mgmt = "NONE";
+ const char *auth_alg = "OPEN";
+ const char *key_index = "0";
+
+ if (task->mac80211 == TRUE)
+ auth_alg = "OPEN SHARED";
+
+ connman_dbus_dict_append_variant(&dict, "auth_alg",
+ DBUS_TYPE_STRING, &auth_alg);
+
connman_dbus_dict_append_variant(&dict, "key_mgmt",
DBUS_TYPE_STRING, &key_mgmt);
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);
+ DBUS_TYPE_STRING, &key_index);
}
} else {
const char *key_mgmt = "NONE";
return 0;
}
+static void scan_reply(DBusPendingCall *call, void *user_data)
+{
+ struct supplicant_task *task = user_data;
+ DBusMessage *reply;
+
+ DBG("task %p", task);
+
+ task->scan_call = NULL;
+
+ reply = dbus_pending_call_steal_reply(call);
+ if (reply == NULL)
+ return;
+
+ if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
+ connman_device_set_scanning(task->device, FALSE);
+ goto done;
+ }
+
+ if (task->scanning == TRUE)
+ connman_device_set_scanning(task->device, TRUE);
+
+done:
+ dbus_message_unref(reply);
+}
+
+
static int initiate_scan(struct supplicant_task *task)
{
DBusMessage *message;
- DBusPendingCall *call;
DBG("task %p", task);
+ if (task->path == NULL)
+ return -EINVAL;
+
+ if (task->scan_call != NULL)
+ return -EALREADY;
+
message = dbus_message_new_method_call(SUPPLICANT_NAME, task->path,
SUPPLICANT_INTF ".Interface", "scan");
if (message == NULL)
return -ENOMEM;
+ dbus_message_set_auto_start(message, FALSE);
+
if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
+ &task->scan_call, TIMEOUT) == FALSE) {
connman_error("Failed to initiate scan");
dbus_message_unref(message);
return -EIO;
}
+ if (task->scan_call == NULL) {
+ connman_error("D-Bus connection not available");
+ dbus_message_unref(message);
+ return -EIO;
+ }
+
+ dbus_pending_call_set_notify(task->scan_call, scan_reply, task, NULL);
+
dbus_message_unref(message);
- return 0;
+ return -EINPROGRESS;
}
static struct {
{ "2wire" },
{ "compaq" },
{ "tsunami" },
- { "comcomcom" },
+ { "comcomcom", "3com" },
+ { "3Com", "3com" },
{ "Symbol", "symbol" },
+ { "Motorola", "motorola" },
{ "Wireless" , "wireless" },
{ "WLAN", "wlan" },
{ }
if (str == NULL)
return NULL;
+ if (ssid == NULL) {
+ g_string_append_printf(str, "hidden_%s", addr);
+ goto done;
+ }
+
for (i = 0; special_ssid[i].name; i++) {
if (g_strcmp0(special_ssid[i].name, name) == 0) {
if (special_ssid[i].value == NULL)
struct supplicant_result *result)
{
DBusMessageIter array;
- struct ether_addr *eth;
+ struct ether_addr eth;
unsigned char *addr;
int addr_len;
if (addr_len != 6)
return;
- eth = (void *) addr;
-
- result->addr = g_try_malloc0(18);
+ result->addr = g_try_malloc(addr_len);
if (result->addr == NULL)
return;
- snprintf(result->addr, 18, "%02X:%02X:%02X:%02X:%02X:%02X",
- eth->ether_addr_octet[0],
- eth->ether_addr_octet[1],
- eth->ether_addr_octet[2],
- eth->ether_addr_octet[3],
- eth->ether_addr_octet[4],
- eth->ether_addr_octet[5]);
+ memcpy(result->addr, addr, addr_len);
+ result->addr_len = addr_len;
- result->path = g_try_malloc0(18);
+ result->path = g_try_malloc0(13);
if (result->path == NULL)
return;
- snprintf(result->path, 18, "%02x%02x%02x%02x%02x%02x",
- eth->ether_addr_octet[0],
- eth->ether_addr_octet[1],
- eth->ether_addr_octet[2],
- eth->ether_addr_octet[3],
- eth->ether_addr_octet[4],
- eth->ether_addr_octet[5]);
+ memcpy(ð, addr, sizeof(eth));
+ snprintf(result->path, 13, "%02x%02x%02x%02x%02x%02x",
+ eth.ether_addr_octet[0],
+ eth.ether_addr_octet[1],
+ eth.ether_addr_octet[2],
+ eth.ether_addr_octet[3],
+ eth.ether_addr_octet[4],
+ eth.ether_addr_octet[5]);
}
static void extract_ssid(DBusMessageIter *value,
{
DBusMessageIter array;
unsigned char *ssid;
- int ssid_len;
+ int ssid_len, i;
dbus_message_iter_recurse(value, &array);
dbus_message_iter_get_fixed_array(&array, &ssid, &ssid_len);
if (ssid_len < 1)
return;
+ if (ssid[0] == '\0')
+ return;
+
result->ssid = g_try_malloc(ssid_len);
if (result->ssid == NULL)
return;
if (result->name == NULL)
return;
- memcpy(result->name, ssid, ssid_len);
+ for (i = 0; i < ssid_len; i++) {
+ if (g_ascii_isprint(ssid[i]))
+ result->name[i] = ssid[i];
+ else
+ result->name[i] = ' ';
+ }
}
static void extract_wpaie(DBusMessageIter *value,
result->has_wep = TRUE;
}
-static unsigned char calculate_strength(struct supplicant_result *result)
+static unsigned char calculate_strength(struct supplicant_task *task,
+ struct supplicant_result *result)
{
- if (result->quality < 0)
+ if (task->range->max_qual.qual == 0) {
+ unsigned char strength;
+
+ if (result->level > 0)
+ strength = 100 - result->level;
+ else
+ strength = 120 + result->level;
+
+ if (strength > 100)
+ strength = 100;
+
+ return strength;
+ }
+
+ return (result->quality * 100) / task->range->max_qual.qual;
+}
+
+static unsigned short calculate_channel(struct supplicant_result *result)
+{
+ if (result->frequency < 0)
return 0;
- return result->quality;
+ return (result->frequency - 2407) / 5;
}
static void get_properties(struct supplicant_task *task);
DBusMessage *reply;
DBusMessageIter array, dict;
unsigned char strength;
- unsigned short frequency;
+ unsigned short channel, frequency;
const char *mode, *security;
- char *group;
+ char *group = NULL;
DBG("task %p", task);
}
memset(&result, 0, sizeof(result));
+ result.frequency = -1;
result.quality = -1;
- result.level = -1;
- result.noise = -1;
+ result.level = 0;
+ result.noise = 0;
dbus_message_iter_init(reply, &array);
if (result.path[0] == '\0')
goto done;
- strength = calculate_strength(&result);
- frequency = result.frequency;
+ if (result.frequency > 0 && result.frequency < 14)
+ result.frequency = 2407 + (5 * result.frequency);
+ else if (result.frequency == 14)
+ result.frequency = 2484;
+
+ strength = calculate_strength(task, &result);
+ channel = calculate_channel(&result);
+
+ frequency = (result.frequency < 0) ? 0 : result.frequency;
if (result.has_rsn == TRUE)
security = "rsn";
connman_network_set_protocol(network,
CONNMAN_NETWORK_PROTOCOL_IP);
- connman_network_set_string(network, "Address", result.addr);
+ connman_network_set_address(network, result.addr,
+ result.addr_len);
if (connman_device_add_network(task->device, network) < 0) {
connman_network_unref(network);
}
if (result.name != NULL && result.name[0] != '\0')
- connman_network_set_string(network, "Name", result.name);
+ connman_network_set_name(network, result.name);
connman_network_set_blob(network, "WiFi.SSID",
result.ssid, result.ssid_len);
(result.has_wps == TRUE) ? "WPS" : "no WPS");
connman_network_set_available(network, TRUE);
- connman_network_set_uint8(network, "Strength", strength);
- connman_network_set_uint16(network, "Frequency", frequency);
+ connman_network_set_strength(network, strength);
+ connman_network_set_uint16(network, "Frequency", frequency);
+ connman_network_set_uint16(network, "WiFi.Channel", channel);
connman_network_set_string(network, "WiFi.Security", security);
- connman_network_set_group(network, group);
+ if (result.ssid != NULL)
+ connman_network_set_group(network, group);
+done:
g_free(group);
-done:
g_free(result.path);
g_free(result.addr);
g_free(result.name);
static void get_properties(struct supplicant_task *task)
{
DBusMessage *message;
- DBusPendingCall *call;
char *path;
path = g_slist_nth_data(task->scan_results, 0);
if (message == NULL)
goto noscan;
+ dbus_message_set_auto_start(message, FALSE);
+
if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
+ &task->result_call, TIMEOUT) == FALSE) {
connman_error("Failed to get network properties");
dbus_message_unref(message);
goto noscan;
}
- if (call == NULL) {
+ if (task->result_call == NULL) {
connman_error("D-Bus connection not available");
dbus_message_unref(message);
goto noscan;
}
- dbus_pending_call_set_notify(call, properties_reply, task, NULL);
+ dbus_pending_call_set_notify(task->result_call,
+ properties_reply, task, NULL);
dbus_message_unref(message);
return;
noscan:
- if (task->noscan == FALSE)
+ task->result_call = NULL;
+
+ if (task->scanning == TRUE) {
connman_device_set_scanning(task->device, FALSE);
+ task->scanning = FALSE;
+ }
}
static void scan_results_reply(DBusPendingCall *call, void *user_data)
dbus_message_unref(reply);
noscan:
- if (task->noscan == FALSE)
+ task->result_call = NULL;
+
+ if (task->scanning == TRUE) {
connman_device_set_scanning(task->device, FALSE);
+ task->scanning = FALSE;
+ }
}
static void scan_results_available(struct supplicant_task *task)
{
DBusMessage *message;
- DBusPendingCall *call;
DBG("task %p", task);
+ if (task->result_call != NULL)
+ return;
+
message = dbus_message_new_method_call(SUPPLICANT_NAME, task->path,
SUPPLICANT_INTF ".Interface",
"scanResults");
if (message == NULL)
return;
+ dbus_message_set_auto_start(message, FALSE);
+
if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
+ &task->result_call, TIMEOUT) == FALSE) {
connman_error("Failed to request scan result");
goto done;
}
- if (task->noscan == FALSE)
- connman_device_set_scanning(task->device, TRUE);
-
- if (call == NULL) {
+ if (task->result_call == NULL) {
connman_error("D-Bus connection not available");
goto done;
}
- dbus_pending_call_set_notify(call, scan_results_reply, task, NULL);
+ if (task->scanning == TRUE)
+ connman_device_set_scanning(task->device, TRUE);
+
+ dbus_pending_call_set_notify(task->result_call,
+ scan_results_reply, task, NULL);
done:
dbus_message_unref(message);
return WPA_INVALID;
}
+static int task_connect(struct supplicant_task *task)
+{
+ const char *address, *security, *passphrase;
+ const void *ssid;
+ unsigned int ssid_len;
+ int err;
+
+ connman_inet_ifup(task->ifindex);
+
+ address = connman_network_get_string(task->network, "Address");
+ security = connman_network_get_string(task->network, "WiFi.Security");
+ passphrase = connman_network_get_string(task->network, "WiFi.Passphrase");
+
+ ssid = connman_network_get_blob(task->network, "WiFi.SSID", &ssid_len);
+
+ DBG("address %s security %s", address, security);
+
+ if (security == NULL && passphrase == NULL)
+ return -EINVAL;
+
+ if (g_str_equal(security, "none") == FALSE && passphrase == NULL)
+ return -EINVAL;
+
+ remove_network(task);
+
+ set_ap_scan(task);
+
+ add_network(task);
+
+ set_network(task, ssid, ssid_len, address, security, passphrase);
+
+ err = select_network(task);
+ if (err < 0)
+ return err;
+
+ return -EINPROGRESS;
+}
+
+static void scanning(struct supplicant_task *task, DBusMessage *msg)
+{
+ DBusError error;
+ dbus_bool_t scanning;
+
+ dbus_error_init(&error);
+
+ if (dbus_message_get_args(msg, &error, DBUS_TYPE_BOOLEAN, &scanning,
+ 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 scanning");
+ return;
+ }
+
+ connman_info("%s scanning %s", task->ifname,
+ scanning == TRUE ? "started" : "finished");
+}
+
static void state_change(struct supplicant_task *task, DBusMessage *msg)
{
DBusError error;
const char *newstate, *oldstate;
- enum supplicant_state state;
+ unsigned char bssid[ETH_ALEN];
+ unsigned int bssid_len;
+ enum supplicant_state state, prevstate;
dbus_error_init(&error);
DBG("state %s ==> %s", oldstate, newstate);
+ connman_info("%s %s%s", task->ifname, newstate,
+ task->scanning == TRUE ? " (scanning)" : "");
+
state = string2state(newstate);
if (state == WPA_INVALID)
return;
- task->state = state;
-
- switch (task->state) {
- case WPA_SCANNING:
- task->noscan = TRUE;
- connman_device_set_scanning(task->device, TRUE);
- break;
- 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->scanning == TRUE && state != WPA_SCANNING) {
+ connman_device_cleanup_scanning(task->device);
+ task->scanning = FALSE;
}
+ prevstate = task->state;
+ task->state = state;
+
if (task->network == NULL)
return;
switch (task->state) {
case WPA_COMPLETED:
+ switch (prevstate) {
+ case WPA_ASSOCIATED:
+ case WPA_GROUP_HANDSHAKE:
+ break;
+ default:
+ goto badstate;
+ }
+
+ /* reset scan trigger and schedule background scan */
+ connman_device_schedule_scan(task->device);
+
+ if (get_bssid(task->device, bssid, &bssid_len) == 0)
+ connman_network_set_address(task->network,
+ bssid, bssid_len);
+
/* carrier on */
connman_network_set_connected(task->network, TRUE);
- connman_device_set_scanning(task->device, FALSE);
break;
+
case WPA_DISCONNECTED:
+ remove_network(task);
+
/* carrier off */
connman_network_set_connected(task->network, FALSE);
- connman_device_set_scanning(task->device, FALSE);
+
+ if (task->disconnecting == TRUE) {
+ connman_network_unref(task->network);
+ task->disconnecting = FALSE;
+
+ if (task->pending_network != NULL) {
+ task->network = task->pending_network;
+ task->pending_network = NULL;
+ task_connect(task);
+ } else
+ task->network = NULL;
+ }
break;
+
case WPA_ASSOCIATING:
- connman_network_set_associating(task->network, TRUE);
+ switch (prevstate) {
+ case WPA_COMPLETED:
+ break;
+ case WPA_SCANNING:
+ connman_network_set_associating(task->network, TRUE);
+ break;
+ default:
+ goto badstate;
+ }
+ break;
+
+ case WPA_INACTIVE:
+ switch (prevstate) {
+ case WPA_SCANNING:
+ case WPA_DISCONNECTED:
+ break;
+ default:
+ goto badstate;
+ }
+
+ connman_network_set_connected(task->network, FALSE);
+
+ if (task->disconnecting == TRUE) {
+ connman_network_unref(task->network);
+ task->disconnecting = FALSE;
+
+ if (task->pending_network != NULL) {
+ task->network = task->pending_network;
+ task->pending_network = NULL;
+ task_connect(task);
+ } else
+ task->network = NULL;
+ }
break;
+
default:
connman_network_set_associating(task->network, FALSE);
break;
}
+
+ return;
+
+badstate:
+ connman_error("%s invalid state change %s -> %s", task->ifname,
+ oldstate, newstate);
}
static DBusHandlerResult supplicant_filter(DBusConnection *conn,
if (g_str_equal(member, "ScanResultsAvailable") == TRUE)
scan_results_available(task);
+ else if (g_str_equal(member, "Scanning") == TRUE)
+ scanning(task, msg);
else if (g_str_equal(member, "StateChange") == TRUE)
state_change(task, msg);
int supplicant_start(struct connman_device *device)
{
struct supplicant_task *task;
+ int err;
DBG("device %p", device);
return -ENOMEM;
task->ifindex = connman_device_get_index(device);
- task->ifname = inet_index2name(task->ifindex);
+ task->ifname = connman_inet_ifname(task->ifindex);
if (task->ifname == NULL) {
- g_free(task);
- return -ENOMEM;
+ err = -ENOMEM;
+ goto failed;
}
+ task->mac80211 = connman_inet_is_mac80211(task->ifindex);
+ if (task->mac80211 == FALSE)
+ connman_warn("Enabling quirks for unsupported driver");
+
+ task->range = g_try_malloc0(sizeof(struct iw_range));
+ if (task->range == NULL) {
+ err = -ENOMEM;
+ goto failed;
+ }
+
+ err = get_range(task);
+ if (err < 0)
+ goto failed;
+
task->device = connman_device_ref(device);
task->created = FALSE;
- task->noscan = FALSE;
+ task->scanning = FALSE;
task->state = WPA_INVALID;
+ task->disconnecting = FALSE;
+ task->pending_network = NULL;
task_list = g_slist_append(task_list, task);
return create_interface(task);
+
+failed:
+ g_free(task->range);
+ g_free(task->ifname);
+ g_free(task);
+
+ return err;
}
int supplicant_stop(struct connman_device *device)
if (task == NULL)
return -ENODEV;
+ g_free(task->range);
+
task_list = g_slist_remove(task_list, task);
- disable_network(task);
+ if (task->scan_call != NULL) {
+ dbus_pending_call_cancel(task->scan_call);
+ task->scan_call = NULL;
+ }
+
+ if (task->result_call != NULL) {
+ dbus_pending_call_cancel(task->result_call);
+ task->result_call = NULL;
+ }
+
+ if (task->scanning == TRUE)
+ connman_device_set_scanning(task->device, FALSE);
remove_network(task);
+ disconnect_network(task);
+
return remove_interface(task);
}
break;
}
+ task->scanning = TRUE;
+
err = initiate_scan(task);
+ if (err < 0) {
+ if (err == -EINPROGRESS)
+ return 0;
+
+ task->scanning = FALSE;
+ return err;
+ }
+
+ connman_device_set_scanning(task->device, TRUE);
return 0;
}
int supplicant_connect(struct connman_network *network)
{
struct supplicant_task *task;
- const char *address, *security, *passphrase;
- const void *ssid;
- unsigned int ssid_len;
int index;
DBG("network %p", network);
- address = connman_network_get_string(network, "Address");
- security = connman_network_get_string(network, "WiFi.Security");
- passphrase = connman_network_get_string(network, "WiFi.Passphrase");
-
- ssid = connman_network_get_blob(network, "WiFi.SSID", &ssid_len);
-
- DBG("address %s security %s passphrase %s",
- address, security, passphrase);
-
- if (security == NULL && passphrase == NULL)
- return -EINVAL;
-
- if (g_str_equal(security, "none") == FALSE && passphrase == NULL)
- return -EINVAL;
-
index = connman_network_get_index(network);
task = find_task_by_index(index);
if (task == NULL)
return -ENODEV;
- task->network = connman_network_ref(network);
-
- add_network(task);
-
- select_network(task);
- disable_network(task);
-
- set_network(task, ssid, ssid_len, address, security, passphrase);
-
- enable_network(task);
-
- connman_network_set_associating(task->network, TRUE);
+ if (task->disconnecting == TRUE)
+ task->pending_network = connman_network_ref(network);
+ else {
+ task->network = connman_network_ref(network);
+ return task_connect(task);
+ }
- return 0;
+ return -EINPROGRESS;
}
int supplicant_disconnect(struct connman_network *network)
if (task == NULL)
return -ENODEV;
- disable_network(task);
+ if (task->disconnecting == TRUE)
+ return -EALREADY;
remove_network(task);
- connman_network_set_connected(task->network, FALSE);
+ disconnect_network(task);
- connman_network_unref(task->network);
+ task->disconnecting = TRUE;
return 0;
}
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);
+ supplicant_activate(connection);
return 0;
}
projects / framework / connectivity / connman.git / blobdiff