diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2009-01-05 00:45:05 +0100 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2009-01-05 00:45:05 +0100 |
commit | 888b54002e0ba4e465f0ae1628c475dfc54ffef1 (patch) | |
tree | 83912bd98cf3b7ae62f2b68788c490e39eb51a8f /plugins/wifi.c | |
parent | 14a162c1c42466791a655475289770da076bfd71 (diff) | |
download | connman-888b54002e0ba4e465f0ae1628c475dfc54ffef1.tar.gz connman-888b54002e0ba4e465f0ae1628c475dfc54ffef1.tar.bz2 connman-888b54002e0ba4e465f0ae1628c475dfc54ffef1.zip |
Update WiFi plugin for new network helper functions
Diffstat (limited to 'plugins/wifi.c')
-rw-r--r-- | plugins/wifi.c | 390 |
1 files changed, 14 insertions, 376 deletions
diff --git a/plugins/wifi.c b/plugins/wifi.c index 0ae1014f..f44cdd8c 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -23,20 +23,11 @@ #include <config.h> #endif -#include <stdio.h> -#include <unistd.h> -#include <string.h> -#include <sys/ioctl.h> -#include <sys/socket.h> -#include <linux/if_arp.h> -#include <linux/wireless.h> - #include <dbus/dbus.h> #define CONNMAN_API_SUBJECT_TO_CHANGE #include <connman/plugin.h> #include <connman/device.h> -#include <connman/driver.h> #include <connman/log.h> #include "inet.h" @@ -46,357 +37,29 @@ #define INACTIVE_TIMEOUT 12 /* in seconds */ struct wifi_data { - GSList *current; - GSList *pending; - guint cleanup_timer; - guint inactive_timer; - gchar *identifier; - gboolean connected; + char *identifier; + connman_bool_t connected; }; -static int network_probe(struct connman_element *element) +static int network_probe(struct connman_network *network) { - DBG("element %p name %s", element, element->name); + DBG("network %p", network); return 0; } -static void network_remove(struct connman_element *element) +static void network_remove(struct connman_network *network) { - DBG("element %p name %s", element, element->name); + DBG("network %p", network); } -static int network_enable(struct connman_element *element) -{ - struct connman_device *device = (struct connman_device *) element->parent; - 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, - "Name", &name) == FALSE) - return -EIO; - - if (connman_element_get_static_array_property(element, - "WiFi.SSID", &ssid, &ssid_len) == FALSE) - return -EIO; - - if (device != NULL) { - struct wifi_data *data = connman_device_get_data(device); - - if (data != NULL) { - if (data->connected == TRUE) - return -EBUSY; - - g_free(data->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("name %s security %s passhprase %s", - name, security, passphrase); - - if (__supplicant_connect(element, ssid, ssid_len, - security, passphrase) < 0) - connman_error("Failed to initiate connect"); - - return 0; -} - -static int network_disable(struct connman_element *element) -{ - DBG("element %p name %s", element, element->name); - - connman_element_unregister_children(element); - - __supplicant_disconnect(element); - - return 0; -} - -static struct connman_driver network_driver = { - .name = "wifi-network", - .type = CONNMAN_ELEMENT_TYPE_NETWORK, - .subtype = CONNMAN_ELEMENT_SUBTYPE_WIFI, +static struct connman_network_driver network_driver = { + .name = "wifi", + .type = CONNMAN_NETWORK_TYPE_WIFI, .probe = network_probe, .remove = network_remove, - .enable = network_enable, - .disable = network_disable, }; -static struct connman_element *find_current_element(struct wifi_data *data, - const char *identifier) -{ - GSList *list; - - for (list = data->current; 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 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_device *device = user_data; - struct wifi_data *data = connman_device_get_data(device); - - DBG("device %p", device); - - supplicant_scan(device); - - data->inactive_timer = 0; - - return FALSE; -} - -static void connect_known_networks(struct connman_device *device) -{ - struct wifi_data *data = connman_device_get_data(device); - GSList *list; - - DBG("device %p", device); - - 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_device *device, - enum supplicant_state state) -{ - struct wifi_data *data = connman_device_get_data(device); - struct connman_element *element; - - DBG("device %p state %d", device, state); - - if (state == STATE_SCANNING) - connman_device_set_scanning(device, TRUE); - else - connman_device_set_scanning(device, FALSE); - - if (data == NULL) - return; - - DBG("identifier %s", data->identifier); - - if (data->identifier == NULL) - goto reconnect; - - element = find_current_element(data, data->identifier); - if (element == NULL) - goto reconnect; - - if (state == STATE_COMPLETED && data->connected == FALSE) { - 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; - - 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 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_device *device) -{ - struct wifi_data *data = connman_device_get_data(device); - - DBG("pending %d", g_slist_length(data->pending)); - DBG("current %d", g_slist_length(data->current)); - - if (data->cleanup_timer > 0) { - g_source_remove(data->cleanup_timer); - cleanup_pending(data); - } - - data->pending = data->current; - data->current = NULL; - - data->cleanup_timer = g_timeout_add_seconds(CLEANUP_TIMEOUT, - cleanup_pending, data); -} - -static void scan_result(struct connman_device *device, - struct supplicant_network *network) -{ - struct wifi_data *data = connman_device_get_data(device); - struct connman_element *element; - gchar *temp; - unsigned int i; - - DBG("device %p identifier %s", device, network->identifier); - - if (data == NULL) - return; - - if (network->identifier == NULL) - return; - - if (network->identifier[0] == '\0') - return; - - temp = g_strdup(network->identifier); - - 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] = '_'; - } - - element = find_pending_element(data, network->identifier); - if (element == NULL) { - const char *mode; - - element = connman_element_create(temp); - - element->type = CONNMAN_ELEMENT_TYPE_NETWORK; - element->subtype = CONNMAN_ELEMENT_SUBTYPE_WIFI; - element->index = connman_device_get_index(device); - - 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); - - mode = (network->adhoc == TRUE) ? "adhoc" : "managed"; - connman_element_add_static_property(element, "WiFi.Mode", - DBUS_TYPE_STRING, &mode); - - 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); - } - - element->strength = network->quality; - - connman_element_add_static_property(element, "Strength", - DBUS_TYPE_BYTE, &element->strength); - - DBG("%s (%s %s) strength %d", network->identifier, mode, - element->wifi.security, element->strength); - - if (connman_element_register(element, - (struct connman_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_update(element); - } - } - - data->current = g_slist_append(data->current, element); - - element->available = TRUE; - -done: - g_free(temp); -} - static int wifi_probe(struct connman_device *device) { struct wifi_data *data; @@ -436,34 +99,13 @@ static int wifi_enable(struct connman_device *device) static int wifi_disable(struct connman_device *device) { struct wifi_data *data = connman_device_get_data(device); - GSList *list; DBG("device %p", device); - if (data->cleanup_timer > 0) { - g_source_remove(data->cleanup_timer); - cleanup_pending(data); - } - - 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 *network = list->data; - - if (network->enabled == TRUE) - __supplicant_disconnect(network); - - connman_element_unref(network); - } - - g_slist_free(data->current); - data->current = NULL; - connman_element_unregister_children((struct connman_element *) device); + data->connected = FALSE; + return supplicant_stop(device); } @@ -503,23 +145,19 @@ static struct supplicant_driver supplicant = { .name = "wifi", .probe = wifi_register, .remove = wifi_unregister, - - .state_change = state_change, - .clear_results = clear_results, - .scan_result = scan_result, }; static int wifi_init(void) { int err; - err = connman_driver_register(&network_driver); + err = connman_network_driver_register(&network_driver); if (err < 0) return err; err = supplicant_register(&supplicant); if (err < 0) { - connman_driver_unregister(&network_driver); + connman_network_driver_unregister(&network_driver); return err; } @@ -530,7 +168,7 @@ static void wifi_exit(void) { supplicant_unregister(&supplicant); - connman_driver_unregister(&network_driver); + connman_network_driver_unregister(&network_driver); } CONNMAN_PLUGIN_DEFINE(wifi, "WiFi interface plugin", VERSION, |