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

network: Make network_sync_psk not repetitive 

Refactor network_sync_psk to not require setting attributes into
multiple settings objects.  This is in fact unnecessary as the parsed
security parameters are used everywhere else instead.  Also make sure to
wipe the [Security] group first, in case any settings were invalid
during loading or otherwise invalidated.
This commit is contained in:
Denis Kenzior 2021-07-07 13:48:09 -05:00
parent 27583e6b35
commit 869bcf59d5
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/network.c
View File

@ -431,6 +431,7 @@ static int network_load_psk(struct network *network, bool need_passphrase)
void network_sync_settings(struct network *network)
{
struct l_settings *settings = network->settings;
struct l_settings *fs_settings;
const char *ssid = network_get_ssid(network);
@ -439,35 +440,29 @@ void network_sync_settings(struct network *network)
network->sync_settings = false;
/*
* Re-open the settings from Disk, in case they were updated
* since we last opened them. We only update the [Security]
* bits here
*/
fs_settings = storage_network_open(SECURITY_PSK, ssid);
if (fs_settings)
settings = fs_settings;
if (network->psk) {
l_settings_set_bytes(network->settings, "Security",
"PreSharedKey",
network->psk, 32);
l_settings_remove_group(settings, "Security");
if (fs_settings)
l_settings_set_bytes(fs_settings, "Security",
"PreSharedKey",
network->psk, 32);
}
if (network->psk)
l_settings_set_bytes(settings, "Security", "PreSharedKey",
network->psk, 32);
if (network->passphrase) {
l_settings_set_string(network->settings, "Security",
"Passphrase",
network->passphrase);
if (network->passphrase)
l_settings_set_string(settings, "Security", "Passphrase",
network->passphrase);
if (fs_settings)
l_settings_set_string(fs_settings, "Security",
"Passphrase",
network->passphrase);
}
storage_network_sync(SECURITY_PSK, ssid, settings);
if (fs_settings) {
storage_network_sync(SECURITY_PSK, ssid, fs_settings);
if (fs_settings)
l_settings_free(fs_settings);
} else
storage_network_sync(SECURITY_PSK, ssid, network->settings);
}
const struct network_info *network_get_info(const struct network *network)