Changeset 682 for trunk/Modules/NetworkConfigRouterOS

Timestamp:

Aug 5, 2014, 10:49:06 PM (10 years ago)

Author:

chronos

Message:

• Upraveno: Funkce RepeatFunction přesunuta do Global.php.
• Upraveno: Nezaznamenávat chyby potlačené symbolem @.
• Upraveno: Nezobrazovat HTML chyby při spuštění z konzole.
• Opraveno: Pokud není navázáno spojení s RouterboardAPI, tak nepokračuj se zasíláním povelů.
• Upraveno: NetwatchImport přepracován na načítání přes RouterboardAPI.

Location:

trunk/Modules/NetworkConfigRouterOS

Files:

• Generators/NetwatchImport.php (modified) (3 diffs)
• Generators/Signal.php (modified) (2 diffs)
• RouterboardAPI.php (modified) (2 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -7 +7 @@
 $System->Run();
 
-$Path = array('tool', 'netwatch');
-$Period = 60; // every 60 seconds
+function NetwatchImport()
+{
+  global $System, $Config;
 
-
-while(1)
-{
   $StartTime = time();
 
@@ -27 +25 @@
   {
     echo($Subnet['AddressRange'].'/'.$Subnet['Mask'].' on router '.$Subnet['DHCP']."\n");
-    $Routerboard = new Routerboard();
-    $Routerboard->UserName = $Config['MainRouter']['UserName'];
-    $Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
-    $Routerboard->HostName = $Subnet['DHCP'];
-    $List = $Routerboard->ListGetPrint($Path, array('host', 'status'));
+    $Routerboard = new RouterosAPI();
+    $Routerboard->Connect($Subnet['DHCP'], $Config['API']['UserName'], $Config['API']['Password']);
+    if(!$Routerboard->Connected) continue;
+    $Routerboard->Write('/tool/netwatch/getall', false);
+    $Routerboard->Write('=.proplist=host,status');
+    $Read = $Routerboard->Read(false);
+    $List = $Routerboard->ParseResponse($Read);
     foreach($List as $Properties)
     {
@@ -96 +96 @@
       else $System->Database->query('UPDATE `NetworkInterfaceStat` SET `PingCount` = `PingCount` + 1 WHERE (`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
   }
-
-  $EndTime = time();
-  $Delay = $Period - ($EndTime - $StartTime);
-  if($Delay < 0) $Delay = 0;
-
-  echo('Waiting '.$Delay.' seconds...'."\n");
-  sleep($Delay);
 }
 
+RepeatFunction(60, 'NetwatchImport');

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -7 +7 @@
 $System->Run();
 
-function RepeatFunction($Period, $Function)
-{
-  while(1)
-  {
-    $StartTime = time();
-    $Function();
-    $EndTime = time();
-    $Delay = $Period - ($EndTime - $StartTime);
-    if($Delay < 0) $Delay = 0;
-
-    echo('Waiting '.$Delay.' seconds...'."\n");
-    sleep($Delay);
-  }
-}
-
 function ReadWirelessRegistration()
 {
   global $System, $Config;
 
-  $Path = array('interface', 'wireless', 'registration-table');
   $Time = time();
 
@@ -40 +24 @@
     //$Routerboard->Port = 8729;
     $Routerboard->Connect($Device['LocalIP'], $Config['API']['UserName'], $Config['API']['Password']);
+    if(!$Routerboard->Connected) continue;
     $Routerboard->Write('/interface/wireless/registration-table/getall', false);
     $Routerboard->Write('=.proplist=signal-strength,mac-address,rx-rate,tx-rate', false);

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

@@ -50 +50 @@
         $IP = 'ssl://'.$IP;
     }
-
     $this->Socket = @fsockopen($IP, $this->Port, $this->ErrorNo, $this->ErrorStr, $this->Timeout);
     if($this->Socket)
@@ -146 +145 @@
   function Read($Parse = true)
   {
+    $Line = '';
     $Response = array();
     while (true) {