Changeset 334 for trunk

Timestamp:

Dec 29, 2011, 10:07:45 PM (13 years ago)

Author:

chronos

Message:

• Opraveno: Při generování značkování paketů pro řízení rychlosti se negenrovaly jednotlivé počítače uvnitř podsítě přiřazené některému členovi.

Location:

trunk/system/generators

Files:

• dhcp.php (modified) (1 diff)
• firewall_mangle.php (modified) (3 diffs)

trunk/system/generators/dhcp.php

@@ -20 +20 @@
   $DbResult2 = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM `NetworkInterface` LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE '.
   ' CompareNetworkPrefix(INET_ATON(LocalIP), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].') AND (`MAC` != "00:00:00:00:00:00") ORDER BY `LocalIP`');
-  echo($Database->error);
+  //echo($Database->error);
   while($Interface = $DbResult2->fetch_assoc())
   {

trunk/system/generators/firewall_mangle.php

@@ -20 +20 @@
 
 // Generate address tree
-$AddressTree = array('Address' => new NetworkAddressIPv4(), 'Name' => 'main', 'Items' => array());
+$AddressTree = array('Address' => new NetworkAddressIPv4(), 'Name' => 'main', 'Items' => array(), 'ForceMark' => false);
 
 // Divide rules by subnet number
@@ -80 +80 @@
   foreach($Node['Items'] as $Index => $Item)
   {
-    if((count($Item['Items']) == 0) or ($Item['ForceMark'] == true))
+    if(count($Item['Items']) == 0)
     {
       // Hosts
@@ -107 +107 @@
     }    
   }
+  if($Node['ForceMark'] == true)
+  {
+    // Mark member subnets
+    $ParentSubnetId = GetSubgroupByRange($Node['Address']->AddressToString().'/'.$Node['Address']->Prefix);
+
+    $PacketMark = GetMarkByComment($Node['Name'].'-out');
+    $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-out', 'src-address' => $Address, 'out-interface' =>  $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'passthrough' => 'no', 'comment' => $Node['Name'].'-all-out');
+    $PacketMark = GetMarkByComment($Node['Name'].'-in');
+    $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-in', 'dst-address' => $Address, 'in-interface' => $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'passthrough' => 'no', 'comment' => $Node['Name'].'-all-in');
+  }
 }