Changeset 95 for trunk/Packages/Common/NetworkAddress.php

Timestamp:

Dec 6, 2021, 11:33:48 AM (2 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Added: Explicit types for better type checking.
• Fixed: Support for php 8.0.

File:

• trunk/Packages/Common/NetworkAddress.php (modified) (6 diffs)

trunk/Packages/Common/NetworkAddress.php

@@ -1 +1 @@
 <?php
+
+define('IPV4_BIT_WIDTH', 32);
 
 class NetworkAddressIPv4
 {
-  var $Address;
-  var $Prefix;
+  public int $Address;
+  public int $Prefix;
 
   function __construct()
@@ -12 +14 @@
   }
 
-  function GetNetMask()
+  function GetNetMask(): int
   {
-    return 0xffffffff ^ ((1 << (32 - $this->Prefix)) - 1);
+    return ((1 << IPV4_BIT_WIDTH) - 1) ^ ((1 << (IPV4_BIT_WIDTH - $this->Prefix)) - 1);
   }
 
-  function AddressToString()
+  function AddressToString(): string
   {
     return implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255)));
   }
 
-  function AddressFromString($Value)
+  function AddressFromString(string $Value): void
   {
     $Parts = explode('.', $Value);
@@ -28 +30 @@
   }
 
-  function GetRange()
+  function GetRange(): array
   {
     $From = new NetworkAddressIPv4();
     $From->Address = $this->Address;
-    $From->Prefix = 32;
+    $From->Prefix = IPV4_BIT_WIDTH;
     $HostMask = 0xffffffff ^ $this->GetNetMask();
     $To = new NetworkAddressIPv4();
     $To->Address = $From->Address + $HostMask;
-    $To->Prefix = 32;
+    $To->Prefix = IPV4_BIT_WIDTH;
     return array('From' => $From, 'To' => $To);
   }
 
-  function ChangePrefix($NewPrefix)
+  function ChangePrefix(int $NewPrefix): void
   {
     $this->Prefix = $NewPrefix;
-    if ($this->Prefix > 32) $this->Prefix = 32;
+    if ($this->Prefix > IPV4_BIT_WIDTH) $this->Prefix = IPV4_BIT_WIDTH;
     if ($this->Prefix < 0) $this->Prefix = 0;
     $this->Address = $this->Address & $this->GetNetMask();
   }
 
-  function Contain($Address)
+  function Contain(NetworkAddressIPv4 $Address): bool
   {
     $UpperNetmask = $this->GetNetMask();
     if (($this->Prefix < $Address->Prefix) and (($Address->Address & $UpperNetmask) == ($this->Address & $UpperNetmask))) $Result = true;
       else $Result = false;
-    //echo($Address->AddressToString().'/'.$Address->Prefix.' in '.$this->AddressToString().'/'.$this->Prefix.' '.$Result."\n");
     return $Result;
   }
 }
 
+define('IPV6_BIT_WIDTH', 128);
+
 class NetworkAddressIPv6
 {
-  var $Address;
-  var $Prefix;
+  public string $Address;
+  public int $Prefix;
 
   function __construct()
@@ -69 +72 @@
   }
 
-  function AddressToString()
+  function GetNetMask(): string
+  {
+    return Int128Xor(Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH)), IntToInt128(1)),
+      Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH - $this->Prefix)), IntToInt128(1)));
+  }
+
+  function AddressToString(): string
   {
     return inet_ntop($this->Address);
   }
 
-  function AddressFromString($Value)
+  function AddressFromString(string $Value)
   {
     $this->Address = inet_pton($Value);
   }
 
-  function GetOctets()
+  function ChangePrefix(int $NewPrefix): void
+  {
+    $this->Prefix = $NewPrefix;
+    if ($this->Prefix > IPV6_BIT_WIDTH) $this->Prefix = IPV6_BIT_WIDTH;
+    if ($this->Prefix < 0) $this->Prefix = 0;
+    $this->Address = Int128And($this->Address, $this->GetNetMask());
+  }
+
+  function GetOctets(): array
   {
     $Result = array();
@@ -92 +109 @@
   }
 
-  function EncodeMAC($MAC)
+  function EncodeMAC(string $MAC): void
   {
     $MAC = explode(':', $MAC);
@@ -107 +124 @@
   }
 
+  function Contain(NetworkAddressIPv6 $Address): bool
+  {
+    $UpperNetmask = $this->GetNetMask();
+    if (($this->Prefix < $Address->Prefix) and ((Int128Equal(Int128And($Address->Address, $UpperNetmask), Int128And($this->Address, $UpperNetmask))))) $Result = true;
+      else $Result = false;
+    return $Result;
+  }
 }