Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

wiphy: Use network_settings_load & _close

This commit is contained in:
Denis Kenzior 2016-05-15 20:58:09 -05:00
parent 2e46201a1e
commit 24366efb32
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/wiphy.c
View File

@ -213,8 +213,7 @@ static void netdev_disassociated(struct netdev *netdev)
{ {
struct network *network = netdev->connected_network; struct network *network = netdev->connected_network;
l_settings_free(network->settings); network_settings_close(network);
network->settings = NULL;
netdev->connected_bss = NULL; netdev->connected_bss = NULL;
netdev->connected_network = NULL; netdev->connected_network = NULL;
@ -371,8 +370,7 @@ static void passphrase_callback(enum agent_result result,
return; return;
err: err:
l_settings_free(network->settings); network_settings_close(network);
network->settings = NULL;
l_free(network->psk); l_free(network->psk);
network->psk = NULL; network->psk = NULL;
@ -387,7 +385,8 @@ static struct l_dbus_message *network_connect_psk(struct network *network,
l_debug(""); l_debug("");
network->settings = storage_network_open("psk", network->ssid); network_settings_load(network);
psk = l_settings_get_value(network->settings, "Security", psk = l_settings_get_value(network->settings, "Security",
"PreSharedKey"); "PreSharedKey");
@ -460,8 +459,7 @@ static struct l_dbus_message *network_connect(struct l_dbus *dbus,
netdev->connect_pending = l_dbus_message_ref(message); netdev->connect_pending = l_dbus_message_ref(message);
return NULL; return NULL;
case SECURITY_8021X: case SECURITY_8021X:
network->settings = storage_network_open("8021x", network_settings_load(network);
network->ssid);
mlme_authenticate_cmd(network, bss); mlme_authenticate_cmd(network, bss);
netdev->connect_pending = l_dbus_message_ref(message); netdev->connect_pending = l_dbus_message_ref(message);
@ -526,7 +524,7 @@ static void network_free(void *data)
struct l_dbus *dbus; struct l_dbus *dbus;
agent_request_cancel(network->agent_request); agent_request_cancel(network->agent_request);
l_settings_free(network->settings); network_settings_close(network);
dbus = dbus_get_bus(); dbus = dbus_get_bus();
l_dbus_unregister_object(dbus, network->object_path); l_dbus_unregister_object(dbus, network->object_path);
@ -883,7 +881,7 @@ static bool netdev_try_autoconnect(struct netdev *netdev,
if (network->ask_psk) if (network->ask_psk)
return false; return false;
network->settings = storage_network_open("psk", network->ssid); network_settings_load(network);
psk = l_settings_get_value(network->settings, "Security", psk = l_settings_get_value(network->settings, "Security",
"PreSharedKey"); "PreSharedKey");
@ -903,9 +901,7 @@ static bool netdev_try_autoconnect(struct netdev *netdev,
break; break;
} }
case SECURITY_8021X: case SECURITY_8021X:
network->settings = storage_network_open("8021x", network_settings_load(network);
network->ssid);
break; break;
default: default:
return false; return false;