Changeset 188 for trunk/system/generators/traffic_shaping_routerboard.php

Timestamp:

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

Author:

george

Message:

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

File:

• trunk/system/generators/traffic_shaping_routerboard.php (modified) (2 diffs)

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];