Changeset 254 for trunk

Timestamp:

Oct 3, 2009, 12:01:57 AM (15 years ago)

Author:

george

Message:

• Opraveno: Generování pravidel NATu pro rozdílovou aktualizaci.

File:

• trunk/system/generators/nat_routerboard.php (modified) (1 diff)

trunk/system/generators/nat_routerboard.php

@@ -37 +37 @@
     echo($Subnet['Name'].'('.$Subnet['AddressRange'].'/'.$Subnet['Mask'].'), ');
     $Range = CIDRToAddressRange($Subnet['ExtAddressRange'], $Subnet['ExtMask']);
-    $Range = $Range['From'].'-'.$Range['To'];
-    $Items[] = array('chain' => 'srcnat', 'src-address' => $Subnet['AddressRange'].'/'.$Subnet['Mask'], 'out-interface' => $InetInterface, 'action' => 'src-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name']);
+    if($Subnet['ExtMask'] != 32) $Range = $Range['From'].'-'.$Range['To'];
+      else $Range = $Range['From'];
+    if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
+      else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
+    $Items[] = array('chain' => 'srcnat', 'src-address' => $Src, 'out-interface' => $InetInterface, 'action' => 'src-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name']);
+    
     $Range = CIDRToAddressRange($Subnet['AddressRange'], $Subnet['Mask']);
-    $Range = $Range['From'].'-'.$Range['To'];
-    $Items[] = array('chain' => 'dstnat', 'dst-address' => $Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'], 'in-interface' => $InetInterface, 'action' => 'dst-nat',  'to-addresses' => $Range, 'comment' => $Subnet['Name']);
+    if($Subnet['Mask'] != 32) $Range = $Range['From'].'-'.$Range['To'];
+      else $Range = $Range['From'];
+    if($Subnet['ExtMask'] == 32) $Dest = $Subnet['ExtAddressRange'];
+      else $Dest = $Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'];
+    $Items[] = array('chain' => 'dstnat', 'dst-address' => $Dest, 'in-interface' => $InetInterface, 'action' => 'dst-nat',  'to-addresses' => $Range, 'comment' => $Subnet['Name']);
   }
   echo("\n");