Make sure to get the wireless status from the correct interface.

Add support for the rssi, rate and base station mac.

1 files changed, 19 insertions, 1 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 35cefab..b8fd5d4 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1268,7 +1268,12 @@ function get_interface_info($ifdescr) {
 	if ($ifinfo['status'] == "up") {
 		/* try to determine media with ifconfig */
 		unset($ifconfiginfo);
-		exec("/sbin/ifconfig " . $ifinfo['hwif'], $ifconfiginfo);
+		exec("/sbin/ifconfig " . $ifinfo['if'], $ifconfiginfo);
+		$wifconfiginfo = array();
+		if(is_interface_wireless($ifdescr)) {
+			exec("/sbin/ifconfig {$ifinfo['if']} list sta", $wifconfiginfo);
+			array_shift($wifconfiginfo);
+		}
 		$matches = "";
 		foreach ($ifconfiginfo as $ici) {
 
@@ -1298,6 +1303,19 @@ function get_interface_info($ifdescr) {
 					$ifinfo['ssid'] = $matches[1];
 			}
 		}
+		foreach($wifconfiginfo as $ici) {
+			$elements = preg_split("/[ ]+/i", $ici);
+			if ($elements[0] != "") {
+				$ifinfo['bssid'] = $elements[0];
+			}
+			if ($elements[3] != "") {
+				$ifinfo['rate'] = $elements[3];
+			}
+			if ($elements[4] != "") {
+				$ifinfo['rssi'] = $elements[4];
+			}
+
+		}
 		/* lookup the gateway */
 		if (interface_has_gateway($if)) 
 			$ifinfo['gateway'] = get_interface_gateway($if);