Changeset 188 for trunk

Timestamp:

Apr 5, 2009, 5:06:25 PM (16 years ago)

Author:

george

Message:

• Opraveno: Generování nastavení routerů.

Location:

trunk/system/generators

Files:

• nat_routerboard.php (modified) (2 diffs)
• netwatch.php (modified) (1 diff)
• traffic_shaping_routerboard.php (modified) (2 diffs)

trunk/system/generators/nat_routerboard.php

@@ -30 +30 @@
     $Range = CIDRToAddressRange($Subnet['ExtAddressRange'], $Subnet['ExtMask']);
     $Range = $Range['From'].'-'.$Range['To'];
-    $Commands[] = ' /ip firewall nat add chain=srcnat src-address-list='.$Subnet['AddressRange'].'/'.$Subnet['Mask'].' out-interface='.$InetInterface.' action=src-nat to-addresses='.$Range.' comment="'.$Subnet['Name'].'"';
+    $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'].'"';
     $Range = CIDRToAddressRange($Subnet['AddressRange'], $Subnet['Mask']);
     $Range = $Range['From'].'-'.$Range['To'];
-    $Commands[] = ' /ip firewall nat add chain=dstnat dst-address-list='.$Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'].' in-interface='.$InetInterface.' action=dst-nat to-addresses='.$Range.' comment="'.$Subnet['Name'].'"';
+    $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'].'"';
   }
   echo("\n");
@@ -47 +47 @@
 $Command = '/usr/bin/ssh -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Config['MainRouter']['HostName'].' "'.$Commands.'"';
 $Output = array();
-echo($Command."\n");
+//echo($Command."\n");
 exec($Command, $Output);
 //array_pop($Output);

trunk/system/generators/netwatch.php

@@ -14 +14 @@
     $I = explode('.', $Subnet['AddressRange']);
     $I = $I[2];
-    $DbResult2 = $Database->query('SELECT * FROM hosts WHERE (IP LIKE "192.168.'.$I.'.%") AND (MAC != "00:00:00:00:00:00") ORDER BY IP');
+    $DbResult2 = $Database->query('SELECT * FROM hosts WHERE (IP LIKE "192.168.'.$I.'.%") ORDER BY IP');
     while($Host = $DbResult2->fetch_assoc())
     {

trunk/system/generators/traffic_shaping_routerboard.php

@@ -44 +44 @@
 while($Subnet = $DbResult->fetch_assoc())
 {
-  $Commands[] = ' /ip firewall mangle add chain=inet-out src-address='.$Subnet['AddressRange'].'/'.$Subnet['Mask'].' out-interface='.$InetInterface.' action=jump jump-target=inet-out-'.$Subnet['Id'];
-  $Commands[] = ' /ip firewall mangle add chain=inet-in dst-address='.$Subnet['AddressRange'].'/'.$Subnet['Mask'].' in-interface='.$InetInterface.' action=jump jump-target=inet-in-'.$Subnet['Id'];
+  $SubnetParts = explode('.', $Subnet['AddressRange']);
+  $SubnetNumber = $SubnetParts[2];
+  $Commands[] = ' /ip firewall mangle add chain=inet-out src-address='.$Subnet['AddressRange'].'/'.$Subnet['Mask'].' out-interface='.$InetInterface.' action=jump jump-target=inet-out-'.$SubnetNumber;
+  $Commands[] = ' /ip firewall mangle add chain=inet-in dst-address='.$Subnet['AddressRange'].'/'.$Subnet['Mask'].' in-interface='.$InetInterface.' action=jump jump-target=inet-in-'.$SubnetNumber;
 }
 
@@ -73 +75 @@
   $Commands[] = ' /queue tree add name='.$Member['Name'].'-in limit-at='.$SpeedOut.' max-limit='.$UserMaxSpeedOut.' parent=main-in queue=wireless-default';
 
-  $DbResult2 = $Database->select('hosts', 'COUNT(*)', '(block = 0) AND (MAC != "") AND (user = '.$Member['Id'].')');
+  $DbResult2 = $Database->select('hosts', 'COUNT(*)', '(block = 0) AND (MAC != "")');
   $Row = $DbResult2->fetch_array();
   $HostCount = $Row[0];