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

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.

File:

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

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');