*
* Connection Manager
*
- * Copyright (C) 2007-2008 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2010 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#include <config.h>
#endif
-#include <stdio.h>
#include <unistd.h>
+#include <errno.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <linux/if_arp.h>
#include <linux/wireless.h>
+#include <net/ethernet.h>
-#include <gdbus.h>
+#ifndef IFF_LOWER_UP
+#define IFF_LOWER_UP 0x10000
+#endif
+
+#include <dbus/dbus.h>
+#include <glib.h>
+#define CONNMAN_API_SUBJECT_TO_CHANGE
#include <connman/plugin.h>
-#include <connman/driver.h>
+#include <connman/inet.h>
+#include <connman/device.h>
#include <connman/rtnl.h>
#include <connman/log.h>
-#include "inet.h"
-#include "supplicant.h"
+#include <gsupplicant/gsupplicant.h>
#define CLEANUP_TIMEOUT 8 /* in seconds */
#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;
+ struct connman_device *device;
+ struct connman_network *network;
+ GSupplicantInterface *interface;
+ connman_bool_t connected;
+ int index;
+ unsigned flags;
+ unsigned int watch;
};
-static int network_probe(struct connman_element *element)
+static int get_bssid(struct connman_device *device,
+ unsigned char *bssid, unsigned int *bssid_len)
{
- DBG("element %p name %s", element, element->name);
+ struct iwreq wrq;
+ char *ifname;
+ int ifindex;
+ int fd, err;
+
+ ifindex = connman_device_get_index(device);
+ if (ifindex < 0)
+ return -EINVAL;
+
+ ifname = connman_inet_ifname(ifindex);
+ if (ifname == NULL)
+ return -EINVAL;
+
+ fd = socket(PF_INET, SOCK_DGRAM, 0);
+ if (fd < 0) {
+ g_free(ifname);
+ return -EINVAL;
+ }
- return 0;
-}
+ memset(&wrq, 0, sizeof(wrq));
+ strncpy(wrq.ifr_name, ifname, IFNAMSIZ);
-static void network_remove(struct connman_element *element)
-{
- DBG("element %p name %s", element, element->name);
-}
+ err = ioctl(fd, SIOCGIWAP, &wrq);
-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;
+ g_free(ifname);
+ close(fd);
- 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)
+ if (err < 0)
return -EIO;
- if (device != NULL) {
- struct wifi_data *data = connman_element_get_data(device);
+ memcpy(bssid, wrq.u.ap_addr.sa_data, ETH_ALEN);
+ *bssid_len = ETH_ALEN;
- if (data != NULL) {
- if (data->connected == TRUE)
- return -EBUSY;
+ return 0;
+}
- g_free(data->identifier);
- data->identifier = g_strdup(name);
- }
- }
+static void wifi_newlink(unsigned flags, unsigned change, void *user_data)
+{
+ struct connman_device *device = user_data;
+ struct wifi_data *wifi = connman_device_get_data(device);
- connman_element_get_value(element,
- CONNMAN_PROPERTY_ID_WIFI_SECURITY, &security);
+ DBG("index %d flags %d change %d", wifi->index, flags, change);
- connman_element_get_value(element,
- CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE, &passphrase);
+ if (!change)
+ return;
- DBG("name %s security %s passhprase %s",
- name, security, passphrase);
+ if ((wifi->flags & IFF_UP) != (flags & IFF_UP)) {
+ if (flags & IFF_UP)
+ DBG("interface up");
+ else
+ DBG("interface down");
+ }
- if (__supplicant_connect(element, ssid, ssid_len,
- security, passphrase) < 0)
- connman_error("Failed to initiate connect");
+ if ((wifi->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
+ if (flags & IFF_LOWER_UP)
+ DBG("carrier on");
+ else
+ DBG("carrier off");
+ }
- return 0;
+ wifi->flags = flags;
}
-static int network_disable(struct connman_element *element)
+static int wifi_probe(struct connman_device *device)
{
- DBG("element %p name %s", element, element->name);
-
- connman_element_unregister_children(element);
+ struct wifi_data *wifi;
- __supplicant_disconnect(element);
+ DBG("device %p", device);
- return 0;
-}
+ wifi = g_try_new0(struct wifi_data, 1);
+ if (wifi == NULL)
+ return -ENOMEM;
-static struct connman_driver network_driver = {
- .name = "wifi-network",
- .type = CONNMAN_ELEMENT_TYPE_NETWORK,
- .subtype = CONNMAN_ELEMENT_SUBTYPE_WIFI,
- .probe = network_probe,
- .remove = network_remove,
- .enable = network_enable,
- .disable = network_disable,
-};
+ wifi->connected = FALSE;
-static struct connman_element *find_current_element(struct wifi_data *data,
- const char *identifier)
-{
- GSList *list;
+ connman_device_set_data(device, wifi);
+ wifi->device = connman_device_ref(device);
- for (list = data->current; list; list = list->next) {
- struct connman_element *element = list->data;
+ wifi->index = connman_device_get_index(device);
+ wifi->flags = 0;
- if (connman_element_match_static_property(element,
- "Name", &identifier) == TRUE)
- return element;
- }
+ wifi->watch = connman_rtnl_add_newlink_watch(wifi->index,
+ wifi_newlink, device);
- return NULL;
+ return 0;
}
-static struct connman_element *find_pending_element(struct wifi_data *data,
- const char *identifier)
+static void wifi_remove(struct connman_device *device)
{
- GSList *list;
+ struct wifi_data *wifi = connman_device_get_data(device);
- for (list = data->pending; list; list = list->next) {
- struct connman_element *element = list->data;
+ DBG("device %p", device);
- if (connman_element_match_static_property(element,
- "Name", &identifier) == TRUE)
- return element;
- }
+ connman_device_set_data(device, NULL);
+ connman_device_unref(wifi->device);
+ connman_rtnl_remove_watch(wifi->watch);
- return NULL;
+ g_free(wifi->identifier);
+ g_free(wifi);
}
-static gboolean inactive_scan(gpointer user_data)
+static void interface_create_callback(int result,
+ GSupplicantInterface *interface,
+ void *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;
- }
+ struct wifi_data *wifi = user_data;
- __supplicant_scan(device);
+ DBG("result %d ifname %s", result,
+ g_supplicant_interface_get_ifname(interface));
- data->inactive_timer = 0;
+ if (result < 0)
+ return;
- return FALSE;
+ wifi->interface = interface;
+ g_supplicant_interface_set_data(interface, wifi);
}
-static void connect_known_networks(struct connman_element *device)
+static void interface_remove_callback(int result,
+ GSupplicantInterface *interface,
+ void *user_data)
{
- 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;
- }
+ struct wifi_data *wifi = user_data;
- for (list = data->current; list; list = list->next) {
- struct connman_element *element = list->data;
+ DBG("result %d", result);
- if (element->policy == CONNMAN_ELEMENT_POLICY_AUTO &&
- element->remember == TRUE &&
- element->available == TRUE) {
- if (network_enable(element) == 0)
- return;
- }
- }
+ if (result < 0)
+ return;
- data->inactive_timer = g_timeout_add_seconds(INACTIVE_TIMEOUT,
- inactive_scan, device);
+ wifi->interface = NULL;
}
-static void state_change(struct connman_element *device,
- enum supplicant_state state)
+
+static int wifi_enable(struct connman_device *device)
{
- struct wifi_data *data = connman_element_get_data(device);
- struct connman_element *element;
+ struct wifi_data *wifi = connman_device_get_data(device);
+ const char *interface = connman_device_get_string(device, "Interface");
- DBG("state %d", state);
+ DBG("device %p %p", device, wifi);
- if (data == NULL)
- return;
-
- if (data->identifier == NULL)
- goto reconnect;
+ return g_supplicant_interface_create(interface, "nl80211,wext",
+ interface_create_callback,
+ wifi);
+}
- element = find_current_element(data, data->identifier);
- if (element == NULL)
- goto reconnect;
+static int wifi_disable(struct connman_device *device)
+{
+ struct wifi_data *wifi = connman_device_get_data(device);
- if (state == STATE_COMPLETED) {
- struct connman_element *dhcp;
+ DBG("device %p", device);
- data->connected = TRUE;
- connman_element_set_enabled(element, TRUE);
+ wifi->connected = FALSE;
- dhcp = connman_element_create(NULL);
+ return g_supplicant_interface_remove(wifi->interface,
+ interface_remove_callback,
+ wifi);
+}
- dhcp->type = CONNMAN_ELEMENT_TYPE_DHCP;
- dhcp->index = element->index;
+static void scan_callback(int result, GSupplicantInterface *interface,
+ void *user_data)
+{
+ struct connman_device *device = user_data;
- connman_element_register(dhcp, element);
- } else if (state == STATE_INACTIVE || state == STATE_DISCONNECTED) {
- data->connected = FALSE;
- connman_element_set_enabled(element, FALSE);
+ DBG("result %d", result);
- connman_element_unregister_children(element);
+ if (result < 0) {
+ connman_device_set_scanning(device, FALSE);
+ return;
}
-reconnect:
- if (state == STATE_INACTIVE) {
- data->connected = FALSE;
- connect_known_networks(device);
- }
+ connman_device_set_scanning(device, TRUE);
}
-static gboolean cleanup_pending(gpointer user_data)
+static int wifi_scan(struct connman_device *device)
{
- struct wifi_data *data = user_data;
- GSList *list;
+ struct wifi_data *wifi = connman_device_get_data(device);
- DBG("");
+ DBG("device %p %p", device, wifi->interface);
- for (list = data->pending; list; list = list->next) {
- struct connman_element *element = list->data;
+ return g_supplicant_interface_scan(wifi->interface, scan_callback,
+ device);
+}
- DBG("element %p name %s", element, element->name);
+static struct connman_device_driver wifi_ng_driver = {
+ .name = "wifi",
+ .type = CONNMAN_DEVICE_TYPE_WIFI,
+ .priority = CONNMAN_DEVICE_PRIORITY_LOW,
+ .probe = wifi_probe,
+ .remove = wifi_remove,
+ .enable = wifi_enable,
+ .disable = wifi_disable,
+ .scan = wifi_scan,
+};
- connman_element_unregister(element);
- connman_element_unref(element);
- }
+static void system_ready(void)
+{
+ DBG("");
- g_slist_free(data->pending);
- data->pending = NULL;
+ if (connman_device_driver_register(&wifi_ng_driver) < 0)
+ connman_error("Failed to register WiFi driver");
+}
- data->cleanup_timer = 0;
+static void system_killed(void)
+{
+ DBG("");
- return FALSE;
+ connman_device_driver_unregister(&wifi_ng_driver);
}
-static void clear_results(struct connman_element *device)
+static void interface_added(GSupplicantInterface *interface)
{
- struct wifi_data *data = connman_element_get_data(device);
+ const char *ifname = g_supplicant_interface_get_ifname(interface);
+ const char *driver = g_supplicant_interface_get_driver(interface);
+ struct wifi_data *wifi;
- DBG("pending %d", g_slist_length(data->pending));
- DBG("current %d", g_slist_length(data->current));
+ wifi = (struct wifi_data *)g_supplicant_interface_get_data(interface);
- data->pending = data->current;
- data->current = NULL;
+ DBG("ifname %s driver %s wifi %p", ifname, driver, wifi);
- if (data->cleanup_timer > 0)
+ if (wifi == NULL || wifi->device == NULL) {
+ connman_error("Wrong wifi pointer");
return;
+ }
- data->cleanup_timer = g_timeout_add_seconds(CLEANUP_TIMEOUT,
- cleanup_pending, data);
+ connman_device_set_powered(wifi->device, TRUE);
+ wifi_scan(wifi->device);
}
-static void scan_result(struct connman_element *device,
- struct supplicant_network *network)
+static void interface_state(GSupplicantInterface *interface)
{
- struct wifi_data *data = connman_element_get_data(device);
- struct connman_element *element;
- gchar *temp;
- int i;
+ struct connman_network *network;
+ struct connman_device *device;
+ struct wifi_data *wifi;
+ GSupplicantState state = g_supplicant_interface_get_state(interface);
+ unsigned char bssid[ETH_ALEN];
+ unsigned int bssid_len;
- DBG("network %p identifier %s", network, network->identifier);
+ wifi = (struct wifi_data *) g_supplicant_interface_get_data(interface);
- if (data == NULL)
- return;
+ DBG("wifi %p interface state %d", wifi, state);
- if (network->identifier == NULL)
+ if (wifi == NULL)
return;
- if (network->identifier[0] == '\0')
- return;
+ network = wifi->network;
+ device = wifi->device;
- temp = g_strdup(network->identifier);
+ if (device == NULL || network == NULL)
+ return;
- 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] = '_';
+ switch (state) {
+ case G_SUPPLICANT_STATE_SCANNING:
+ connman_device_set_scanning(device, TRUE);
+ break;
+
+ case G_SUPPLICANT_STATE_AUTHENTICATING:
+ case G_SUPPLICANT_STATE_ASSOCIATING:
+ connman_network_set_associating(network, TRUE);
+ break;
+
+ case G_SUPPLICANT_STATE_COMPLETED:
+ /* reset scan trigger and schedule background scan */
+ connman_device_schedule_scan(device);
+
+ if (get_bssid(device, bssid, &bssid_len) == 0)
+ connman_network_set_address(network,
+ bssid, bssid_len);
+ connman_network_set_connected(network, TRUE);
+ break;
+
+ case G_SUPPLICANT_STATE_DISCONNECTED:
+ connman_network_set_connected(network, FALSE);
+ break;
+
+ case G_SUPPLICANT_STATE_INACTIVE:
+ break;
+
+ case G_SUPPLICANT_STATE_UNKNOWN:
+ case G_SUPPLICANT_STATE_ASSOCIATED:
+ case G_SUPPLICANT_STATE_4WAY_HANDSHAKE:
+ case G_SUPPLICANT_STATE_GROUP_HANDSHAKE:
+ break;
}
- element = find_pending_element(data, network->identifier);
- if (element == NULL) {
- element = connman_element_create(temp);
-
- element->type = CONNMAN_ELEMENT_TYPE_NETWORK;
- element->index = device->index;
-
- 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 (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) strength %d", network->identifier,
- element->wifi.security, element->strength);
+ DBG("DONE");
+}
- connman_element_register(element, device);
- } else {
- data->pending = g_slist_remove(data->pending, element);
+static void interface_removed(GSupplicantInterface *interface)
+{
+ const char *ifname = g_supplicant_interface_get_ifname(interface);
+ struct wifi_data *wifi;
- if (element->strength != network->quality) {
- element->strength = network->quality;
+ DBG("ifname %s", ifname);
- connman_element_set_static_property(element, "Strength",
- DBUS_TYPE_BYTE, &element->strength);
+ wifi = (struct wifi_data *)g_supplicant_interface_get_data(interface);
- connman_element_update(element);
- }
+ if (wifi == NULL || wifi->device == NULL) {
+ connman_error("Wrong wifi pointer");
+ return;
}
- data->current = g_slist_append(data->current, element);
-
- element->available = TRUE;
-
- g_free(temp);
+ connman_device_set_powered(wifi->device, FALSE);
}
-static struct supplicant_callback wifi_callback = {
- .state_change = state_change,
- .clear_results = clear_results,
- .scan_result = scan_result,
-};
-
-static int wifi_probe(struct connman_element *element)
+static void scan_started(GSupplicantInterface *interface)
{
- struct wifi_data *data;
-
- DBG("element %p name %s", element, element->name);
+ struct wifi_data *wifi;
- data = g_try_new0(struct wifi_data, 1);
- if (data == NULL)
- return -ENOMEM;
+ DBG("");
- data->connected = FALSE;
+ wifi = (struct wifi_data *)g_supplicant_interface_get_data(interface);
- connman_element_set_data(element, data);
+ if (wifi == NULL)
+ return;
- return 0;
+ if (wifi->device)
+ connman_device_set_scanning(wifi->device, TRUE);
}
-static void wifi_remove(struct connman_element *element)
+static void scan_finished(GSupplicantInterface *interface)
{
- struct wifi_data *data = connman_element_get_data(element);
+ struct wifi_data *wifi;
- DBG("element %p name %s", element, element->name);
+ DBG("");
- connman_element_set_data(element, NULL);
+ wifi = (struct wifi_data *)g_supplicant_interface_get_data(interface);
- g_free(data->identifier);
- g_free(data);
+ if (wifi == NULL)
+ return;
}
-static int wifi_update(struct connman_element *element)
+static unsigned char calculate_strength(GSupplicantNetwork *supplicant_network)
{
- DBG("element %p name %s", element, element->name);
+ unsigned char strength;
- __supplicant_scan(element);
+ strength = 120 + g_supplicant_network_get_signal(supplicant_network);
+ if (strength > 100)
+ strength = 100;
- return 0;
+ return strength;
}
-static int wifi_enable(struct connman_element *element)
+static void network_added(GSupplicantNetwork *supplicant_network)
{
- int err;
-
- DBG("element %p name %s", element, element->name);
-
- err = __supplicant_start(element, &wifi_callback);
- if (err < 0)
- return err;
+ struct connman_network *network;
+ GSupplicantInterface *interface;
+ struct wifi_data *wifi;
+ const char *name, *path, *identifier, *mode, *security, *group;
+ unsigned char *ssid;
+ unsigned int ssid_len;
- __supplicant_scan(element);
+ DBG("");
- return 0;
-}
+ interface = g_supplicant_network_get_interface(supplicant_network);
+ wifi = (struct wifi_data *) g_supplicant_interface_get_data(interface);
+ name = g_supplicant_network_get_name(supplicant_network);
+ path = g_supplicant_network_get_path(supplicant_network);
+ identifier = g_supplicant_network_get_identifier(supplicant_network);
+ mode = g_supplicant_network_get_mode(supplicant_network);
+ security = g_supplicant_network_get_security(supplicant_network);
+ group = g_supplicant_network_get_identifier(supplicant_network);
-static int wifi_disable(struct connman_element *element)
-{
- struct wifi_data *data = connman_element_get_data(element);
- GSList *list;
+ if (wifi == NULL)
+ return;
- DBG("element %p name %s", element, element->name);
+ ssid = (unsigned char *)g_supplicant_network_get_ssid(supplicant_network, &ssid_len);
- if (data->cleanup_timer > 0) {
- g_source_remove(data->cleanup_timer);
- data->cleanup_timer = 0;
- }
+ network = connman_device_get_network(wifi->device, path);
- if (data->inactive_timer > 0) {
- g_source_remove(data->inactive_timer);
- data->inactive_timer = 0;
- }
+ if (network == NULL) {
+ network = connman_network_create(identifier,
+ CONNMAN_NETWORK_TYPE_WIFI);
+ if (network == NULL)
+ return;
- __supplicant_disconnect(element);
+ connman_network_set_index(network, wifi->index);
- for (list = data->pending; list; list = list->next) {
- struct connman_element *network = list->data;
+ connman_network_set_protocol(network,
+ CONNMAN_NETWORK_PROTOCOL_IP);
- connman_element_unref(network);
+ if (connman_device_add_network(wifi->device, network) < 0) {
+ connman_network_unref(network);
+ return;
+ }
}
- g_slist_free(data->pending);
- data->pending = NULL;
-
- for (list = data->current; list; list = list->next) {
- struct connman_element *network = list->data;
+ if (name != NULL && name[0] != '\0')
+ connman_network_set_name(network, name);
- connman_element_unref(network);
- }
+ connman_network_set_blob(network, "WiFi.SSID",
+ ssid, ssid_len);
+ connman_network_set_string(network, "WiFi.Mode", mode);
+ connman_network_set_string(network, "WiFi.Security", security);
+ connman_network_set_strength(network,
+ calculate_strength(supplicant_network));
- g_slist_free(data->current);
- data->current = NULL;
+ connman_network_set_available(network, TRUE);
- connman_element_unregister_children(element);
+ if (ssid != NULL)
+ connman_network_set_group(network, group);
+}
- __supplicant_stop(element);
+static void network_removed(GSupplicantNetwork *network)
+{
+ const char *name = g_supplicant_network_get_name(network);
- return 0;
+ DBG("* name %s", name);
}
-static struct connman_driver wifi_driver = {
- .name = "wifi-device",
- .type = CONNMAN_ELEMENT_TYPE_DEVICE,
- .subtype = CONNMAN_ELEMENT_SUBTYPE_WIFI,
- .probe = wifi_probe,
- .remove = wifi_remove,
- .update = wifi_update,
- .enable = wifi_enable,
- .disable = wifi_disable,
+static const GSupplicantCallbacks callbacks = {
+ .system_ready = system_ready,
+ .system_killed = system_killed,
+ .interface_added = interface_added,
+ .interface_state = interface_state,
+ .interface_removed = interface_removed,
+ .scan_started = scan_started,
+ .scan_finished = scan_finished,
+ .network_added = network_added,
+ .network_removed = network_removed,
};
-static GSList *device_list = NULL;
-static void wifi_newlink(unsigned short type, int index,
- unsigned flags, unsigned change)
+static int network_probe(struct connman_network *network)
{
- struct connman_element *device;
- GSList *list;
- gboolean exists = FALSE;
- gchar *name, *devname;
- struct iwreq iwr;
- int sk;
+ DBG("network %p", network);
- DBG("index %d", index);
-
- if (type != ARPHRD_ETHER)
- return;
+ return 0;
+}
- name = inet_index2ident(index, "dev_");
- devname = inet_index2name(index);
+static void network_remove(struct connman_network *network)
+{
+ DBG("network %p", network);
+}
- memset(&iwr, 0, sizeof(iwr));
- strncpy(iwr.ifr_ifrn.ifrn_name, devname, IFNAMSIZ);
+static void connect_callback(int result, GSupplicantInterface *interface,
+ void *user_data)
+{
+ connman_error("%s", __func__);
+}
- sk = socket(PF_INET, SOCK_DGRAM, 0);
+static void disconnect_callback(int result, GSupplicantInterface *interface,
+ void *user_data)
+{
+ struct wifi_data *wifi = user_data;
- if (ioctl(sk, SIOCGIWNAME, &iwr) < 0) {
- g_free(name);
- close(sk);
+ if (result < 0) {
+ connman_error("%s", __func__);
return;
}
- close(sk);
-
- for (list = device_list; list; list = list->next) {
- struct connman_element *device = list->data;
-
- if (device->index == index) {
- exists = TRUE;
- break;
- }
- }
-
- if (exists == TRUE) {
- g_free(name);
- return;
- }
+ connman_network_unref(wifi->network);
- device = connman_element_create(NULL);
- device->type = CONNMAN_ELEMENT_TYPE_DEVICE;
- device->subtype = CONNMAN_ELEMENT_SUBTYPE_WIFI;
+ wifi->network = NULL;
+}
- device->index = index;
- device->name = name;
- device->devname = devname;
- connman_element_register(device, NULL);
- device_list = g_slist_append(device_list, device);
+static GSupplicantSecurity network_security(const char *security)
+{
+ if (g_str_equal(security, "none") == TRUE)
+ return G_SUPPLICANT_SECURITY_NONE;
+ else if (g_str_equal(security, "wep") == TRUE)
+ return G_SUPPLICANT_SECURITY_WEP;
+ else if (g_str_equal(security, "psk") == TRUE)
+ return G_SUPPLICANT_SECURITY_PSK;
+ else if (g_str_equal(security, "wpa") == TRUE)
+ return G_SUPPLICANT_SECURITY_PSK;
+ else if (g_str_equal(security, "rsn") == TRUE)
+ return G_SUPPLICANT_SECURITY_PSK;
+ else if (g_str_equal(security, "ieee8021x") == TRUE)
+ return G_SUPPLICANT_SECURITY_IEEE8021X;
+
+ return G_SUPPLICANT_SECURITY_UNKNOWN;
}
-static void wifi_dellink(unsigned short type, int index,
- unsigned flags, unsigned change)
+static int network_connect(struct connman_network *network)
{
- GSList *list;
-
- DBG("index %d", index);
+ struct connman_device *device = connman_network_get_device(network);
+ struct wifi_data *wifi;
+ GSupplicantInterface *interface;
+ GSupplicantSSID ssid;
+ const char *security;
- for (list = device_list; list; list = list->next) {
- struct connman_element *device = list->data;
+ DBG("network %p", network);
- if (device->index == index) {
- device_list = g_slist_remove(device_list, device);
- connman_element_unregister(device);
- connman_element_unref(device);
- break;
- }
- }
-}
+ if (device == NULL)
+ return -ENODEV;
-static struct connman_rtnl wifi_rtnl = {
- .name = "wifi",
- .newlink = wifi_newlink,
- .dellink = wifi_dellink,
-};
+ wifi = connman_device_get_data(device);
+ if (wifi == NULL)
+ return -ENODEV;
-static void supplicant_connect(DBusConnection *connection, void *user_data)
-{
- DBG("connection %p", connection);
+ interface = wifi->interface;
- __supplicant_init(connection);
+ memset(&ssid, 0, sizeof(ssid));
+ ssid.ssid = connman_network_get_blob(network, "WiFi.SSID",
+ &ssid.ssid_len);
+ security = connman_network_get_string(network, "WiFi.Security");
+ ssid.security = network_security(security);
+ ssid.passphrase = connman_network_get_string(network,
+ "WiFi.Passphrase");
- if (connman_rtnl_register(&wifi_rtnl) < 0)
- return;
+ wifi->network = connman_network_ref(network);
- connman_rtnl_send_getlink();
+ return g_supplicant_interface_connect(interface, &ssid,
+ connect_callback, NULL);
}
-static void supplicant_disconnect(DBusConnection *connection, void *user_data)
+static int network_disconnect(struct connman_network *network)
{
- GSList *list;
-
- DBG("connection %p", connection);
+ struct connman_device *device = connman_network_get_device(network);
+ struct wifi_data *wifi;
- connman_rtnl_unregister(&wifi_rtnl);
+ DBG("network %p", network);
- for (list = device_list; list; list = list->next) {
- struct connman_element *device = list->data;
+ wifi = connman_device_get_data(device);
+ if (wifi == NULL || wifi->interface == NULL)
+ return -ENODEV;
- connman_element_unregister(device);
- connman_element_unref(device);
- }
-
- g_slist_free(device_list);
- device_list = NULL;
-
- __supplicant_exit();
+ return g_supplicant_interface_disconnect(wifi->interface,
+ disconnect_callback, wifi);
}
-static DBusConnection *connection;
-static guint watch;
+static struct connman_network_driver network_driver = {
+ .name = "wifi",
+ .type = CONNMAN_NETWORK_TYPE_WIFI,
+ .priority = CONNMAN_NETWORK_PRIORITY_LOW,
+ .probe = network_probe,
+ .remove = network_remove,
+ .connect = network_connect,
+ .disconnect = network_disconnect,
+};
static int wifi_init(void)
{
int err;
- connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
- if (connection == NULL)
- return -EIO;
-
- err = connman_driver_register(&network_driver);
- if (err < 0) {
- dbus_connection_unref(connection);
+ err = connman_network_driver_register(&network_driver);
+ if (err < 0)
return err;
- }
- err = connman_driver_register(&wifi_driver);
+ err = g_supplicant_register(&callbacks);
if (err < 0) {
- connman_driver_unregister(&network_driver);
- dbus_connection_unref(connection);
+ connman_network_driver_unregister(&network_driver);
return err;
}
- watch = g_dbus_add_service_watch(connection, SUPPLICANT_NAME,
- supplicant_connect, supplicant_disconnect, NULL, NULL);
-
- if (g_dbus_check_service(connection, SUPPLICANT_NAME) == TRUE)
- supplicant_connect(connection, NULL);
-
return 0;
}
static void wifi_exit(void)
{
- connman_driver_unregister(&network_driver);
- connman_driver_unregister(&wifi_driver);
-
- if (watch > 0)
- g_dbus_remove_watch(connection, watch);
+ DBG();
- supplicant_disconnect(connection, NULL);
+ g_supplicant_unregister(&callbacks);
- dbus_connection_unref(connection);
+ connman_network_driver_unregister(&network_driver);
}
CONNMAN_PLUGIN_DEFINE(wifi, "WiFi interface plugin", VERSION,
- wifi_init, wifi_exit)
+ CONNMAN_PLUGIN_PRIORITY_DEFAULT, wifi_init, wifi_exit)
projects / platform / upstream / connman.git / blobdiff