Changeset 267 for trunk/system/generators/common.php

Timestamp:

Dec 21, 2009, 10:48:41 AM (15 years ago)

Author:

george

Message:

• Upraveno: Nově přepracován systém generování značkovacích pravidel mangle firewallu. Pro snížení počtu pravidel procházených při značkování packetu, jsou adresy rozdělovány do podskupin. Díky tomu je snížen rozptyl mezi nejmenším a nejvyšším početem procházených pravidel.
• Upraveno: Přepracovány funkce pro práci s IP adresami typu IPv4. Přehledněji zpracováno jako třída.
• Přidáno: Tabulka v databázi pro persistentní přiřazení Id čísla podsítě pro generování pravidel mangle firewallu.

File:

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

trunk/system/generators/common.php

@@ -1 +1 @@
 <?php
+
+include_once('../../network_address.php');
 
 function GetMarkByComment($Comment)
@@ -17 +19 @@
 }
 
+function GetSubgroupByRange($AddressRange)
+{
+  global $Database;
+  
+  $DbResult = $Database->query('SELECT `Id` FROM `NetworkMangleSubgroup` WHERE `AddressRange`="'.$AddressRange.'"');
+  if($DbResult->num_rows > 0)
+  {
+    $DbRow = $DbResult->fetch_assoc();
+    return($DbRow['Id']);
+  } else
+  {
+    $DbResult = $Database->query('INSERT INTO `NetworkMangleSubgroup` (`AddressRange`) VALUES ("'.$AddressRange.'")');
+    return($Database->insert_id);
+  } 
+}
+
+function InsertToAddressTree(&$Tree, $Address, $Name, $InterSubnets = false)
+{
+  global $Config;
+  
+  $Found = false;
+  foreach($Tree['Items'] as $Index => $Node)
+  {
+    if($Node['Address']->Contain($Address))
+    {
+      InsertToAddressTree($Tree['Items'][$Index], $Address, $Name, true);
+      $Found = true;
+    }
+  }
+  if($Found == false)
+  {
+    if($InterSubnets and ($Tree['Address']->Prefix < $Config['MainRouter']['MangleRuleSubgroupMinPrefix']) and 
+    ($Address->Prefix > ($Tree['Address']->Prefix + 1)))
+    {
+      $NewAddress = new NetworkAddressIPv4();
+      $NewAddress->Address = $Address->Address;
+      $NewAddress->ChangePrefix($Tree['Address']->Prefix + 1);
+      //echo('InsertToTree('.$NewAddress->AddressToString().'/'.$NewAddress->Prefix.')'."\n");
+      $Tree['Items'][] = array('Address' => $NewAddress, 'Name' => $Name, 'Items' => array());
+      InsertToAddressTree($Tree['Items'][count($Tree['Items']) - 1], $Address, $Name, true);
+    } else
+    {
+      
+      $NewNode = array('Address' => $Address, 'Name' => $Name, 'Items' => array());
+      
+      // Should be existed items placed under new node?
+      $Found = false;
+      foreach($Tree['Items'] as $Index => $Node)
+      {
+        if(($Node['Address']->Address == $NewNode['Address']->Address) and 
+        ($Node['Address']->Prefix == $NewNode['Address']->Prefix)) $Found = true;        
+        
+        //echo($Index.',');
+        if($Address->Contain($Node['Address']))
+        {
+          $NewNode['Items'][] = $Node;
+          unset($Tree['Items'][$Index]);
+        }
+      }
+      if($Found == false) $Tree['Items'][] = $NewNode;      
+    }
+  }
+}
+
+function ShowSubnetNode($Node, $Indent = 0)
+{
+  echo(str_repeat('  ', $Indent).$Node['Address']->AddressToString().'/'.$Node['Address']->Prefix.' '.$Node['Name']."\n");
+  foreach($Node['Items'] as $Index => $Item)
+  {
+    ShowSubnetNode($Item, $Indent + 1);
+  }  
+}
+
+/*
+function Test()
+{
+  $SubnetTree = array('Address' => new NetworkAddressIPv4(), 'Items' => array());
+
+  $NewAddress = new NetworkAddressIPv4();
+  $NewAddress->AddressFromString('10.145.64.0');
+  $NewAddress->Prefix = 24;
+  InsertToAddressTree($SubnetTree, $NewAddress);
+  $NewAddress = new NetworkAddressIPv4();
+  $NewAddress->AddressFromString('10.145.64.0');
+  $NewAddress->Prefix = 29;
+  InsertToAddressTree($SubnetTree, $NewAddress);
+  $NewAddress = new NetworkAddressIPv4();
+  $NewAddress->AddressFromString('10.145.65.0');
+  $NewAddress->Prefix = 24;
+  InsertToAddressTree($SubnetTree, $NewAddress);
+  $NewAddress = new NetworkAddressIPv4();
+  $NewAddress->AddressFromString('10.145.65.156');
+  $NewAddress->Prefix = 32;
+  InsertToAddressTree($SubnetTree, $NewAddress);
+  $NewAddress = new NetworkAddressIPv4();
+  $NewAddress->AddressFromString('10.145.64.0');
+  $NewAddress->Prefix = 20;
+  InsertToAddressTree($SubnetTree, $NewAddress);
+
+
+  ShowSubnetNode($SubnetTree);
+  die();
+}
+*/
+
 ?>