Changeset 674

Timestamp:

Jul 21, 2014, 11:09:35 PM (10 years ago)

Author:

chronos

Message:

• Přidáno: Zprovozněno měření signálu přes RouterOS API.

Location:

trunk

Files:

• Application/FormClasses.php (modified) (1 diff)
• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (4 diffs)
• Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/RouterboardAPI.php (modified) (3 diffs)

trunk/Application/FormClasses.php

@@ -772 +772 @@
     'Filter' => '1',
   ),
+  'TNetworkSignalListInterface' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'NetworkSignal',
+    'Id' => 'Id',
+    'Ref' => 'Interface',
+    'Filter' => '1',
+  ),
         'TFinanceInvoiceItemListInvoice' => array(
     'Type' => 'ManyToOne',

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 673; // Subversion revision
-$DatabaseRevision = 671; // SQL structure revision
-$ReleaseTime = strtotime('2014-07-19');
+$Revision = 674; // Subversion revision
+$DatabaseRevision = 674; // SQL structure revision
+$ReleaseTime = strtotime('2014-07-22');

trunk/Common/Setup/Updates.php

@@ -832 +832 @@
   $Manager->Execute('ALTER TABLE `NetworkDevice` ADD FOREIGN KEY ( `API` ) REFERENCES `DeviceAPIType` (
 `Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;');
-
+}
+
+function UpdateTo674($Manager)
+{
+  $Manager->Execute('ALTER TABLE `NetworkSignal` ADD `RateRx` INT NOT NULL ;');
+  $Manager->Execute('ALTER TABLE `NetworkSignal` ADD `RateTx` INT NOT NULL ;');
 }
 
@@ -879 +884 @@
       662 => array('Revision' => 668, 'Function' => 'UpdateTo668'),
       668 => array('Revision' => 671, 'Function' => 'UpdateTo671'),
+      671 => array('Revision' => 674, 'Function' => 'UpdateTo674'),
     ));
   }

trunk/Modules/Network/Network.php

@@ -188 +188 @@
         'Links2' => array('Type' => 'TNetworkLinkListInterface2', 'Caption' => 'Propojení 2', 'Default' => ''),
         'UpDown' => array('Type' => 'TNetworkInterfaceUpDown', 'Caption' => 'Změny stavu', 'Default' => ''),
+        'Signal' => array('Type' => 'TNetworkSignalListInterface', 'Caption' => 'Signál', 'Default' => ''),
       ),
     ));
@@ -237 +238 @@
         'MAC' => array('Type' => 'MacAddress', 'Caption' => 'Fyzická adresa (MAC)', 'Default' => ''),
         'Interface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní', 'Default' => '', 'Null' => true),
-        'Value' => array('Type' => 'Integer', 'Caption' => 'Signál', 'Default' => '0'),
+        'Value' => array('Type' => 'Integer', 'Caption' => 'Signál', 'Default' => '0', 'Suffix' => 'dBm'),
+        'RateRx' => array('Type' => 'Integer', 'Caption' => 'Rychlost', 'Default' => '0', 'Suffix' => 'MHz'),
+        'RateTx' => array('Type' => 'Integer', 'Caption' => 'Rychlost', 'Default' => '0', 'Suffix' => 'MHz'),
       ),
     ));

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -19 +19 @@
     echo('Waiting '.$Delay.' seconds...'."\n");
     sleep($Delay);
-  }      print_r($Properties);
-
+  }
 }
 
@@ -37 +36 @@
   {
     echo($Device['LocalIP']."\n");
-    $Routerboard = new Routerboard();
-    $Routerboard->UserName = $Config['MainRouter']['UserName'];
-    $Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
-    $Routerboard->HostName = $Device['LocalIP'];
-    $Routerboard->Debug = true;
-    $List = $Routerboard->ListGetPrint($Path, array('mac-address', 'signal-strength'), array(), 'stats');
-    foreach($List as $Properties)
+    $Routerboard = new RouterosAPI();
+    $Routerboard->Connect($Device['LocalIP'], $Config['API']['UserName'], $Config['API']['Password']);
+    $Routerboard->Write('/interface/wireless/registration-table/getall', false);
+    $Routerboard->Write('=.proplist=signal-strength,mac-address,rx-rate,tx-rate', false);
+    $Routerboard->Write('=stats=');
+    $Read = $Routerboard->Read(false);
+    $Array = $Routerboard->ParseResponse($Read);
+    foreach($Array as $Properties)
     {
-      print_r($Properties);
       $DbResult = $System->Database->select('NetworkInterface', 'Id', 'MAC="'.$Properties['mac-address'].'"');
       if($DbResult->num_rows > 0)
@@ -52 +51 @@
         $Interface = $DbRow['Id'];
       } else $Interface = null;
+
+      $Parts = explode('@', $Properties['signal-strength']);
+      $Strength = substr($Parts[0], 0, -3); // without dBm
+      $RateRx = substr($Properties['rx-rate'], 0, -3); // without MHz
+      $RateTx = substr($Properties['tx-rate'], 0, -3); // without MHz
       $System->Database->insert('NetworkSignal', array('MAC' => $Properties['mac-address'],
-        'Value' => $Properties['signal-strength'], 'Time' => $Time, 'Interface' => $Interface));
+        'Value' => $Strength, 'RateRx' => $RateRx, 'RateTx' => $RateTx,
+        'Time' => TimeToMysqlDateTime($Time), 'Interface' => $Interface));
       /*
       $DbResult = $System->Database->select('Measure', 'Id', '`Name` = "'.$Properties['mac-address'].'"');
@@ -72 +77 @@
 }
 
-RepeatFunction(60, 'ReadWirelessRegistration');
+RepeatFunction(60 * 60, 'ReadWirelessRegistration');

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/Routerboard.php');
+include_once(dirname(__FILE__).'/RouterboardAPI.php');
 include_once(dirname(__FILE__).'/Generators/Common.php');
 

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

@@ -11 +11 @@
   var $Timeout;        // Connection attempt timeout and data read timeout
   var $Socket;             // Variable for storing socket resource
+  var $Debug;
 
   function __construct()
@@ -19 +20 @@
     $this->Port = 8728;
     $this->Timeout = 3;
+    $this->Debug = false;
   }
 
@@ -182 +184 @@
         $Response[] = $Line;
       }
-      echo($Line."\n");
+      if($this->Debug) echo($Line);
       // If we get a !done, make a note of it.
       if ($Line == "!done") $ReceivedDone = true;