From 638e2551e40bf3fc6988aa9b8125de1ef1b143ca Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 3 Jul 2008 15:02:22 +0200 Subject: [PATCH] Fix network identifier checking --- plugins/wifi.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/plugins/wifi.c b/plugins/wifi.c index 5c275a4..30d94f2 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -23,6 +23,8 @@ #include #endif +#include + #include #include #include @@ -42,7 +44,11 @@ static struct connman_element *find_element(struct wifi_data *data, for (list = data->list; list; list = list->next) { struct connman_element *element = list->data; - if (g_str_equal(identifier, element->network.identifier) == TRUE) + if (element->network.identifier == NULL) + continue; + + if (g_str_equal(element->network.identifier, + identifier) == TRUE) return element; } @@ -54,27 +60,40 @@ static void scan_result(struct connman_element *parent, { struct wifi_data *data = connman_element_get_data(parent); struct connman_element *element; + gchar *temp; + int i; DBG("network %p identifier %s", network, network->identifier); if (data == NULL) return; + temp = g_strdup(network->identifier); + + for (i = 0; i < strlen(temp); i++) { + if (temp[i] == ' ' || temp[i] == '.') + temp[i] = '_'; + temp[i] = g_ascii_tolower(temp[i]); + } + g_static_mutex_lock(&data->mutex); - element = find_element(data, network->identifier); + element = find_element(data, temp); if (element == NULL) { element = connman_element_create(); element->type = CONNMAN_ELEMENT_TYPE_NETWORK; - element->name = g_strdup(network->identifier); + element->name = temp; + + element->network.identifier = g_strdup(temp); data->list = g_slist_append(data->list, element); - } - g_static_mutex_unlock(&data->mutex); + connman_element_register(element, parent); + } else + g_free(temp); - connman_element_register(element, parent); + g_static_mutex_unlock(&data->mutex); } static struct supplicant_callback wifi_callback = { -- 2.7.4