Changeset 276 for trunk/system

Timestamp:

Jan 24, 2010, 9:21:28 AM (15 years ago)

Author:

george

Message:

• Opraveno: Výpočet IP rozsahu u generování nastavení sítě.

Location:

trunk/system/generators

Files:

• firewall_nat.php (modified) (4 diffs)
• netwatch_import.php (modified) (2 diffs)

trunk/system/generators/firewall_nat.php

@@ -4 +4 @@
 include('../../global.php');
 include('../routerboard.php');
+include('common.php');
 $Path = array('ip', 'firewall', 'nat');
 
@@ -40 +41 @@
     $NewAddress->Prefix = $Subnet['ExtMask'];
     $Range = $NewAddress->GetRange();
-    if($Subnet['ExtMask'] != 32) $Range = $Range['From'].'-'.$Range['To'];
-      else $Range = $Range['From'];
+    if($Subnet['ExtMask'] != 32) $Range = $Range['From']->AddressToStrin().'-'.$Range['To']->AddressToString();
+      else $Range = $Range['From']->AddressToString();
     if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
       else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
@@ -50 +51 @@
     $NewAddress->Prefix = $Subnet['Mask'];
     $Range = $NewAddress->GetRange();
-    if($Subnet['Mask'] != 32) $Range = $Range['From'].'-'.$Range['To'];
-      else $Range = $Range['From'];
+    if($Subnet['Mask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
+      else $Range = $Range['From']->AddressToString();
     if($Subnet['ExtMask'] == 32) $Dest = $Subnet['ExtAddressRange'];
       else $Dest = $Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'];
@@ -65 +66 @@
 $Items[] = array('chain' => 'dstnat', 'dst-address' => '212.111.4.174', 'protocol' => 'udp', 'dst-port' => 53, 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 53, 'comment' => 'DNS_redirection_UDP');
 
+//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'), $Items);
 

trunk/system/generators/netwatch_import.php

@@ -4 +4 @@
 include('../../global.php');
 include('../routerboard.php');
+include('common.php');
 $Path = array('tool', 'netwatch');
 
@@ -17 +18 @@
   foreach($List as $Properties)
   {
-    $NewAddress = new NetworkAddressIPv4();
-    $NewAddress->AddressFromString($Subnet['AddressRange']);
-    $NewAddress->Prefix = $Subnet['Mask'];
-    if($NewAddress->Contain($Properties['host']))
+    $SubnetAddress = new NetworkAddressIPv4();
+    $SubnetAddress->AddressFromString($Subnet['AddressRange']);
+    $SubnetAddress->Prefix = $Subnet['Mask'];
+    $Address = new NetworkAddressIPv4();
+    $Address->AddressFromString($Properties['host']);
+    $Address->Prefix = 32;
+    if($SubnetAddress->Contain($Address))
     {
       //echo($Properties['host'].', ');