From f04869c3cfc6215d69f2f3846f3d59ce5d340ae9 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 14 Jun 2018 19:20:26 -0500 Subject: [PATCH] network: Use network_load_psk in network_connect_psk --- src/network.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/src/network.c b/src/network.c index 65b737a6..71894d32 100644 --- a/src/network.c +++ b/src/network.c @@ -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");