Changeset 275 for trunk/system

Timestamp:

Jan 24, 2010, 8:05:10 AM (15 years ago)

Author:

george

Message:

• Upraveno: Nově rozšířená tabulka dokladových řad pro podporu oddělených účetních roků.
• Opraveno: Nové volání funkcí pro IPv4 ze skriptů generování nastavení sítě.

Location:

trunk/system/generators

Files:

• firewall_nat.php (modified) (2 diffs)
• netwatch_import.php (modified) (1 diff)

trunk/system/generators/firewall_nat.php

@@ -33 +33 @@
   $DbResult2 = $Database->select('NetworkSubnet', '*', 'Member='.$Member['Id']);
   while($Subnet = $DbResult2->fetch_assoc())
-  {
+  {   
     $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
     echo($Subnet['Name'].'('.$Subnet['AddressRange'].'/'.$Subnet['Mask'].'), ');
-    $Range = CIDRToAddressRange($Subnet['ExtAddressRange'], $Subnet['ExtMask']);
+    $NewAddress = new NetworkAddressIPv4();
+    $NewAddress->AddressFromString($Subnet['ExtAddressRange']);
+    $NewAddress->Prefix = $Subnet['ExtMask'];
+    $Range = $NewAddress->GetRange();
     if($Subnet['ExtMask'] != 32) $Range = $Range['From'].'-'.$Range['To'];
       else $Range = $Range['From'];
@@ -43 +46 @@
     $Items[] = array('chain' => 'srcnat', 'src-address' => $Src, 'out-interface' => $InetInterface, 'action' => 'src-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name'].'-out');
     
-    $Range = CIDRToAddressRange($Subnet['AddressRange'], $Subnet['Mask']);
+    $NewAddress = new NetworkAddressIPv4();
+    $NewAddress->AddressFromString($Subnet['AddressRange']);
+    $NewAddress->Prefix = $Subnet['Mask'];
+    $Range = $NewAddress->GetRange();
     if($Subnet['Mask'] != 32) $Range = $Range['From'].'-'.$Range['To'];
       else $Range = $Range['From'];

trunk/system/generators/netwatch_import.php

@@ -17 +17 @@
   foreach($List as $Properties)
   {
-    if(IsAddressInSubnet($Properties['host'], $Subnet['AddressRange'], $Subnet['Mask']))
+    $NewAddress = new NetworkAddressIPv4();
+    $NewAddress->AddressFromString($Subnet['AddressRange']);
+    $NewAddress->Prefix = $Subnet['Mask'];
+    if($NewAddress->Contain($Properties['host']))
     {
       //echo($Properties['host'].', ');