Changeset 288 for trunk

Timestamp:

Sep 9, 2010, 7:29:41 PM (14 years ago)

Author:

george

Message:

• Upraveno: Doplněno generování DNS pro další podsítě. * Opraveno: Generování firewall mangle pravidel pro podsítě domácností. * Přidáno: Generování pravidel pro NAT NTP serveru.

Location:

trunk/system/generators

Files:

• common.php (modified) (2 diffs)
• dns.php (modified) (1 diff)
• firewall_mangle.php (modified) (2 diffs)
• firewall_nat.php (modified) (2 diffs)

trunk/system/generators/common.php

@@ -35 +35 @@
 }
 
-function InsertToAddressTree(&$Tree, $Address, $Name, $InterSubnets = false)
+function InsertToAddressTree(&$Tree, $Address, $Name, $InterSubnets = false, $ForceMark = false)
 {
   global $Config;
@@ -57 +57 @@
       $NewAddress->ChangePrefix($Tree['Address']->Prefix + 1);
       //echo('InsertToTree('.$NewAddress->AddressToString().'/'.$NewAddress->Prefix.')'."\n");
-      $Tree['Items'][] = array('Address' => $NewAddress, 'Name' => $Name, 'Items' => array());
+      $Tree['Items'][] = array('Address' => $NewAddress, 'Name' => $Name, 'Items' => array(), 'ForceMark' => false);
       InsertToAddressTree($Tree['Items'][count($Tree['Items']) - 1], $Address, $Name, true);
     } else
     {
       
-      $NewNode = array('Address' => $Address, 'Name' => $Name, 'Items' => array());
+      $NewNode = array('Address' => $Address, 'Name' => $Name, 'Items' => array(), 'ForceMark' => $ForceMark);
       
       // Should be existed items placed under new node?

trunk/system/generators/dns.php

@@ -114 +114 @@
   'Host' => array(),
   'Alias' => array(),
-  'Network' => array('10.145.64', '10.145.65', '10.145.66', '10.145.67', '77.92.221'),
+  'Network' => array('10.145.64', '10.145.65', '10.145.66', '10.145.67', '10.145.68', '10.145.69', '10.145.70', '10.145.71', '77.92.221', '172.16.0', '172.16.1'),
 );
 

trunk/system/generators/firewall_mangle.php

@@ -64 +64 @@
     $NewAddress->AddressFromString($Subnet['AddressRange']);
     $NewAddress->Prefix = $Subnet['Mask'];
-    InsertToAddressTree($AddressTree, $NewAddress, $Subnet['Name']);
+    if($Subnet['Member'] != 0) $ForceMark = true;
+      else $ForceMark = false;
+    echo($ForceMark.', ');
+    InsertToAddressTree($AddressTree, $NewAddress, $Subnet['Name'], false, $ForceMark);
   }
   echo("\n");
@@ -77 +80 @@
   foreach($Node['Items'] as $Index => $Item)
   {
-    if(count($Item['Items']) == 0)
+    if((count($Item['Items']) == 0) or ($Item['ForceMark'] == true))
     {
       // Hosts

trunk/system/generators/firewall_nat.php

@@ -15 +15 @@
 
 $Items = array();
+// NTP redirect
+$Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.1', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_4');
+$Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.161', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_5');
+$Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.193', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_1');
+$Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.225', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_2');
+$Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.250', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_3');
+$Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.253', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_6');
+
 // Chain for inet interface
 $Items[] = array('chain' => 'srcnat', 'out-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-out', 'comment' => 'inet-out');
@@ -75 +83 @@
 
 //print_r($Items);
-$Routerboard->ListUpdate($Path, array('chain', 'dst-address', 'in-interface', 'src-address', 'out-interface', 'to-ports', 'dst-port', 'protocol', 'action', 'to-addresses', 'comment', 'jump-target'), $Items);
+$Routerboard->ListUpdate($Path, array('chain', 'dst-address', 'in-interface', 'src-address', 'out-interface', 'to-ports', 'dst-port', 'protocol', 'action', 'to-addresses', 'comment', 'jump-target', 'src-port'), $Items);
 
 ?>