From e540978633dd15cc5862763c047a542359e8c009 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 24 Oct 2019 15:08:44 -0500 Subject: [PATCH] treewide: Use CamelCase for [Scan] settings --- autotests/testAP/main.conf | 2 +- autotests/testFT-8021x-roam/main.conf | 2 +- autotests/testFT-FILS-SHA256/main.conf | 2 +- autotests/testFT-FILS-SHA384/main.conf | 2 +- autotests/testFT-PSK-over-DS/main.conf | 2 +- autotests/testFT-PSK-roam/main.conf | 2 +- autotests/testFT-SAE-roam/main.conf | 2 +- autotests/testHT-VHT/main.conf | 2 +- autotests/testHiddenNetworks/main.conf | 2 +- autotests/testRSSIAgent/main.conf | 2 +- autotests/testScan/main.conf | 2 +- src/scan.c | 4 ++-- src/station.c | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/autotests/testAP/main.conf b/autotests/testAP/main.conf index c7eaf63a..9452fb6b 100644 --- a/autotests/testAP/main.conf +++ b/autotests/testAP/main.conf @@ -1,2 +1,2 @@ [Scan] -disable_mac_address_randomization=true +DisableMacAddressRandomization=true diff --git a/autotests/testFT-8021x-roam/main.conf b/autotests/testFT-8021x-roam/main.conf index c7eaf63a..9452fb6b 100644 --- a/autotests/testFT-8021x-roam/main.conf +++ b/autotests/testFT-8021x-roam/main.conf @@ -1,2 +1,2 @@ [Scan] -disable_mac_address_randomization=true +DisableMacAddressRandomization=true diff --git a/autotests/testFT-FILS-SHA256/main.conf b/autotests/testFT-FILS-SHA256/main.conf index c7eaf63a..9452fb6b 100644 --- a/autotests/testFT-FILS-SHA256/main.conf +++ b/autotests/testFT-FILS-SHA256/main.conf @@ -1,2 +1,2 @@ [Scan] -disable_mac_address_randomization=true +DisableMacAddressRandomization=true diff --git a/autotests/testFT-FILS-SHA384/main.conf b/autotests/testFT-FILS-SHA384/main.conf index c7eaf63a..9452fb6b 100644 --- a/autotests/testFT-FILS-SHA384/main.conf +++ b/autotests/testFT-FILS-SHA384/main.conf @@ -1,2 +1,2 @@ [Scan] -disable_mac_address_randomization=true +DisableMacAddressRandomization=true diff --git a/autotests/testFT-PSK-over-DS/main.conf b/autotests/testFT-PSK-over-DS/main.conf index c7eaf63a..9452fb6b 100644 --- a/autotests/testFT-PSK-over-DS/main.conf +++ b/autotests/testFT-PSK-over-DS/main.conf @@ -1,2 +1,2 @@ [Scan] -disable_mac_address_randomization=true +DisableMacAddressRandomization=true diff --git a/autotests/testFT-PSK-roam/main.conf b/autotests/testFT-PSK-roam/main.conf index c7eaf63a..9452fb6b 100644 --- a/autotests/testFT-PSK-roam/main.conf +++ b/autotests/testFT-PSK-roam/main.conf @@ -1,2 +1,2 @@ [Scan] -disable_mac_address_randomization=true +DisableMacAddressRandomization=true diff --git a/autotests/testFT-SAE-roam/main.conf b/autotests/testFT-SAE-roam/main.conf index c7eaf63a..9452fb6b 100644 --- a/autotests/testFT-SAE-roam/main.conf +++ b/autotests/testFT-SAE-roam/main.conf @@ -1,2 +1,2 @@ [Scan] -disable_mac_address_randomization=true +DisableMacAddressRandomization=true diff --git a/autotests/testHT-VHT/main.conf b/autotests/testHT-VHT/main.conf index c7eaf63a..9452fb6b 100644 --- a/autotests/testHT-VHT/main.conf +++ b/autotests/testHT-VHT/main.conf @@ -1,2 +1,2 @@ [Scan] -disable_mac_address_randomization=true +DisableMacAddressRandomization=true diff --git a/autotests/testHiddenNetworks/main.conf b/autotests/testHiddenNetworks/main.conf index f6ffddfe..932eb38b 100644 --- a/autotests/testHiddenNetworks/main.conf +++ b/autotests/testHiddenNetworks/main.conf @@ -3,4 +3,4 @@ # Discovery of the hidden networks with randomization flag set works with real # hardware, but fails when used in simulated environment with mac80211_hwsim. # Disable MAC randomization for the tests with hidden networks. -disable_mac_address_randomization=true +DisableMacAddressRandomization=true diff --git a/autotests/testRSSIAgent/main.conf b/autotests/testRSSIAgent/main.conf index c7eaf63a..9452fb6b 100644 --- a/autotests/testRSSIAgent/main.conf +++ b/autotests/testRSSIAgent/main.conf @@ -1,2 +1,2 @@ [Scan] -disable_mac_address_randomization=true +DisableMacAddressRandomization=true diff --git a/autotests/testScan/main.conf b/autotests/testScan/main.conf index f6ffddfe..932eb38b 100644 --- a/autotests/testScan/main.conf +++ b/autotests/testScan/main.conf @@ -3,4 +3,4 @@ # Discovery of the hidden networks with randomization flag set works with real # hardware, but fails when used in simulated environment with mac80211_hwsim. # Disable MAC randomization for the tests with hidden networks. -disable_mac_address_randomization=true +DisableMacAddressRandomization=true diff --git a/src/scan.c b/src/scan.c index c92a2d26..b3688244 100644 --- a/src/scan.c +++ b/src/scan.c @@ -271,7 +271,7 @@ static bool scan_mac_address_randomization_is_disabled(void) bool disabled; if (!l_settings_get_bool(config, "Scan", - "disable_mac_address_randomization", + "DisableMacAddressRandomization", &disabled)) return false; @@ -641,7 +641,7 @@ static bool scan_periodic_is_disabled(void) const struct l_settings *config = iwd_get_config(); bool disabled; - if (!l_settings_get_bool(config, "Scan", "disable_periodic_scan", + if (!l_settings_get_bool(config, "Scan", "DisablePeriodicScan", &disabled)) return false; diff --git a/src/station.c b/src/station.c index 9b31cd20..7b8f4b9c 100644 --- a/src/station.c +++ b/src/station.c @@ -1975,7 +1975,7 @@ static bool station_cannot_roam(struct station *station) const struct l_settings *config = iwd_get_config(); bool disabled; - if (!l_settings_get_bool(config, "Scan", "disable_roaming_scan", + if (!l_settings_get_bool(config, "Scan", "DisableRoamingScan", &disabled)) disabled = false;