From 54b6330845b7085f9db47c5703157cf71d106eda Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Fri, 23 Aug 2024 15:23:33 -0700 Subject: [PATCH] netdev: define netdev settings in netdev.h Following knownnetworks, this moves the settings into a header file which is easier to maintain/read. --- src/netdev.c | 8 ++++---- src/netdev.h | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/netdev.c b/src/netdev.c index 494e46a5..e0121095 100644 --- a/src/netdev.c +++ b/src/netdev.c @@ -6264,16 +6264,16 @@ static int netdev_init(void) goto fail_netlink; } - if (!l_settings_get_int(settings, "General", "RoamThreshold", + if (!l_settings_get_int(settings, NETDEV_ROAM_THRESHOLD, &LOW_SIGNAL_THRESHOLD)) LOW_SIGNAL_THRESHOLD = -70; - if (!l_settings_get_int(settings, "General", "RoamThreshold5G", + if (!l_settings_get_int(settings, NETDEV_ROAM_THRESHOLD_5G, &LOW_SIGNAL_THRESHOLD_5GHZ)) LOW_SIGNAL_THRESHOLD_5GHZ = -76; - rand_addr_str = l_settings_get_value(settings, "General", - "AddressRandomization"); + rand_addr_str = l_settings_get_value(settings, + NETDEV_ADDRESS_RANDOMIZATION); if (rand_addr_str && !strcmp(rand_addr_str, "network")) mac_per_ssid = true; diff --git a/src/netdev.h b/src/netdev.h index db0440d0..c48b2c38 100644 --- a/src/netdev.h +++ b/src/netdev.h @@ -29,6 +29,11 @@ struct eapol_sm; struct mmpdu_header; struct diagnostic_station_info; +#define GENERAL "General" +#define NETDEV_ADDRESS_RANDOMIZATION GENERAL, "AddressRandomization" +#define NETDEV_ROAM_THRESHOLD GENERAL, "RoamThreshold" +#define NETDEV_ROAM_THRESHOLD_5G GENERAL, "RoamThreshold5G" + enum netdev_result { NETDEV_RESULT_OK, NETDEV_RESULT_AUTHENTICATION_FAILED,