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

Timestamp:

Jul 31, 2021, 12:26:16 AM (3 years ago)

Author:

chronos

Message:

• Modified: Record also remote signal for wireless clients.

File:

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

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -21 +21 @@
       if (!$Routerboard->Connected) continue;
       $Routerboard->Write('/interface/wireless/registration-table/getall', false);
-      $Routerboard->Write('=.proplist=signal-strength,mac-address,rx-rate,tx-rate', false);
+      $Routerboard->Write('=.proplist=signal-strength,tx-signal-strength,mac-address,rx-rate,tx-rate', false);
       $Routerboard->Write('=stats=');
       $Read = $Routerboard->Read(false);
@@ -37 +37 @@
         {
           $Strength = $Properties['signal-strength'];
-        } else {
+        } else
+        {
           $Parts = explode('@', $Properties['signal-strength']);
           if (substr($Parts[0], -3) == 'dBm')
@@ -43 +44 @@
             else $Strength = $Parts[0];
         }
+
+        if (array_key_exists('tx-signal-strength', $Properties))
+        {
+          if (strpos($Properties['tx-signal-strength'], '@') === false)
+          {
+            $RemoteSignal = $Properties['tx-signal-strength'];
+          } else
+          {
+            $Parts = explode('@', $Properties['tx-signal-strength']);
+            if (substr($Parts[0], -3) == 'dBm')
+              $RemoteSignal = substr($Parts[0], 0, -3); // without dBm
+              else $RemoteSignal = $Parts[0];
+          }
+        } else $RemoteSignal = 0;
+
         $RateRx = $this->StripUnits($Properties['rx-rate']);
         $RateTx = $this->StripUnits($Properties['tx-rate']);
-        $Queries[] = 'INSERT INTO `NetworkSignal` (`MAC`, `Value`, `RateRx`, `RateTx`, `Time`, `Interface`, `Device`) VALUES '.
-          '("'.$Properties['mac-address'].'", '.$Strength.', '.$RateRx.', '.$RateTx.', "'.
+        $Queries[] = 'INSERT INTO `NetworkSignal` (`MAC`, `Value`, `Remote`, `RateRx`, `RateTx`, `Time`, `Interface`, `Device`) VALUES '.
+          '("'.$Properties['mac-address'].'", '.$Strength.', '.$RemoteSignal.', '.$RateRx.', '.$RateTx.', "'.
           TimeToMysqlDateTime($Time).'", '.$Interface.', '.$Device['Id'].')';
         /*