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

Timestamp:

May 6, 2009, 8:21:23 AM (16 years ago)

Author:

george

Message:

• Upraveno: Tabulka hosts rozdělena na NetworkDevice, NetworkInterface, NetworkInterfaceType a NetworkLink. Jeden počítač může mít více rozhraní. Nově se již nepočítá pouze s stromovou topologií, ale s celkovou sítí s okruhy. Sloupce Parent byl proto nahrazen tabulkou NetworkLink, ve které jsou uchovány informace o tom, co kam je připojeno. Každé rozhraní má definovaný typ dle NetworkInterfaceType.
• Upraveno: Tabulka HostType přejmenována na NetworkDeviceType.
• Smazáno: Původní složka komunikačního programu sunrisechat. Nově nahrazena složkou chat pro podporu IRC.

File:

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

trunk/system/generators/traffic_shaping_routerboard.php

@@ -62 +62 @@
 $Index = 0;
 $DbResult = $Database->query('SELECT Member.*, Subject.Name FROM Member LEFT JOIN Subject ON Subject.Id = Member.Subject');
-while($Member = $DbResult->fetch_array())
+while($Member = $DbResult->fetch_assoc())
 {
   $Member['Name'] = RouterOSIdent($Member['Name']);
@@ -88 +88 @@
   }
 
-  $DbResult2 = $Database->select('hosts', '*', '(block=0) AND (MAC != "") AND (user='.$Member['Id'].')');
-  while($Host = $DbResult2->fetch_array())
+  $DbResult2 = $Database->select('NetworkDevice', '*', 'Member = '.$Member['Id']);
+  while($Device = $DbResult2->fetch_assoc())
   {
-    $Host['name'] = RouterOSIdent($Host['name']);
-    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 comment="'.$Host['name'].'"';
-    $Commands[] = ' /queue tree add name='.$Host['name'].'-out limit-at='.$HostSpeedIn.' max-limit='.$UserMaxSpeedIn.' parent='.$Member['Name'].'-out packet-mark='.$PacketMark.' queue=wireless-default';
-    $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 comment="'.$Host['name'].'"';
-    $Commands[] = ' /queue tree add name='.$Host['name'].'-in limit-at='.$HostSpeedOut.' max-limit='.$UserMaxSpeedOut.' parent='.$Member['Name'].'-in packet-mark='.$PacketMark.' queue=wireless-default';
-    $PacketMark++;
+    $DbResult3 = $Database->select('NetworkInterface', '*', 'Device = '.$Device['Id']);
+    while($Interface = $DbResult3->fetch_assoc())
+    {
+      $Name = $Device['Name'].'-'.$Interface['Name'];
+      $Name = RouterOSIdent($Name);
+      echo($Name.', ');
+      $IPParts = explode('.', $Interface['LocalIP']);
+      $Subnet = $IPParts[2];
+      $Commands[] = ' /ip firewall mangle add chain=inet-out-'.$Subnet.' src-address='.$Interface['LocalIP'].' out-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark.' passthrough=no comment="'.$Name.'"';
+      $Commands[] = ' /queue tree add name='.$Name.'-out limit-at='.$HostSpeedIn.' max-limit='.$UserMaxSpeedIn.' parent='.$Member['Name'].'-out packet-mark='.$PacketMark.' queue=wireless-default';
+      $PacketMark++;
+      $Commands[] = ' /ip firewall mangle add chain=inet-in-'.$Subnet.' dst-address='.$Interface['LocalIP'].' in-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark.' passthrough=no comment="'.$Name.'"';
+      $Commands[] = ' /queue tree add name='.$Name.'-in limit-at='.$HostSpeedOut.' max-limit='.$UserMaxSpeedOut.' parent='.$Member['Name'].'-in packet-mark='.$PacketMark.' queue=wireless-default';
+      $PacketMark++;
 
-    // Posílej po menších částech
-    if($Index > 50)
-    {
-      //print_r($Commands);
-      $Commands = addslashes(implode(';', $Commands));
-      $Command = '/usr/bin/ssh -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Config['MainRouter']['HostName'].' "'.$Commands.'"';
-      $Output = array();
-      exec($Command, $Output);
-      print_r($Output);
-      $Commands = array();
-      $Index = 0;
+      // Posílej po menších částech
+      if($Index > 50)
+      {
+        //print_r($Commands);
+        $Commands = addslashes(implode(';', $Commands));
+        $Command = '/usr/bin/ssh -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Config['MainRouter']['HostName'].' "'.$Commands.'"';
+        $Output = array();
+        exec($Command, $Output);
+        print_r($Output);
+        $Commands = array();
+        $Index = 0;
+      }
+      $Index++;
     }
-    $Index++;
   }