Changeset 698

Timestamp:

Sep 28, 2014, 10:41:47 PM (10 years ago)

Author:

chronos

Message:

• Přidáno: Generování reverzních záznamů pro IPv6 DNS.

Location:

trunk

Files:

• Common/Global.php (modified) (1 diff)
• Common/NetworkAddress.php (modified) (8 diffs)
• Modules/NetworkConfigLinux/Generators/DNS.php (modified) (8 diffs)

trunk/Common/Global.php

@@ -18 +18 @@
 include_once(dirname(__FILE__).'/Setup/Setup.php');
 include_once(dirname(__FILE__).'/PrefixMultiplier.php');
+include_once(dirname(__FILE__).'/NetworkAddress.php');
 include_once(dirname(__FILE__).'/VCL/General.php');
 include_once(dirname(__FILE__).'/VCL/Database.php');

trunk/Common/NetworkAddress.php

@@ -5 +5 @@
   var $Address;
   var $Prefix;
-  
+
   function __construct()
   {
@@ -11 +11 @@
     $this->Prefix = 0;
   }
-  
+
   function GetNetMask()
   {
@@ -21 +21 @@
     return(implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255))));
   }
-  
+
   function AddressFromString($Value)
   {
@@ -27 +27 @@
     $this->Address = ($Parts[0] << 24) | ($Parts[1] << 16) | ($Parts[2] << 8) | $Parts[3];
   }
-  
+
   function GetRange()
   {
@@ -37 +37 @@
     $To->Address = $From->Address + $HostMask;
     $To->Prefix = 32;
-    return(array('From' => $From, 'To' => $To));    
+    return(array('From' => $From, 'To' => $To));
   }
 
@@ -49 +49 @@
 
   function Contain($Address)
-  {    
+  {
     $UpperNetmask = $this->GetNetMask();
     if(($this->Prefix < $Address->Prefix) and (($Address->Address & $UpperNetmask) == ($this->Address & $UpperNetmask))) $Result = true;
@@ -62 +62 @@
         var $Address;
         var $Prefix;
-        
+
         function __construct()
         {
@@ -68 +68 @@
                 $this->Prefix = 0;
         }
-        
+
   function AddressToString()
   {
         return(inet_ntop($this->Address));
   }
-  
+
   function AddressFromString($Value)
   {
         $this->Address = inet_pton($Value);
   }
-        
+
+  function GetOctets()
+  {
+        $Result = array();
+        $Data = array_reverse(unpack('C*', $this->Address));
+        foreach($Data as $Item)
+        {
+
+                $Result[] = dechex($Item & 15);
+                $Result[] = dechex(($Item >> 4) & 15);
+        }
+        return($Result);
+  }
+
 }

trunk/Modules/NetworkConfigLinux/Generators/DNS.php

@@ -17 +17 @@
 $MinimumTime = 10800;
 $TTL = 86400;
-$BaseDir = '/home/chronos/Projekty/centrala/trunk/var/named';
+$BaseDir = '/var/named';
+//$BaseDir = '/home/chronos/Projekty/centrala/trunk/var/named';
 if(!file_exists($BaseDir)) die('Base directory "'.$BaseDir.'" not exists.');
 $MailServer = 'centrala';
@@ -68 +69 @@
       $Output .= strtolower($Host['Name'])."\tIN\tAAAA\t".$Host['IPv6']."\n";
   }
-  
+
   // Alias list
   foreach($DNS['Alias'] as $Alias)
@@ -112 +113 @@
   }
 
-  /*
-  // Generate reverse DNS IPv6 records 
+  // Generate reverse DNS IPv6 records
   foreach($DNS['IPv6Network'] as $Network)
   {
-    $Parts = explode('.', $Network);
+    $Parts = explode('/', $Network);
+    $NetworkAddress = $Parts[0];
+    $Prefix = $Parts[1];
     $Output = // '$ORIGIN '.$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa'."\n".
     '$TTL '.$DNS['TTL']."\n".
@@ -134 +136 @@
     foreach($DNS['Host'] as $Host)
     if(array_key_exists('IPv6', $Host) and ($Host['IPv6'] != ''))
-    if(substr($Host['IPv6'], 0, strlen($Network)) == $Network)
     {
-        $Remaining = substr($Host['IPv6'], strlen($Network));
-      $Remaining = explode(':', $Remaining);
-      foreach($Remaining)
-      $Remaining = array_reverse($Remaining);
-            
+        $Addr = new NetworkAddressIPv6();
+        $Addr->AddressFromString($Host['IPv6']);
+        $Octets = $Addr->GetOctets();
+        $Octets = array_slice($Octets, 0, (128 - $Prefix) / 4);
+        $Octets = array_reverse($Octets);
+        $Octets = implode('.', $Octets);
+
       $Host['Name'] = strtolower($Host['Name']);
-      $Output .= implode(':', $Remaining)."\tIN\tPTR\t".$Host['Name'].".".$DNS['Domain'].".\n";
+      $Output .= $Octets."\tIN\tPTR\t".$Host['Name'].".".$DNS['Domain'].".\n";
     }
-    $Reverse = implode(':', array_reverse(explode(':', $Network)));    
-    $File = fopen($DNS['BaseDir'].$Reverse.'.ipv6.arpa.zone', 'w+');
+
+    $NetAddr = new NetworkAddressIPv6();
+    $NetAddr->AddressFromString($NetworkAddress);
+    $Octets = array_reverse($NetAddr->GetOctets());
+    $Octets = array_reverse(array_slice($Octets, 0, $Prefix / 4));
+    $FileName = implode('.', $Octets).'.ipv6.arpa.zone';
+    $File = fopen($DNS['BaseDir'].$FileName, 'w+');
     fputs($File, $Output);
-    //echo($Output);
     fclose($File);
   }
-  */
 }
 
@@ -169 +175 @@
   'Host' => array(),
   'Alias' => array(),
-  'Network' => array('10.145.64', '10.145.65', '10.145.66', '10.145.67', '10.145.68', 
-                '10.145.69', '10.145.70', '10.145.71', '77.92.221', '172.16.0', '172.16.1'),
-        'IPv6Network' => array('2001:470:9ab9:1'),
+  'Network' => array('10.145.64', '10.145.65', '10.145.66', '10.145.67', '10.145.68',
+        '10.145.69', '10.145.70', '10.145.71', '77.92.221', '172.16.0', '172.16.1'),
+        'IPv6Network' => array('2a00:e580:244::/48'),
 );
 
@@ -232 +238 @@
   'Alias' => array(),
   'Network' => array('81.2.194', '193.86.238', '212.111.4', '77.92.221'),
-        'IPv6Network' => array('2001:470:9ab9:1'),
+        'IPv6Network' => array('2a00:e580:244::/48'),
 );
 
@@ -271 +277 @@
   'Host' => array(),
   'Alias' => array(),
-  'Network' => array('10.145.64', '10.145.65', '10.145.66', '10.145.67', 
+  'Network' => array('10.145.64', '10.145.65', '10.145.66', '10.145.67',
     '10.145.68', '10.145.69', '10.145.70', '10.145.71'),
         'IPv6Network' => array(),
@@ -311 +317 @@
   'Host' => array(),
   'Alias' => array(),
-  'Network' => array('10.145.64', '10.145.65', '10.145.66', '10.145.67', 
+  'Network' => array('10.145.64', '10.145.65', '10.145.66', '10.145.67',
         '10.145.68', '10.145.69', '10.145.70', '10.145.71'),
         'IPv6Network' => array(),