Changeset 247 for trunk

Timestamp:

Sep 2, 2009, 12:39:06 PM (15 years ago)

Author:

george

Message:

• Opraveno: Skript pro import online stavu IP adres routeboard netwatch.
• Upraveno: Funkce pro přepočet CIDR podsítí na rozsah adres.
• Přidáno: Funkce pro kontrolu platnosti zadané IP adresy v IP rozashu.

Location:

trunk

Files:

• global.php (modified) (1 diff)
• system/generators/log (added)
• system/generators/netwatch_import.php (added)
• system/generators/routerboard.php (deleted)
• system/netwatch_import.php (deleted)
• system/queues_import.php (deleted)
• system/traffic-flow.php (deleted)

trunk/global.php

@@ -351 +351 @@
 }
 
+function IPv4ToInt32($IP)
+{
+  $Parts = explode('.', $IP);
+  return(($Parts[0] << 24) | ($Parts[1] << 16) | ($Parts[2] << 8) | $Parts[3]);
+}
+
+function Int32ToIPv4($Value)
+{
+  return(implode('.', array(($Value >> 24) & 255, ($Value >> 16) & 255, ($Value >> 8) & 255, ($Value & 255))));
+}
+
 function CIDRToAddressRange($Subnet, $Mask)
 {
-  $SubnetParts = explode('.', $Subnet);
-  $SubnetBinary = ($SubnetParts[0] << 24) | ($SubnetParts[1] << 16) | ($SubnetParts[2] << 8) | $SubnetParts[3];
-  $SubnetTopBinary = $SubnetBinary + (1 << (32 - $Mask)) - 1; 
-  $SubnetTopParts = array(($SubnetTopBinary >> 24) & 255, ($SubnetTopBinary >> 16) & 255, ($SubnetTopBinary >> 8) & 255, ($SubnetTopBinary & 255));
-  $SubnetTop = implode('.', $SubnetTopParts);
-  return(array('From' => $Subnet, 'To' => $SubnetTop));
+  $SubnetBinary = IPv4ToInt32($Subnet);
+  $Hostmask = (1 << (32 - $Mask)) - 1;
+  $Netmask = 0xffffffff ^ $Hostmask;
+  $From = $SubnetBinary & $Netmask;
+  $To = $From + $Hostmask; 
+  return(array('From' => Int32ToIPv4($From), 'To' => Int32ToIPv4($To)));
+}
+
+function IsAddressInSubnet($Address, $Subnet, $Mask)
+{
+  $AddressBinary = IPv4ToInt32($Address);
+  $SubnetBinary = IPv4ToInt32($Subnet);
+  $Netmask = 0xffffffff ^ ((1 << (32 - $Mask)) - 1);
+  if(($AddressBinary & $Netmask) == ($SubnetBinary & $Netmask)) return(true);
+    else return(false);
 }