#include "inet.h"
#include "supplicant.h"
+#define CLEANUP_PENDING_TIMEOUT 8 /* in seconds */
+
struct wifi_data {
- GSList *list;
+ GSList *current;
+ GSList *pending;
+ guint timer;
gchar *identifier;
+ gboolean connected;
};
static int network_probe(struct connman_element *element)
static int network_enable(struct connman_element *element)
{
- char *identifier, *passphrase = NULL;
+ char *name, *security = NULL, *passphrase = NULL;
unsigned char *ssid;
int ssid_len;
DBG("element %p name %s", element, element->name);
if (connman_element_get_static_property(element,
- "WiFi.Name", &identifier) == FALSE)
+ "Name", &name) == FALSE)
return -EIO;
if (connman_element_get_static_array_property(element,
if (element->parent != NULL) {
struct wifi_data *data = connman_element_get_data(element->parent);
+ if (data->connected == TRUE)
+ return -EBUSY;
+
if (data != NULL) {
g_free(data->identifier);
- data->identifier = g_strdup(identifier);
+ data->identifier = g_strdup(name);
}
}
connman_element_get_value(element,
+ CONNMAN_PROPERTY_ID_WIFI_SECURITY, &security);
+
+ connman_element_get_value(element,
CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE, &passphrase);
- DBG("identifier %s passhprase %s", identifier, passphrase);
+ DBG("name %s security %s passhprase %s",
+ name, security, passphrase);
- if (__supplicant_connect(element, ssid, ssid_len, passphrase) < 0)
+ if (__supplicant_connect(element, ssid, ssid_len,
+ security, passphrase) < 0)
connman_error("Failed to initiate connect");
return 0;
.disable = network_disable,
};
-static struct connman_element *find_element(struct wifi_data *data,
- const char *identifier)
+static struct connman_element *find_current_element(struct wifi_data *data,
+ const char *identifier)
{
GSList *list;
- for (list = data->list; list; list = list->next) {
+ for (list = data->current; list; list = list->next) {
struct connman_element *element = list->data;
if (connman_element_match_static_property(element,
- "WiFi.Name", &identifier) == TRUE)
+ "Name", &identifier) == TRUE)
+ return element;
+ }
+
+ return NULL;
+}
+
+static struct connman_element *find_pending_element(struct wifi_data *data,
+ const char *identifier)
+{
+ GSList *list;
+
+ for (list = data->pending; list; list = list->next) {
+ struct connman_element *element = list->data;
+
+ if (connman_element_match_static_property(element,
+ "Name", &identifier) == TRUE)
return element;
}
DBG("state %d", state);
+ if (data == NULL)
+ return;
+
if (data->identifier == NULL)
return;
- element = find_element(data, data->identifier);
+ element = find_current_element(data, data->identifier);
if (element == NULL)
return;
if (state == STATE_COMPLETED) {
struct connman_element *dhcp;
+ data->connected = TRUE;
+
dhcp = connman_element_create(NULL);
dhcp->type = CONNMAN_ELEMENT_TYPE_DHCP;
dhcp->index = element->index;
connman_element_register(dhcp, element);
+ } else if (state == STATE_DISCONNECTED || state == STATE_INACTIVE)
+ data->connected = FALSE;
+}
+
+static gboolean cleanup_pending(gpointer user_data)
+{
+ struct wifi_data *data = user_data;
+ GSList *list;
+
+ DBG("");
+
+ for (list = data->pending; list; list = list->next) {
+ struct connman_element *element = list->data;
+
+ DBG("element %p name %s", element, element->name);
+
+ connman_element_unregister(element);
+ connman_element_unref(element);
}
+
+ g_slist_free(data->pending);
+ data->pending = NULL;
+
+ data->timer = 0;
+
+ return FALSE;
+}
+
+static void clear_results(struct connman_element *parent)
+{
+ struct wifi_data *data = connman_element_get_data(parent);
+
+ DBG("pending %d", g_slist_length(data->pending));
+ DBG("current %d", g_slist_length(data->current));
+
+ data->pending = data->current;
+ data->current = NULL;
+
+ if (data->timer == 0)
+ data->timer = g_timeout_add_seconds(CLEANUP_PENDING_TIMEOUT,
+ cleanup_pending, data);
}
static void scan_result(struct connman_element *parent,
temp = g_strdup(network->identifier);
for (i = 0; i < strlen(temp); i++) {
- if (temp[i] == ' ' || temp[i] == '.' || temp[i] == '-')
+ if (temp[i] == ' ' || temp[i] == '.')
+ temp[i] = '_';
+ else if (temp[i] == '-' || temp[i] == '+')
+ temp[i] = '_';
+ else if (temp[i] == '!' || temp[i] == '?')
temp[i] = '_';
else if (temp[i] == '(' || temp[i] == ')')
temp[i] = '_';
temp[i] = g_ascii_tolower(temp[i]);
}
- element = find_element(data, network->identifier);
+ element = find_pending_element(data, network->identifier);
if (element == NULL) {
- const char *security;
+ guint8 strength;
element = connman_element_create(temp);
element->type = CONNMAN_ELEMENT_TYPE_NETWORK;
element->index = parent->index;
- data->list = g_slist_append(data->list, element);
-
- connman_element_add_static_property(element, "WiFi.Name",
+ connman_element_add_static_property(element, "Name",
DBUS_TYPE_STRING, &network->identifier);
connman_element_add_static_array_property(element, "WiFi.SSID",
DBUS_TYPE_BYTE, &network->ssid, network->ssid_len);
- if (network->has_rsn == TRUE)
- security = "wpa2";
- else if (network->has_wpa == TRUE)
- security = "wpa";
- else if (network->has_wep == TRUE)
- security = "wep";
- else
- security = "none";
+ if (element->wifi.security == NULL) {
+ const char *security;
+
+ if (network->has_rsn == TRUE)
+ security = "wpa2";
+ else if (network->has_wpa == TRUE)
+ security = "wpa";
+ else if (network->has_wep == TRUE)
+ security = "wep";
+ else
+ security = "none";
+
+ element->wifi.security = g_strdup(security);
+ }
+
+ strength = network->quality;
- connman_element_add_static_property(element, "WiFi.Security",
- DBUS_TYPE_STRING, &security);
+ connman_element_add_static_property(element, "WiFi.Strength",
+ DBUS_TYPE_BYTE, &strength);
+
+ //connman_element_add_static_property(element, "WiFi.Noise",
+ // DBUS_TYPE_INT32, &network->noise);
+
+ DBG("%s (%s) strength %d", network->identifier,
+ element->wifi.security, strength);
connman_element_register(element, parent);
- }
+ } else
+ data->pending = g_slist_remove(data->pending, element);
+
+ data->current = g_slist_append(data->current, element);
+
+ element->available = TRUE;
g_free(temp);
}
static struct supplicant_callback wifi_callback = {
.state_change = state_change,
+ .clear_results = clear_results,
.scan_result = scan_result,
};
if (data == NULL)
return -ENOMEM;
+ data->connected = FALSE;
+
connman_element_set_data(element, data);
return 0;
DBG("element %p name %s", element, element->name);
+ if (data->timer > 0) {
+ g_source_remove(data->timer);
+ data->timer = 0;
+ }
+
__supplicant_disconnect(element);
- for (list = data->list; list; list = list->next) {
+ for (list = data->pending; list; list = list->next) {
struct connman_element *network = list->data;
connman_element_unref(network);
}
- g_slist_free(data->list);
- data->list = NULL;
+ g_slist_free(data->pending);
+ data->pending = NULL;
+
+ for (list = data->current; list; list = list->next) {
+ struct connman_element *network = list->data;
+
+ connman_element_unref(network);
+ }
+
+ g_slist_free(data->current);
+ data->current = NULL;
connman_element_unregister_children(element);
+ __supplicant_stop(element);
+
return 0;
}
struct connman_element *device;
GSList *list;
gboolean exists = FALSE;
- gchar *name;
+ gchar *name, *devname;
struct iwreq iwr;
int sk;
if (type != ARPHRD_ETHER)
return;
- name = inet_index2name(index);
+ name = inet_index2ident(index, "dev_");
+ devname = inet_index2name(index);
memset(&iwr, 0, sizeof(iwr));
- strncpy(iwr.ifr_ifrn.ifrn_name, name, IFNAMSIZ);
+ strncpy(iwr.ifr_ifrn.ifrn_name, devname, IFNAMSIZ);
sk = socket(PF_INET, SOCK_DGRAM, 0);
device->index = index;
device->name = name;
+ device->devname = devname;
connman_element_register(device, NULL);
device_list = g_slist_append(device_list, device);
dbus_connection_unref(connection);
}
-CONNMAN_PLUGIN_DEFINE("wifi", "WiFi interface plugin", VERSION,
+CONNMAN_PLUGIN_DEFINE(wifi, "WiFi interface plugin", VERSION,
wifi_init, wifi_exit)
projects / connman / blobdiff