#include <config.h>
#endif
+#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
#include <string.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
#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;
+ char *path;
+ char *name;
+ unsigned char *addr;
+ unsigned int addr_len;
unsigned char *ssid;
unsigned int ssid_len;
dbus_uint16_t capabilities;
gboolean has_wep;
gboolean has_wpa;
gboolean has_rsn;
+ gboolean has_wps;
+ dbus_int32_t frequency;
dbus_int32_t quality;
dbus_int32_t noise;
dbus_int32_t level;
char *netpath;
gboolean created;
enum supplicant_state state;
+ gboolean noscan;
GSList *scan_results;
};
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;
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:
+ 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_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) {
return -EIO;
}
+ if (call == NULL) {
+ connman_error("D-Bus connection not available");
+ dbus_message_unref(message);
+ return -EIO;
+ }
+
dbus_pending_call_set_notify(call, add_interface_reply, task, NULL);
dbus_message_unref(message);
return -EIO;
}
+ if (call == NULL) {
+ connman_error("D-Bus connection not available");
+ dbus_message_unref(message);
+ return -EIO;
+ }
+
dbus_pending_call_set_notify(call, get_interface_reply, task, NULL);
dbus_message_unref(message);
connman_device_set_powered(task->device, FALSE);
+ connman_device_unref(task->device);
+
+ connman_inet_ifdown(task->ifindex);
+
free_task(task);
dbus_message_unref(reply);
return -EIO;
}
+ if (call == NULL) {
+ connman_error("D-Bus connection not available");
+ dbus_message_unref(message);
+ return -EIO;
+ }
+
dbus_pending_call_set_notify(call, remove_interface_reply, task, NULL);
dbus_message_unref(message);
static int set_network(struct supplicant_task *task,
const unsigned char *network, int len,
- const char *security, const char *passphrase)
+ const char *address, const char *security,
+ const char *passphrase)
{
DBusMessage *message, *reply;
DBusMessageIter array, dict;
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, "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, "wpa2") == 0) {
+ g_ascii_strcasecmp(security, "rsn") == 0) {
const char *key_mgmt = "WPA-PSK";
connman_dbus_dict_append_variant(&dict, "key_mgmt",
DBUS_TYPE_STRING, &key_mgmt);
return 0;
}
+static struct {
+ char *name;
+ char *value;
+} special_ssid[] = {
+ { "<hidden>", "hidden" },
+ { "default", "linksys" },
+ { "wireless" },
+ { "linksys" },
+ { "netgear" },
+ { "dlink" },
+ { "2wire" },
+ { "compaq" },
+ { "tsunami" },
+ { "comcomcom", "3com" },
+ { "3Com", "3com" },
+ { "Symbol", "symbol" },
+ { "Motorola", "motorola" },
+ { "Wireless" , "wireless" },
+ { "WLAN", "wlan" },
+ { }
+};
+
+static char *build_group(const char *addr, const char *name,
+ const unsigned char *ssid, unsigned int ssid_len,
+ const char *mode, const char *security)
+{
+ GString *str;
+ unsigned int i;
+
+ if (addr == NULL)
+ return NULL;
+
+ str = g_string_sized_new((ssid_len * 2) + 24);
+ if (str == NULL)
+ return NULL;
+
+ for (i = 0; special_ssid[i].name; i++) {
+ if (g_strcmp0(special_ssid[i].name, name) == 0) {
+ if (special_ssid[i].value == NULL)
+ g_string_append_printf(str, "%s_%s",
+ name, addr);
+ else
+ g_string_append_printf(str, "%s_%s",
+ special_ssid[i].value, addr);
+ goto done;
+ }
+ }
+
+ if (ssid_len > 0 && ssid[0] != '\0') {
+ for (i = 0; i < ssid_len; i++)
+ g_string_append_printf(str, "%02x", ssid[i]);
+ } else
+ g_string_append_printf(str, "hidden_%s", addr);
+
+done:
+ g_string_append_printf(str, "_%s_%s", mode, security);
+
+ return g_string_free(str, FALSE);
+}
+
+static void extract_addr(DBusMessageIter *value,
+ struct supplicant_result *result)
+{
+ DBusMessageIter array;
+ struct ether_addr *eth;
+ unsigned char *addr;
+ int addr_len;
+
+ dbus_message_iter_recurse(value, &array);
+ dbus_message_iter_get_fixed_array(&array, &addr, &addr_len);
+
+ if (addr_len != 6)
+ return;
+
+ result->addr = g_try_malloc(addr_len);
+ if (result->addr == NULL)
+ return;
+
+ memcpy(result->addr, addr, addr_len);
+ result->addr_len = addr_len;
+
+ result->path = g_try_malloc0(13);
+ if (result->path == NULL)
+ return;
+
+ eth = (void *) addr;
+
+ 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,
struct supplicant_result *result)
{
memcpy(result->ssid, ssid, ssid_len);
result->ssid_len = ssid_len;
- result->identifier = g_try_malloc0(ssid_len + 1);
- if (result->identifier == NULL)
+ result->name = g_try_malloc0(ssid_len + 1);
+ if (result->name == NULL)
return;
- memcpy(result->identifier, ssid, ssid_len);
+ memcpy(result->name, ssid, ssid_len);
}
static void extract_wpaie(DBusMessageIter *value,
result->has_rsn = TRUE;
}
+static void extract_wpsie(DBusMessageIter *value,
+ struct supplicant_result *result)
+{
+ 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)
+ result->has_wps = TRUE;
+}
+
static void extract_capabilites(DBusMessageIter *value,
struct supplicant_result *result)
{
result->has_wep = TRUE;
}
-static int get_properties(struct supplicant_task *task);
+static unsigned char calculate_strength(struct supplicant_result *result)
+{
+ if (result->quality < 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;
+}
+
+static unsigned short calculate_channel(struct supplicant_result *result)
+{
+ if (result->frequency < 0)
+ return 0;
+
+ return (result->frequency - 2407) / 5;
+}
+
+static void get_properties(struct supplicant_task *task);
static void properties_reply(DBusPendingCall *call, void *user_data)
{
struct connman_network *network;
DBusMessage *reply;
DBusMessageIter array, dict;
- char *security, *temp = NULL;
unsigned char strength;
- unsigned int i;
+ unsigned short channel, frequency;
+ const char *mode, *security;
+ char *group;
DBG("task %p", 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));
+ result.frequency = -1;
+ result.quality = -1;
+ result.level = 0;
+ result.noise = 0;
dbus_message_iter_init(reply, &array);
* ssid : a (97)
* wpaie : a (97)
* rsnie : a (97)
+ * wpsie : a (97)
* frequency : i (105)
* capabilities : q (113)
* quality : i (105)
* maxrate : i (105)
*/
- if (g_str_equal(key, "ssid") == TRUE)
+ if (g_str_equal(key, "bssid") == TRUE)
+ extract_addr(&value, &result);
+ else if (g_str_equal(key, "ssid") == TRUE)
extract_ssid(&value, &result);
else if (g_str_equal(key, "wpaie") == TRUE)
extract_wpaie(&value, &result);
else if (g_str_equal(key, "rsnie") == TRUE)
extract_rsnie(&value, &result);
+ else if (g_str_equal(key, "wpsie") == TRUE)
+ extract_wpsie(&value, &result);
else if (g_str_equal(key, "capabilities") == TRUE)
extract_capabilites(&value, &result);
+ else if (g_str_equal(key, "frequency") == TRUE)
+ dbus_message_iter_get_basic(&value, &result.frequency);
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_next(&dict);
}
- if (result.identifier == NULL)
+ if (result.path == NULL)
goto done;
- if (result.identifier[0] == '\0')
+ if (result.path[0] == '\0')
goto done;
- temp = g_strdup(result.identifier);
- if (temp == NULL)
- goto done;
+ if (result.frequency > 0 && result.frequency < 14)
+ result.frequency = 2407 + (5 * result.frequency);
+ else if (result.frequency == 14)
+ result.frequency = 2484;
- for (i = 0; i < strlen(temp); i++) {
- char tmp = temp[i];
- if ((tmp < '0' || tmp > '9') && (tmp < 'A' || tmp > 'Z') &&
- (tmp < 'a' || tmp > 'z'))
- temp[i] = '_';
- }
+ strength = calculate_strength(&result);
+ channel = calculate_channel(&result);
- strength = result.quality;
+ frequency = (result.frequency < 0) ? 0 : result.frequency;
if (result.has_rsn == TRUE)
- security = "wpa2";
+ security = "rsn";
else if (result.has_wpa == TRUE)
security = "wpa";
else if (result.has_wep == TRUE)
else
security = "none";
- network = connman_device_get_network(task->device, temp);
+ mode = (result.adhoc == TRUE) ? "adhoc" : "managed";
+
+ group = build_group(result.path, result.name,
+ result.ssid, result.ssid_len,
+ mode, security);
+
+ network = connman_device_get_network(task->device, result.path);
if (network == NULL) {
- const char *mode;
int index;
- network = connman_network_create(temp,
+ network = connman_network_create(result.path,
CONNMAN_NETWORK_TYPE_WIFI);
if (network == NULL)
goto done;
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);
+ connman_network_set_address(network, result.addr,
+ result.addr_len);
if (connman_device_add_network(task->device, network) < 0) {
connman_network_unref(network);
}
}
- connman_network_set_uint8(network, "Strength", strength);
+ if (result.name != NULL && result.name[0] != '\0')
+ connman_network_set_name(network, result.name);
+
+ connman_network_set_blob(network, "WiFi.SSID",
+ result.ssid, result.ssid_len);
+
+ connman_network_set_string(network, "WiFi.Mode", mode);
+
+ DBG("%s (%s %s) strength %d (%s)",
+ result.name, mode, security, strength,
+ (result.has_wps == TRUE) ? "WPS" : "no WPS");
+
+ connman_network_set_available(network, TRUE);
+ 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);
+
+ g_free(group);
+
done:
- g_free(result.identifier);
+ g_free(result.path);
+ g_free(result.addr);
+ g_free(result.name);
g_free(result.ssid);
- g_free(temp);
dbus_message_unref(reply);
get_properties(task);
}
-static int get_properties(struct supplicant_task *task)
+static void get_properties(struct supplicant_task *task)
{
DBusMessage *message;
DBusPendingCall *call;
char *path;
path = g_slist_nth_data(task->scan_results, 0);
- if (path == NULL) {
- connman_device_set_scanning(task->device, FALSE);
- return 0;
- }
+ if (path == NULL)
+ goto noscan;
message = dbus_message_new_method_call(SUPPLICANT_NAME, path,
SUPPLICANT_INTF ".BSSID",
g_free(path);
if (message == NULL)
- return -ENOMEM;
+ 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;
+ }
+
+ if (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_message_unref(message);
- return 0;
+ return;
+
+noscan:
+ if (task->noscan == FALSE)
+ connman_device_set_scanning(task->device, FALSE);
}
static void scan_results_reply(DBusPendingCall *call, void *user_data)
DBG("task %p", task);
reply = dbus_pending_call_steal_reply(call);
- if (reply == NULL) {
- connman_device_set_scanning(task->device, FALSE);
- return;
- }
+ if (reply == NULL)
+ goto noscan;
+
+ if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR)
+ goto done;
dbus_error_init(&error);
dbus_error_free(&error);
} else
connman_error("Wrong arguments for scan result");
- connman_device_set_scanning(task->device, FALSE);
goto done;
}
+ if (num_results == 0)
+ goto done;
+
for (i = 0; i < num_results; i++) {
char *path = g_strdup(results[i]);
if (path == NULL)
g_strfreev(results);
+ dbus_message_unref(reply);
+
get_properties(task);
+ return;
+
done:
dbus_message_unref(reply);
+
+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_available(struct supplicant_task *task)
{
DBusMessage *message;
DBusPendingCall *call;
SUPPLICANT_INTF ".Interface",
"scanResults");
if (message == NULL)
- return -ENOMEM;
+ return;
if (dbus_connection_send_with_reply(connection, message,
&call, TIMEOUT) == FALSE) {
connman_error("Failed to request scan result");
- dbus_message_unref(message);
- return -EIO;
+ goto done;
}
- connman_device_set_scanning(task->device, TRUE);
+ if (task->noscan == FALSE)
+ connman_device_set_scanning(task->device, TRUE);
+
+ if (call == NULL) {
+ connman_error("D-Bus connection not available");
+ goto done;
+ }
dbus_pending_call_set_notify(call, scan_results_reply, task, NULL);
+done:
dbus_message_unref(message);
+}
- return 0;
+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);
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_GROUP_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;
- if (task->state == STATE_SCANNING)
+ 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->network == NULL)
return;
switch (task->state) {
- case STATE_COMPLETED:
+ case WPA_COMPLETED:
/* carrier on */
connman_network_set_connected(task->network, TRUE);
+ connman_device_set_scanning(task->device, FALSE);
break;
- case STATE_DISCONNECTED:
+ case WPA_DISCONNECTED:
/* carrier off */
connman_network_set_connected(task->network, FALSE);
+ connman_device_set_scanning(task->device, FALSE);
+ break;
+ case WPA_ASSOCIATING:
+ connman_network_set_associating(task->network, TRUE);
break;
default:
+ connman_network_set_associating(task->network, FALSE);
break;
}
}
return -ENOMEM;
task->ifindex = connman_device_get_index(device);
- task->ifname = inet_index2name(task->ifindex);
- task->device = device;
+ task->ifname = connman_inet_ifname(task->ifindex);
if (task->ifname == NULL) {
g_free(task);
return -ENOMEM;
}
+ task->device = connman_device_ref(device);
+
task->created = FALSE;
- task->state = STATE_INACTIVE;
+ task->noscan = FALSE;
+ task->state = WPA_INVALID;
task_list = g_slist_append(task_list, task);
return -ENODEV;
switch (task->state) {
- case STATE_SCANNING:
+ case WPA_SCANNING:
return -EALREADY;
- case STATE_ASSOCIATING:
- case STATE_ASSOCIATED:
- case STATE_4WAY_HANDSHAKE:
- case STATE_GROUP_HANDSHAKE:
+ case WPA_ASSOCIATING:
+ case WPA_ASSOCIATED:
+ case WPA_4WAY_HANDSHAKE:
+ case WPA_GROUP_HANDSHAKE:
return -EBUSY;
default:
break;
int supplicant_connect(struct connman_network *network)
{
struct supplicant_task *task;
- const char *security, *passphrase;
+ 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("security %s passphrase %s", security, passphrase);
+ DBG("address %s security %s passphrase %s",
+ address, security, passphrase);
if (security == NULL && passphrase == NULL)
return -EINVAL;
select_network(task);
disable_network(task);
- set_network(task, ssid, ssid_len, security, passphrase);
+ set_network(task, ssid, ssid_len, address, security, passphrase);
enable_network(task);
+ connman_network_set_associating(task->network, TRUE);
+
return 0;
}
remove_network(task);
+ connman_network_set_connected(task->network, FALSE);
+
connman_network_unref(task->network);
return 0;
projects / connman / blobdiff