From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 18 Aug 2017 18:00:11 +0000 (+0000)
Subject: wireless: Fix crash of status if not connected
X-Git-Url: http://git.ipfire.org/?p=people%2Fstevee%2Fnetwork.git;a=commitdiff_plain;h=607481ace435c5ceaa40fcf9aa8820cbe0915560

wireless: Fix crash of status if not connected

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/functions/functions.wireless b/src/functions/functions.wireless
index 9c3ebd01..298cb19e 100644
--- a/src/functions/functions.wireless
+++ b/src/functions/functions.wireless
@@ -355,6 +355,12 @@ wireless_pre_shared_key_is_valid() {
 	return ${EXIT_ERROR}
 }
 
+wireless_client_is_connected() {
+	local device="${1}"
+
+	device_has_carrier "${device}"
+}
+
 wireless_ibss_join() {
 	local device=${1}
 	assert isset device
diff --git a/src/hooks/zones/wireless b/src/hooks/zones/wireless
index f75e4b24..553d9171 100644
--- a/src/hooks/zones/wireless
+++ b/src/hooks/zones/wireless
@@ -118,33 +118,35 @@ hook_status() {
 		exit ${EXIT_ERROR}
 	fi
 
-	cli_headline 2 "Wireless network information"
-	cli_print_fmt1 2 "SSID" "$(wpa_cli_status_get ${zone} ssid)"
-	cli_space
-
-	cli_headline 3 "Access Point"
-	local bssid=$(wpa_cli_status_get ${zone} bssid)
-	assert isset bssid
-
-	local frequency=$(wpa_cli_bss_get_frequency "${zone}" "${bssid}")
-	cli_print_fmt1 3 "Channel" "$(wireless_frequency_to_channel ${frequency}) (${frequency} MHz)"
-	cli_print_fmt1 3 "BSSID" "${bssid}"
-	cli_print_fmt1 3 "Noise" \
-		"$(wpa_cli_bss_get_noise ${zone} ${bssid})"
-	cli_print_fmt1 3 "Quality" \
-		"$(wpa_cli_bss_get_quality ${zone} ${bssid})%%"
-	cli_print_fmt1 3 "Flags" \
-		"$(wpa_cli_bss_get_flags ${zone} ${bssid})"
-	cli_space
-
-	cli_headline 3 "Encryption"
-	cli_print_fmt1 3 "Mode" \
-		"$(wpa_cli_status_get ${zone} key_mgmt)"
-	cli_print_fmt1 3 "Pairwise cipher" \
-		"$(wpa_cli_status_get ${zone} pairwise_cipher)"
-	cli_print_fmt1 3 "Group cipher" \
-		"$(wpa_cli_status_get ${zone} group_cipher)"
-	cli_space
+	if wireless_client_is_connected "${zone}"; then
+		cli_headline 2 "Wireless network information"
+		cli_print_fmt1 2 "SSID" "$(wpa_cli_status_get ${zone} ssid)"
+		cli_space
+
+		cli_headline 3 "Access Point"
+		local bssid=$(wpa_cli_status_get ${zone} bssid)
+		assert isset bssid
+
+		local frequency=$(wpa_cli_bss_get_frequency "${zone}" "${bssid}")
+		cli_print_fmt1 3 "Channel" "$(wireless_frequency_to_channel ${frequency}) (${frequency} MHz)"
+		cli_print_fmt1 3 "BSSID" "${bssid}"
+		cli_print_fmt1 3 "Noise" \
+			"$(wpa_cli_bss_get_noise ${zone} ${bssid})"
+		cli_print_fmt1 3 "Quality" \
+			"$(wpa_cli_bss_get_quality ${zone} ${bssid})%%"
+		cli_print_fmt1 3 "Flags" \
+			"$(wpa_cli_bss_get_flags ${zone} ${bssid})"
+		cli_space
+
+		cli_headline 3 "Encryption"
+		cli_print_fmt1 3 "Mode" \
+			"$(wpa_cli_status_get ${zone} key_mgmt)"
+		cli_print_fmt1 3 "Pairwise cipher" \
+			"$(wpa_cli_status_get ${zone} pairwise_cipher)"
+		cli_print_fmt1 3 "Group cipher" \
+			"$(wpa_cli_status_get ${zone} group_cipher)"
+		cli_space
+	fi
 
 	cli_headline 2 "Configurations"
 	zone_configs_cmd status ${zone}