Changeset 240 for trunk

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.

Location:

trunk/system

Files:

• generators/nat_routerboard.php (modified) (4 diffs)
• routerboard.php (modified) (8 diffs)

trunk/system/generators/nat_routerboard.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once('../../global.php');
+include('../../global.php');
+include('../routerboard.php');
+$Path = array('ip', 'firewall', 'nat');
+
+$Routerboard = new Routerboard($Config['MainRouter']['HostName']);
+$Routerboard->UserName = $Config['MainRouter']['UserName'];
+$Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
 
 $InetInterface = $Config['MainRouter']['InetInterface'];
 
-$Commands = array();
-$Commands[] = '/ip firewall nat { remove [find] }';
-
+$Items = array();
 $DbResult = $Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id');
 while($Member = $DbResult->fetch_assoc())
@@ -21 +25 @@
     $Name = RouterOSIdent($Name);
     echo($Name.'('.$Interface['LocalIP'].'), ');
-    $Commands[] = ' /ip firewall nat add chain=srcnat src-address='.$Interface['LocalIP'].' out-interface='.$InetInterface.' action=src-nat to-addresses='.$Interface['ExternalIP'].' comment="'.$Name.'"';
-    $Commands[] = ' /ip firewall nat add chain=dstnat dst-address='.$Interface['ExternalIP'].' in-interface='.$InetInterface.' action=dst-nat to-addresses='.$Interface['LocalIP'].' comment="'.$Name.'"';
-
-    // Temporary old incoming public subnet range
-    $ExternalIPParts = explode('.', $Interface['ExternalIP']);
-    $ExternalIPParts[0] = 85;
-    $ExternalIPParts[1] = 92;
-    $ExternalIPParts[2] = 50;
-    $Interface['ExternalIP'] = implode('.', $ExternalIPParts);
-    $Commands[] = ' /ip firewall nat add chain=dstnat dst-address='.$Interface['ExternalIP'].' in-interface='.$InetInterface.' action=dst-nat to-addresses='.$Interface['LocalIP'].' comment="'.$Name.'"';
+    $Items[] = array('chain' => 'srcnat', 'src-address' => $Interface['LocalIP'], 'out-interface' => $InetInterface, 'action' => 'src-nat',  'to-addresses' => $Interface['ExternalIP'], 'comment' => $Name);
+    $Items[] = array('chain' => 'dstnat', 'dst-address' => $Interface['ExternalIP'], 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => $Interface['LocalIP'], 'comment' => $Name);
   }
 
@@ -41 +37 @@
     $Range = CIDRToAddressRange($Subnet['ExtAddressRange'], $Subnet['ExtMask']);
     $Range = $Range['From'].'-'.$Range['To'];
-    $Commands[] = ' /ip firewall nat add chain=srcnat src-address='.$Subnet['AddressRange'].'/'.$Subnet['Mask'].' out-interface='.$InetInterface.' action=src-nat to-addresses='.$Range.' comment="'.$Subnet['Name'].'"';
+    $Items[] = array('chain' => 'srcnat', 'src-address' => $Subnet['AddressRange'].'/'.$Subnet['Mask'], 'out-interface' => $InetInterface, 'action' => 'src-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name']);
     $Range = CIDRToAddressRange($Subnet['AddressRange'], $Subnet['Mask']);
     $Range = $Range['From'].'-'.$Range['To'];
-    $Commands[] = ' /ip firewall nat add chain=dstnat dst-address='.$Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'].' in-interface='.$InetInterface.' action=dst-nat to-addresses='.$Range.' comment="'.$Subnet['Name'].'"';
+    $Items[] = array('chain' => 'dstnat', 'dst-address' => $Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'], 'in-interface' => $InetInterface, 'action' => 'dst-nat',  'to-addresses' => $Range, 'comment' => $Subnet['Name']);
   }
   echo("\n");
@@ -50 +46 @@
 
 // Masquerade hosts without public ip
-$Commands[] = ' /ip firewall nat add chain=srcnat out-interface='.$InetInterface.' action=masquerade comment="Default NAT"';     
+$Items[] = array('chain' => 'srcnat', 'out-interface' => $InetInterface, 'action' => 'masquerade', 'comment' => 'Default_NAT');     
 // Redirect DNS port
-$Commands[] = ' /ip firewall nat add chain=dstnat dst-address=212.111.4.174 protocol=tcp dst-port=53 in-interface='.$InetInterface.' action=dst-nat to-address=192.168.0.1 to-ports=53 comment="DNS redirection UDP"';
-$Commands[] = ' /ip firewall nat add chain=dstnat dst-address=212.111.4.174 protocol=udp dst-port=53 in-interface='.$InetInterface.' action=dst-nat to-address=192.168.0.1 to-ports=53 comment="DNS redirection UDP"';
+$Items[] = array('chain' => 'dstnat', 'dst-address' => '212.111.4.174', 'protocol' => 'tcp', 'dst-port' => 53, 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => '192.168.0.1', 'to-ports' => 53, 'comment' => 'DNS_redirection_UDP');
+$Items[] = array('chain' => 'dstnat', 'dst-address' => '212.111.4.174', 'protocol' => 'udp', 'dst-port' => 53, 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => '192.168.0.1', 'to-ports' => 53, 'comment' => 'DNS_redirection_UDP');
 
-$Commands = addslashes(implode(';', $Commands));
-$Command = '/usr/bin/ssh -o ConnectTimeout=5 -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Config['MainRouter']['HostName'].' "'.$Commands.'"';
-$Output = array();
-//echo($Command."\n");
-exec($Command, $Output);
-//array_pop($Output);
-//print_r($Output);
-
-/*
-// SMTP NAT port 25
-$DbResult = $Database->select('hosts', '*', 'name="mail"');
-$Row = $DbResult->fetch_array();
-exec('/sbin/iptables -t nat -A PreroutingDNAT -p tcp -m tcp --dport 25 -d 212.111.4.174 -j DROP');
-exec('/sbin/iptables -t nat -A PreroutingDNAT -p tcp -m tcp --dport 25 -d '.$Row['external_ip'].' -j DNAT --to-destination '.$Row['IP']);
-exec('/sbin/iptables -t nat -A PreroutingDNAT -p tcp -m tcp --dport 25 -d '.$Row['external_ip'].' -j ACCEPT');
-exec('/sbin/iptables -t nat -A POSTROUTING -p tcp -m tcp --dport 25 -s 212.111.4.174 -o eth1 -j SNAT --to-source '.$Row['external_ip']);
-
-// Local network NAT
-$DbResult = $Database->select('hosts', '*', 'name="gate"');
-$Row = $DbResult->fetch_array();
-exec('/sbin/iptables -t nat -A POSTROUTING -s 192.168.0.0/255.255.0.0 -o eth1 -j SNAT --to-source '.$Row['external_ip']);
-//exec('/sbin/iptables -t nat -A POSTROUTING -s 10.0.0.0/255.0.0.0 -o eth1 -j SNAT --to-source '.$Row['external_ip']);
-//exec('/sbin/iptables -t nat -A POSTROUTING -s 212.111.16.94 -o eth1 -j MASQUERADE');
-
-exec('/sbin/iptables-save>/etc/sysconfig/iptables');
-*/
+$Routerboard->ListUpdate($Path, array('chain', 'dst-address', 'in-interface', 'src-address', 'out-interface', 'to-ports', 'dst-port', 'protocol', 'action', 'to-addresses', 'comment'), $Items);
 
 ?>

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