Changeset 870 for trunk/Packages/Common

Timestamp:

Apr 3, 2020, 12:30:49 AM (5 years ago)

Author:

chronos

Message:

• Added: IPv6 mangle firewall configuration.

Location:

trunk/Packages/Common

Files:

• BigInt.php (added)
• Common.php (modified) (1 diff)
• Int128.php (added)
• NetworkAddress.php (modified) (8 diffs)

trunk/Packages/Common/Common.php

@@ -21 +21 @@
 include_once(dirname(__FILE__).'/Process.php');
 include_once(dirname(__FILE__).'/Generics.php');
+include_once(dirname(__FILE__).'/BigInt.php');
+include_once(dirname(__FILE__).'/Int128.php');
 
 class PackageCommon

trunk/Packages/Common/NetworkAddress.php

@@ -1 +1 @@
 <?php
+
+define('IPV4_BIT_WIDTH', 32);
 
 class NetworkAddressIPv4
@@ -14 +16 @@
   function GetNetMask()
   {
-    return(0xffffffff ^ ((1 << (32 - $this->Prefix)) - 1));
+    return(((1 << IPV4_BIT_WIDTH) - 1) ^ ((1 << (IPV4_BIT_WIDTH - $this->Prefix)) - 1));
   }
 
@@ -32 +34 @@
     $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));
   }
@@ -43 +45 @@
   {
     $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();
@@ -53 +55 @@
     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
@@ -69 +72 @@
   }
 
+  function GetNetMask()
+  {
+    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()
   {
@@ -77 +86 @@
   {
     $this->Address = inet_pton($Value);
+  }
+
+  function ChangePrefix($NewPrefix)
+  {
+    $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());
   }
 
@@ -107 +124 @@
   }
 
+  function Contain($Address)
+  {
+    $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);
+  }
 }