Changeset 120 for system

Timestamp:

Dec 6, 2008, 11:33:29 AM (16 years ago)

Author:

george

Message:

• Opraveno: Nastavení řízení průtoku dat pro routerboard. Chyba převodu diakritiky a optimalizace rozdělením pravidel v sekci mangle do více podskupin podle podsítě a deaktivace passthrough.

File:

• system/generators/traffic_shaping_routerboard.php (modified) (4 diffs)

system/generators/traffic_shaping_routerboard.php

@@ -36 +36 @@
 
 // Root of tree and main limit
-$PacketMark = 0;
-$Commands[] = ' /queue tree add name=main-out limit-at='.$TotalMaxSpeedIn.' max-limit='.$TotalMaxSpeedIn.' parent=global-out';
-$Commands[] = ' /queue tree add name=main-in limit-at='.$TotalMaxSpeedOut.' max-limit='.$TotalMaxSpeedOut.' parent=global-out';
+$PacketMark = 1;
+$Commands[] = ' /queue tree add name=main-out limit-at='.$UsersMaxSpeedIn.' max-limit='.$UsersMaxSpeedIn.' parent=global-out';
+$Commands[] = ' /ip firewall mangle add chain=forward out-interface='.$InetInterface.' action=jump jump-target=inet-out';
+$Commands[] = ' /queue tree add name=main-in limit-at='.$UsersMaxSpeedOut.' max-limit='.$UsersMaxSpeedOut.' parent=global-out';
+$Commands[] = ' /ip firewall mangle add chain=forward in-interface='.$InetInterface.' action=jump jump-target=inet-in';
 
 // Slow free internet
 $Commands[] = ' /queue tree add name=free-out limit-at='.$FreeInetSpeed.' max-limit='.$FreeInetSpeed.' parent=main-out packet-mark='.$PacketMark;
-$Commands[] = ' /ip firewall mangle add chain=forward out-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark;
+$Commands[] = ' /ip firewall mangle add chain=inet-out out-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark;
 $PacketMark++;
 $Commands[] = ' /queue tree add name=free-in limit-at='.$FreeInetSpeed.' max-limit='.$FreeInetSpeed.' parent=main-in packet-mark='.$PacketMark;
-$Commands[] = ' /ip firewall mangle add chain=forward in-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark;
+$Commands[] = ' /ip firewall mangle add chain=inet-in in-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark;
 $PacketMark++;
+
+// Divide rules by subnet number
+foreach(array(0, 1, 2, 3, 4, 5, 7) as $Subnet)
+{
+  $Commands[] = ' /ip firewall mangle add chain=inet-out src-address=192.168.'.$Subnet.'.0/24 out-interface='.$InetInterface.' action=jump jump-target=inet-out-'.$Subnet;
+  $Commands[] = ' /ip firewall mangle add chain=inet-in dst-address=192.168.'.$Subnet.'.0/24 in-interface='.$InetInterface.' action=jump jump-target=inet-in-'.$Subnet;
+}
 
 // Process users
@@ -52 +61 @@
 while($User = $DbResult->fetch_array())
 {
-  echo('Uživatel '.$User['fullname']."\n");
-  $User['fullname'] = strtolower(strtr($User['fullname'], array('č' => 'c', 'š' => 's', 'ě' => 'e', 'ř' => 'r', 'ž' => 'z', 'ý' => 'y', 'á' => 'a', 'í' => 'i', 'é' => 'e', 'ů' => 'u', 'ú' => 'u', 'ď' => 'd', 'ť' => 't', 'ň' => 'n')));
-
-  echo('Uživatel '.$User['fullname']."\n");
+  $User['fullname'] = strtr(strtolower($User['fullname']), array(
+  'č' => 'c', 'š' => 's', 'ě' => 'e', 'ř' => 'r', 'ž' => 'z', 'ý' => 'y', 'á' => 'a', 'í' => 'i', 'é' => 'e', 'ů' => 'u', 'ú' => 'u', 'ď' => 'd', 'ť' => 't', 'ň' => 'n', 'ó' => 'o',
+  'Č' => 'c', 'Š' => 's', 'Ě' => 'e', 'Ř' => 'r', 'Ž' => 'z', 'Ý' => 'y', 'Á' => 'a', 'Í' => 'i', 'É' => 'e', 'Ů' => 'u', 'Ú' => 'u', 'Ď' => 'd', 'Ť' => 't', 'Ň' => 'n', 'Ó' => 'o',
+));
+
+  echo('Uživatel '.$User['fullname'].": ");
   $SpeedIn = round($Tarify[$User['inet_tarif_now']]['min_speed'] / $InDivider);
   $SpeedOut = round($Tarify[$User['inet_tarif_now']]['min_speed'] / $OutDivider);
@@ -74 +85 @@
   {
     $Host['name'] = strtolower($Host['name']);
-    echo('Počítač '.$Host['name']."\n");
-    $Commands[] = ' /ip firewall mangle add chain=forward src-address='.$Host['IP'].' out-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark;
+    echo($Host['name'].', ');
+    $IPParts = explode('.', $Host['IP']);
+    $Subnet = $IPParts[2];
+    $Commands[] = ' /ip firewall mangle add chain=inet-out-'.$Subnet.' src-address='.$Host['IP'].' out-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark.' passthrough=no';
     $Commands[] = ' /queue tree add name='.$Host['name'].'-out limit-at='.$HostSpeedIn.' max-limit='.$UserMaxSpeedIn.' parent='.$User['fullname'].'-out packet-mark='.$PacketMark;
     $PacketMark++;
-    $Commands[] = ' /ip firewall mangle add chain=forward dst-address='.$Host['IP'].' in-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark;
+    $Commands[] = ' /ip firewall mangle add chain=inet-in-'.$Subnet.' dst-address='.$Host['IP'].' in-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark.' passthrough=no';
     $Commands[] = ' /queue tree add name='.$Host['name'].'-in limit-at='.$HostSpeedOut.' max-limit='.$UserMaxSpeedOut.' parent='.$User['fullname'].'-in packet-mark='.$PacketMark;
     $PacketMark++;
@@ -98 +111 @@
 */
   }
+  echo("\n");
 }
 $Commands = implode(';', $Commands);