Changeset 982 for trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

Timestamp:

Dec 28, 2025, 3:55:18 PM (6 hours ago)

Author:

chronos

Message:

• Fixed: Handle missing tx/rx rate in RouterOS signal read.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (5 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -9 +9 @@
     $this->Time = time();
     $Queries = array();
-    
+
     $DbResult3 = $this->Database->query('SELECT `Id`, '.
       '(SELECT `LocalIP` FROM `NetworkInterface` WHERE `NetworkInterface`.`Device` = `NetworkDevice`.`Id` LIMIT 1) AS `LocalIP`, '.
@@ -23 +23 @@
       if ($Routerboard->Connected) 
       {
-        $Queries = array_merge($Queries, $this->ReadWireless($Device, $Routerboard));
-        $Queries = array_merge($Queries, $this->ReadWireless60G($Device, $Routerboard));
+        $New = $this->ReadWireless($Device, $Routerboard);
+        $New60G = $this->ReadWireless60G($Device, $Routerboard);
+        $New = array_merge($New, $New60G);
+        $Queries = array_merge($Queries, $New);
       }
       echo("\n");
@@ -95 +97 @@
   {
     $Queries = array();
-    
+
     $Routerboard->Write('/interface/w60g/monitor', false);
     $Routerboard->Write('=.proplist=tx-phy-rate,rssi,remote-address', false);
@@ -128 +130 @@
 
       $RateTx = $this->StripUnits($Properties['tx-phy-rate']);
-      
+
       $MacRef = $NetworkMac->GetIndex($Properties['remote-address']);
       $Queries[] = 'INSERT INTO `NetworkSignal` (`MAC`, `Value`, `Remote`, `RateRx`, `RateTx`, `Time`, `Interface`, `Device`) VALUES '.
@@ -140 +142 @@
   function StripUnits(string $Value): string
   {
+    if ($Value == '---') $Value = 0; // no speed available
     if (strpos($Value, '-') !== false) $Value = substr($Value, 0, strpos($Value, '-') - 1); // without channel info
     if (substr($Value, -3, 3) == "MHz") $Value = substr($Value, 0, -3); // without MHz unit