Changeset 911 for trunk

Timestamp:

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

Author:

chronos

Message:

• Modified: Record also remote signal for wireless clients.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/FinanceBankAPI/FioAPI.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/Network/NetworkModels.php (modified) (1 diff)
• Modules/NetworkConfigAirOS/Generators/Signal.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (3 diffs)

trunk/Application/UpdateTrace.php

@@ -2170 +2170 @@
   $Manager->Execute('ALTER TABLE `Member` ADD KEY (`AddressPlace`);');
   $Manager->Execute('ALTER TABLE `Member` ADD FOREIGN KEY (`AddressPlace`) REFERENCES `AddressPlace`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+}
+
+function UpdateTo911(UpdateManager $Manager): void
+{
+  $Manager->Execute('ALTER TABLE `NetworkSignal` ADD `Remote` INT NOT NULL DEFAULT "0" AFTER `Device`;');
 }
 
@@ -2278 +2283 @@
       885 => array('Revision' => 901, 'Function' => 'UpdateTo901'),
       901 => array('Revision' => 907, 'Function' => 'UpdateTo907'),
+      907 => array('Revision' => 911, 'Function' => 'UpdateTo911'),
     );
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 907; // Subversion revision
-$DatabaseRevision = 907; // SQL structure revision
-$ReleaseTime = strtotime('2021-03-24');
+$Revision = 911; // Subversion revision
+$DatabaseRevision = 911; // SQL structure revision
+$ReleaseTime = strtotime('2021-07-31');

trunk/Modules/FinanceBankAPI/FioAPI.php

@@ -1 +1 @@
 <?php
 
-// Specifikace API: http://www.fio.cz/docs/cz/API_Bankovnictvi.pdf
+// Specifikace API: https://www.fio.cz/docs/cz/API_Bankovnictvi.pdf
 
 include('GPC.php');

trunk/Modules/Network/Network.php

@@ -383 +383 @@
         'Interface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní', 'Default' => '', 'Null' => true),
         'Value' => array('Type' => 'Integer', 'Caption' => 'Signál', 'Default' => '0', 'Suffix' => 'dBm'),
+        'Remote' => array('Type' => 'Integer', 'Caption' => 'Vzdálený signál', 'Default' => '0', 'Suffix' => 'dBm'),
         'RateRx' => array('Type' => 'Integer', 'Caption' => 'Rychlost Rx', 'Default' => '0', 'Suffix' => 'MHz'),
         'RateTx' => array('Type' => 'Integer', 'Caption' => 'Rychlost Tx', 'Default' => '0', 'Suffix' => 'MHz'),

trunk/Modules/Network/NetworkModels.php

@@ -195 +195 @@
     $Desc->AddReference('Interface', NetworkInterface::GetClassName());
     $Desc->AddInteger('Value');
+    $Desc->AddInteger('Remote');
     $Desc->AddInteger('RateRx');
     $Desc->AddInteger('RateTx');

trunk/Modules/NetworkConfigAirOS/Generators/Signal.php

@@ -21 +21 @@
       if (count($Result) > 0)
       {
-      //print_r($Result);
-      $Array = json_decode(implode("\n", $Result), true);
-      //print_r($Array);
-      echo('-');
-      foreach ($Array as $Properties)
-      {
-        $DbResult = $this->Database->select('NetworkInterface', 'Id', '`MAC`="'.$Properties['mac'].'"');
-        if ($DbResult->num_rows > 0)
+        //print_r($Result);
+        $Array = json_decode(implode("\n", $Result), true);
+        //print_r($Array);
+        echo('-');
+        foreach ($Array as $Properties)
         {
-          $DbRow = $DbResult->fetch_assoc();
-          $Interface = $DbRow['Id'];
-        } else $Interface = null;
+          $DbResult = $this->Database->select('NetworkInterface', 'Id', '`MAC`="'.$Properties['mac'].'"');
+          if ($DbResult->num_rows > 0)
+          {
+            $DbRow = $DbResult->fetch_assoc();
+            $Interface = $DbRow['Id'];
+          } else $Interface = null;
 
-        $Strength = $Properties['signal'];
-        $RateRx = $Properties['rx'];
-        $RateTx = $Properties['tx'];
-        $this->Database->insert('NetworkSignal', array('MAC' => $Properties['mac'],
-          'Value' => $Strength, 'RateRx' => $RateRx, 'RateTx' => $RateTx,
-          'Time' => TimeToMysqlDateTime($Time), 'Interface' => $Interface, 'Device' => $Device['Id']));
-        echo('.');
-      }
-      echo("\n");
+          $Strength = $Properties['signal'];
+          $RemoteSignal = $Properties['remote']['signal'];
+          $RateRx = $Properties['rx'];
+          $RateTx = $Properties['tx'];
+          $this->Database->insert('NetworkSignal', array('MAC' => $Properties['mac'],
+            'Value' => $Strength, 'Remote' => $RemoteSignal, 'RateRx' => $RateRx, 'RateTx' => $RateTx,
+            'Time' => TimeToMysqlDateTime($Time), 'Interface' => $Interface, 'Device' => $Device['Id']));
+          echo('.');
+        }
+        echo("\n");
       } else echo("Empty response\n");
     }

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'].')';
         /*