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

network: Use network_load_psk in network_connect_psk

This commit is contained in:
Denis Kenzior 2018-06-14 19:20:26 -05:00
parent c25499a118
commit f04869c3cf
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/network.c
View File

@ -673,33 +673,13 @@ static struct l_dbus_message *network_connect_psk(struct network *network,
struct l_dbus_message *message)
{
struct device *device = network->device;
const char *psk;
l_debug("");
if (network_settings_load(network)) {
psk = l_settings_get_value(network->settings, "Security",
"PreSharedKey");
if (psk) {
size_t len;
l_debug("psk: %s", psk);
l_free(network->psk);
network->psk = l_util_from_hexstring(psk, &len);
l_debug("len: %zd", len);
if (network->psk && len != 32) {
l_debug("Can't parse PSK");
l_free(network->psk);
network->psk = NULL;
}
}
} else {
if (network_settings_load(network))
network_load_psk(network);
else
network->settings = l_settings_new();
}
l_debug("ask_psk: %s", network->ask_psk ? "true" : "false");