Changeset 240 for trunk/system/routerboard.php

Timestamp:

Aug 2, 2009, 12:19:41 PM (15 years ago)

Author:

george

Message:

• Přidáno: Podpora pro zasílání dat po menších balících pro třídu Routerboard.
• Upraveno: Generování NATu uzpůsobeno pro třídu Routerboard.

File:

• trunk/system/routerboard.php (modified) (8 diffs)

trunk/system/routerboard.php

@@ -9 +9 @@
   var $Password;
   var $PrivateKey = 'id_dsa';
+  var $MaxBurstLineCount = 100;
   
   function __construct($HostName = 'localhost', $UserName = 'admin', $Password = '')
@@ -18 +19 @@
 
   function Execute($Commands)
+  {
+    $Output = array();
+    if(is_array($Commands))
+    {
+      $I = 0;
+      $Batch = array();
+      while($I < count($Commands))
+      {
+        if(($I % $this->MaxBurstLineCount) == 0)
+        {
+          if(count($Batch) > 0)
+            $Output = array_merge($Output, $this->ExecuteBatch(implode(';', $Batch)));
+          $Batch = array();
+        }
+        $Batch[] = $Commands[$I];
+        $I++;
+      }
+      if(count($Batch) > 0)
+       $Output = array_merge($Output, $this->ExecuteBatch(implode(';', $Batch)));
+    } else 
+      $Output = array_merge($Output, $this->ExecuteBatch($Commands));
+    return($Output);
+  }
+  
+  function ExecuteBatch($Commands)
   {    
-    if(is_array($Commands)) $Commands = implode(';', $Commands);
     $Commands = trim($Commands);
     if($Commands != '')
@@ -27 +52 @@
       $Commands = str_replace('$', '\$', $Commands);
       $Command = $this->SSHPath.' -o ConnectTimeout='.$this->Timeout.' -l '.$this->UserName.' -i '.$this->PrivateKey.' '.$this->HostName.' "'.$Commands.'"';
-      //echo($Command);
+      echo($Command);
       exec($Command, $Output);
     } else $Output = '';
-    //print_r($Output);
+    print_r($Output);
     return($Output);
   }
@@ -76 +101 @@
       {
         $Value = explode('=', $ResultLinePart);
-        $ListItem[$Properties[$Value[0]]] = $Value[1];
+        if(count($Value) > 1) $ListItem[$Properties[$Value[0]]] = $Value[1];
+          else $ListItem[$Properties[$Value[0]]] = '';
       }
       $List[] = $ListItem;
@@ -91 +117 @@
   {
     $List = $this->ListGet($Path, $Properties, $Condition);
-    //print_r($List);
-    //print_r($Values);
     $Commands = array();
+    
+    // Add empty properties to values
+    foreach($Values as $Index => $Item)
+    {
+      foreach($Properties as $Property)
+      {
+        if(!array_key_exists($Property, $Item))
+           $Item[$Property] = '';
+      }
+      $Values[$Index] = $Item;      
+    }
+    
+    print_r($List);
+    print_r($Values);
     
     // Erase all items not existed in $Values
@@ -103 +141 @@
         foreach($ListItem as $Index => $Property)
         {
-          $Prop .= $Index.'="'.$Property.'" ';
+          if($Property != '') $Prop .= $Index.'="'.$Property.'" ';
         }
         $Prop = substr($Prop, 0, -1);
@@ -118 +156 @@
         foreach($ListItem as $Index => $Property)
         {
-          $Prop .= $Index.'='.$Property.' ';
+          if($Property != '') $Prop .= $Index.'="'.$Property.'" ';
         }
         $Prop = substr($Prop, 0, -1);
@@ -124 +162 @@
       }
     }
-    //print_r($Commands);
+    print_r($Commands);
     return($this->Execute($Commands));    
   }