Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-02-18 09:10:38 +01:00
Code Releases Activity

wiphy: Use network_create, register & remove

Browse Source
This commit is contained in:
Denis Kenzior 2016-05-15 21:41:37 -05:00
parent 18957e504e
commit a789703f6f
1 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/wiphy.c
View File

@ -521,20 +521,8 @@ static void bss_free(void *data)
static void network_free(void *data) static void network_free(void *data)
{ {
struct network *network = data; struct network *network = data;
struct l_dbus *dbus;
agent_request_cancel(network->agent_request); network_remove(network);
network_settings_close(network);
dbus = dbus_get_bus();
l_dbus_unregister_object(dbus, network->object_path);
network_emit_removed(network);
l_free(network->object_path);
l_queue_destroy(network->bss_list, NULL);
l_free(network->psk);
l_free(network);
} }
const char *device_get_path(struct netdev *netdev) const char *device_get_path(struct netdev *netdev)
@ -1643,25 +1631,18 @@ static void process_bss(struct netdev *netdev, struct scan_bss *bss)
network = l_hashmap_lookup(netdev->networks, path); network = l_hashmap_lookup(netdev->networks, path);
if (!network) { if (!network) {
network = l_new(struct network, 1); network = network_create(netdev, bss->ssid, bss->ssid_len,
network->netdev = netdev; security);
memcpy(network->ssid, bss->ssid, bss->ssid_len);
network->security = security; if (!network_register(network, path)) {
network->bss_list = l_queue_new(); network_remove(network);
network->object_path = strdup(path); return;
}
l_hashmap_insert(netdev->networks, l_hashmap_insert(netdev->networks,
network->object_path, network); network_get_path(network), network);
l_debug("Added new Network \"%s\" security %s",
l_debug("Added new Network \"%s\" security %s", network->ssid, network_get_ssid(network), security_to_str(security));
security_to_str(security));
if (!l_dbus_object_add_interface(dbus_get_bus(),
network->object_path,
IWD_NETWORK_INTERFACE, network))
l_info("Unable to register %s interface",
IWD_NETWORK_INTERFACE);
else
network_emit_added(network);
network_seen(network->security, network->ssid); network_seen(network->security, network->ssid);
} }