Changeset 861

Timestamp:

Oct 2, 2019, 12:15:16 AM (5 years ago)

Author:

chronos

Message:

• Modified: Optimized netwatch inport for inserting data ti database.
• Fixed: RouterOS API to work with RouterOS newer than 6.43.

Location:

trunk

Files:

• Modules/NetworkConfigRouterOS/Generators/DHCP.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php (modified) (3 diffs)
• Modules/NetworkConfigRouterOS/RouterboardAPI.php (modified) (1 diff)
• Packages/Common/Database.php (modified) (2 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/DHCP.php

@@ -28 +28 @@
         $Name = $Interface['DeviceName'];
         if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-        $Items[] = array('mac-address' => $Interface['MAC'], 'address' => $Interface['LocalIP'], 'server' => $Server, 'comment' => $Name, 'lease-time' => '24h');
+        $Items[] = array('mac-address' => $Interface['MAC'], 'address' => $Interface['LocalIP'], 'server' => $Server, 'comment' => $Name, 'lease-time' => '1d');
       }
 

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -43 +43 @@
 
     $Queries = array();
+    $QueriesInsert = array();
+    $QueriesUpdate = array();
     foreach($Interfaces as $Index => $Interface)
     {
       // Update last online time if still online
       if($Interface['NewOnline'])
-        $Queries[] = $this->Database->GetUpdate('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
+        $Queries[] = $this->Database->GetUpdate('NetworkInterface', '`Id` = '.$Interface['Id'],
           array('LastOnline' => TimeToMysqlDateTime($StartTime)));
 
@@ -53 +55 @@
       {
         // Online state changed
-        $Queries[] = 'INSERT INTO `NetworkInterfaceUpDown` (`Interface`,
-         `State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
+        $QueriesInsert[] = 'INSERT INTO `NetworkInterfaceUpDown` (`Interface`,'.
+          '`State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
           TimeToMysqlDateTime($StartTime).'", NULL)';
         // Update previous record duration in UpDown table
-        $Queries[] = 'UPDATE `NetworkInterfaceUpDown` AS `TM` SET `Duration` = TIMESTAMPDIFF(SECOND, '.
+        $QueriesUpdate[] = 'UPDATE `NetworkInterfaceUpDown` AS `TM` SET `Duration` = TIMESTAMPDIFF(SECOND, '.
           '`TM`.`Time`, (SELECT `Time` FROM (SELECT * FROM `NetworkInterfaceUpDown`) AS `TA` WHERE (`TA`.`Time` > `TM`.`Time`) '.
           'AND (`TA`.`Interface`=`TM`.`Interface`) ORDER BY `TA`.`Time` ASC LIMIT 1)) '.
@@ -65 +67 @@
       }
     }
+    echo("transakce insert\n");
+    $this->Database->Transaction($QueriesInsert);
+    echo("done\n");
     echo("transakce\n");
     $this->Database->Transaction($Queries);
+    echo("done\n");
+    echo("transakce\n");
+    $this->Database->Transaction($QueriesUpdate);
     echo("done\n");
 

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

@@ -54 +54 @@
     {
       socket_set_timeout($this->Socket, $this->Timeout);
-      $this->Write('/login');
+      $this->Write('/login', false);
+      $this->Write('=name=' . $Login, false);
+      $this->Write('=password='.$Password);
       $Response = $this->Read(false);
-      if ((count($Response) > 1) and ($Response[0] == '!done')) {
-        if (preg_match_all('/[^=]+/i', $Response[1], $Matches)) {
-          if ($Matches[0][0] == 'ret' && strlen($Matches[0][1]) == 32) {
-            $this->Write('/login', false);
-            $this->Write('=name=' . $Login, false);
-            $this->Write('=response=00'.md5(chr(0).$Password.pack('H*', $Matches[0][1])));
-            $Response = $this->Read(false);
-            if((count($Response) > 0) and ($Response[0] == '!done')) $this->Connected = true;
-          }
-        }
-      }
+      if((count($Response) > 0) and ($Response[0] == '!done')) $this->Connected = true;
       if(!$this->Connected) fclose($this->Socket);
     }

trunk/Packages/Common/Database.php

@@ -96 +96 @@
     //echo('a'.$this->ShowSQLQuery.'<'.$QueryStartTime.', '.microtime_float());
     if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
-      $Duration = ' ; '.round(microtime_float() - $QueryStartTime, 4). ' s';
-    if($this->LogSQLQuery == true)
+    {
+      $Time = round(microtime_float() - $QueryStartTime, 4);
+      $Duration = ' ; '.$Time. ' s';
+    } 
+    if(($this->LogSQLQuery == true) and ($Time != 0))
       file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
     if($this->ShowSQLQuery == true)
@@ -222 +225 @@
   public function Transaction($Queries)
   {
-      $this->PDO->beginTransaction();
-      foreach ($Queries as $Query)
-      {
-        $Statement = $this->PDO->prepare($Query);
-        $Statement->execute();
-      }          
-      $this->PDO->commit();
+    //echo('|'."\n");
+    $this->PDO->beginTransaction();
+    foreach ($Queries as $Query)
+    {
+      //echo('|'.$Query."\n");
+      $Statement = $this->PDO->prepare($Query);
+      $Statement->execute();
+    }
+    $this->PDO->commit();
   }
 }