X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fwifi.c;h=e38f2bba1d30502393f0ace3c5e27878b258da72;hb=f883452f576d8f9e51d2b474f5a5d4d33ab093f9;hp=39f288d771aa584d91ecf9e2f52a90eb2f84a368;hpb=b7f59753507e5ee0076a5cf4687d06b3da2ca0d3;p=connman

diff --git a/plugins/wifi.c b/plugins/wifi.c
index 39f288d..e38f2bb 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -41,8 +41,14 @@
 #include "inet.h"
 #include "supplicant.h"
 
+#define CLEANUP_TIMEOUT   8	/* in seconds */
+#define INACTIVE_TIMEOUT  12	/* in seconds */
+
 struct wifi_data {
-	GSList *list;
+	GSList *current;
+	GSList *pending;
+	guint cleanup_timer;
+	guint inactive_timer;
 	gchar *identifier;
 	gboolean connected;
 };
@@ -61,6 +67,7 @@ static void network_remove(struct connman_element *element)
 
 static int network_enable(struct connman_element *element)
 {
+	struct connman_element *device = element->parent;
 	char *name, *security = NULL, *passphrase = NULL;
 	unsigned char *ssid;
 	int ssid_len;
@@ -75,13 +82,13 @@ static int network_enable(struct connman_element *element)
 				"WiFi.SSID", &ssid, &ssid_len) == FALSE)
 		return -EIO;
 
-	if (element->parent != NULL) {
-		struct wifi_data *data = connman_element_get_data(element->parent);
-
-		if (data->connected == TRUE)
-			return -EBUSY;
+	if (device != NULL) {
+		struct wifi_data *data = connman_element_get_data(device);
 
 		if (data != NULL) {
+			if (data->connected == TRUE)
+				return -EBUSY;
+
 			g_free(data->identifier);
 			data->identifier = g_strdup(name);
 		}
@@ -124,12 +131,12 @@ static struct connman_driver network_driver = {
 	.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,
@@ -140,40 +147,163 @@ static struct connman_element *find_element(struct wifi_data *data,
 	return NULL;
 }
 
-static void state_change(struct connman_element *parent,
+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;
+	}
+
+	return NULL;
+}
+
+static gboolean inactive_scan(gpointer user_data)
+{
+	struct connman_element *device = user_data;
+	struct wifi_data *data = connman_element_get_data(device);
+
+	DBG("");
+
+	if (data->cleanup_timer > 0) {
+		g_source_remove(data->cleanup_timer);
+		data->cleanup_timer = 0;
+	}
+
+	__supplicant_scan(device);
+
+	data->inactive_timer = 0;
+
+	return FALSE;
+}
+
+static void connect_known_networks(struct connman_element *device)
+{
+	struct wifi_data *data = connman_element_get_data(device);
+	GSList *list;
+
+	DBG("");
+
+	if (data->inactive_timer > 0) {
+		g_source_remove(data->inactive_timer);
+		data->inactive_timer = 0;
+	}
+
+	for (list = data->current; list; list = list->next) {
+		struct connman_element *element = list->data;
+
+		if (element->policy == CONNMAN_ELEMENT_POLICY_AUTO &&
+						element->remember == TRUE &&
+						element->available == TRUE) {
+			if (network_enable(element) == 0)
+				return;
+		}
+	}
+
+	data->inactive_timer = g_timeout_add_seconds(INACTIVE_TIMEOUT,
+							inactive_scan, device);
+}
+
+static void state_change(struct connman_element *device,
 						enum supplicant_state state)
 {
-	struct wifi_data *data = connman_element_get_data(parent);
+	struct wifi_data *data = connman_element_get_data(device);
 	struct connman_element *element;
 
 	DBG("state %d", state);
 
-	if (data->identifier == NULL)
+	if (state == STATE_SCANNING)
+		connman_element_set_scanning(device, TRUE);
+	else
+		connman_element_set_scanning(device, FALSE);
+
+	if (data == NULL)
 		return;
 
-	element = find_element(data, data->identifier);
+	if (data->identifier == NULL)
+		goto reconnect;
+
+	element = find_current_element(data, data->identifier);
 	if (element == NULL)
-		return;
+		goto reconnect;
 
 	if (state == STATE_COMPLETED) {
 		struct connman_element *dhcp;
 
 		data->connected = TRUE;
+		connman_element_set_enabled(element, 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)
+		if (connman_element_register(dhcp, element) < 0)
+			connman_element_unref(dhcp);
+	} else if (state == STATE_INACTIVE || state == STATE_DISCONNECTED) {
+		data->connected = FALSE;
+		connman_element_set_enabled(element, FALSE);
+
+		connman_element_unregister_children(element);
+	}
+
+reconnect:
+	if (state == STATE_INACTIVE) {
 		data->connected = FALSE;
+		connect_known_networks(device);
+	}
 }
 
-static void scan_result(struct connman_element *parent,
+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->cleanup_timer = 0;
+
+	return FALSE;
+}
+
+static void clear_results(struct connman_element *device)
+{
+	struct wifi_data *data = connman_element_get_data(device);
+
+	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->cleanup_timer > 0)
+		return;
+
+	data->cleanup_timer = g_timeout_add_seconds(CLEANUP_TIMEOUT,
+							cleanup_pending, data);
+}
+
+static void scan_result(struct connman_element *device,
 					struct supplicant_network *network)
 {
-	struct wifi_data *data = connman_element_get_data(parent);
+	struct wifi_data *data = connman_element_get_data(device);
 	struct connman_element *element;
 	gchar *temp;
 	int i;
@@ -192,29 +322,18 @@ 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] = '_';
-		else 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 (g_ascii_isprint(temp[i]) == FALSE)
+		char tmp = temp[i];
+		if ((tmp < '0' || tmp > '9') && (tmp < 'A' || tmp > 'Z') &&
+						(tmp < 'a' || tmp > 'z'))
 			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) {
-		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);
+		element->index = device->index;
 
 		connman_element_add_static_property(element, "Name",
 				DBUS_TYPE_STRING, &network->identifier);
@@ -237,25 +356,42 @@ static void scan_result(struct connman_element *parent,
 			element->wifi.security = g_strdup(security);
 		}
 
-		strength = network->quality;
+		element->strength = network->quality;
 
-		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);
+		connman_element_add_static_property(element, "Strength",
+					DBUS_TYPE_BYTE, &element->strength);
 
 		DBG("%s (%s) strength %d", network->identifier,
-					element->wifi.security, strength);
+				element->wifi.security, element->strength);
+
+		if (connman_element_register(element, device) < 0) {
+			connman_element_unref(element);
+			goto done;
+		}
+	} else {
+		data->pending = g_slist_remove(data->pending, element);
+
+		if (element->strength != network->quality) {
+			element->strength = network->quality;
+
+			connman_element_set_static_property(element, "Strength",
+					DBUS_TYPE_BYTE, &element->strength);
 
-		connman_element_register(element, parent);
+			connman_element_update(element);
+		}
 	}
 
+	data->current = g_slist_append(data->current, element);
+
+	element->available = TRUE;
+
+done:
 	g_free(temp);
 }
 
 static struct supplicant_callback wifi_callback = {
 	.state_change	= state_change,
+	.clear_results	= clear_results,
 	.scan_result	= scan_result,
 };
 
@@ -319,19 +455,40 @@ static int wifi_disable(struct connman_element *element)
 
 	DBG("element %p name %s", element, element->name);
 
+	if (data->cleanup_timer > 0) {
+		g_source_remove(data->cleanup_timer);
+		data->cleanup_timer = 0;
+	}
+
+	if (data->inactive_timer > 0) {
+		g_source_remove(data->inactive_timer);
+		data->inactive_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->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->list);
-	data->list = NULL;
+	g_slist_free(data->current);
+	data->current = NULL;
 
 	connman_element_unregister_children(element);
 
+	__supplicant_stop(element);
+
 	return 0;
 }
 
@@ -354,7 +511,7 @@ static void wifi_newlink(unsigned short type, int index,
 	struct connman_element *device;
 	GSList *list;
 	gboolean exists = FALSE;
-	gchar *name;
+	gchar *name, *devname;
 	struct iwreq iwr;
 	int sk;
 
@@ -363,10 +520,11 @@ static void wifi_newlink(unsigned short type, int index,
 	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);
 
@@ -398,8 +556,13 @@ static void wifi_newlink(unsigned short type, int index,
 
 	device->index = index;
 	device->name = name;
+	device->devname = devname;
+
+	if (connman_element_register(device, NULL) < 0) {
+		connman_element_unregister(device);
+		return;
+	}
 
-	connman_element_register(device, NULL);
 	device_list = g_slist_append(device_list, device);
 }
 
@@ -490,6 +653,8 @@ static int wifi_init(void)
 
 	if (g_dbus_check_service(connection, SUPPLICANT_NAME) == TRUE)
 		supplicant_connect(connection, NULL);
+	else
+		__supplicant_activate(connection);
 
 	return 0;
 }