- finished support for the AAAA RR

- changed the A RR to use inet_ntop()/inet_pton() for network to printable conversions
mikepultz · Aug 25, 2010 · 8360928 · 8360928
1 parent 4f71129
commit 8360928
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 11 deletions.
diff --git a/Net/DNS2/RR/A.php b/Net/DNS2/RR/A.php
@@ -120,11 +120,14 @@ protected function _set(Net_DNS2_Packet &$packet)
 	{
 		if ($this->rdlength > 0) {
 
-			$this->address = ord($this->rdata[0]) . '.' . ord($this->rdata[1]) . '.' . 
-				ord($this->rdata[2]) . '.' . ord($this->rdata[3]);
+			$this->address = inet_ntop($this->rdata);
+			if ($this->address !== FALSE) {
+
+				return true;
+			}
 		}
 
-		return true;
+		return false;
 	}
 
     /**
@@ -137,13 +140,7 @@ protected function _set(Net_DNS2_Packet &$packet)
      */
 	protected function _get(Net_DNS2_Packet &$packet)
 	{
-		$x = explode('.', $this->address);
-		if (count($x) == 4) {
-
-			return chr($x[0]) . chr($x[1]) . chr($x[2]) . chr($x[3]);
-		}
-
-		return null; 
+		return inet_pton($this->address);
 	}
 }
 

diff --git a/Net/DNS2/RR/AAAA.php b/Net/DNS2/RR/AAAA.php
@@ -70,6 +70,13 @@
  */
 class Net_DNS2_RR_AAAA extends Net_DNS2_RR
 {
+	/*
+	 * the IPv6 address in the preferred hexadecimal values of the eight 16-bit pieces 
+	 * per RFC1884
+	 *
+	 */
+	public $address;
+
     /**
      * method to return the rdata portion of the packet as a string
      *
@@ -79,6 +86,7 @@ class Net_DNS2_RR_AAAA extends Net_DNS2_RR
      */
 	protected function _toString()
 	{
+		return $this->address;
 	}
 
     /**
@@ -91,8 +99,28 @@ protected function _toString()
      */
 	protected function _fromString(array $rdata)
 	{
+		$address = array_shift($rdata);
+
+		//
+		// expand out compressed formats
+		//
+		if (strpos($address, '::') !== false) {
+
+			$address = str_replace('::', str_repeat(':0', 8 - substr_count($address, ':')).':', $address);
+		}
+		if (strpos($address, ':') === 0) {
+
+			$address = '0' . $address;
+		}
+
+		$this->address = $address;
+
+		return true;
 	}
 
+private function ExpandIPv6Notation($Ip) {
+}
+
     /**
      * parses the rdata of the Net_DNS2_Packet object
      *
@@ -103,6 +131,24 @@ protected function _fromString(array $rdata)
      */
 	protected function _set(Net_DNS2_Packet &$packet)
 	{
+		//
+		// must be 8 x 16bit chunks, or 16 x 8bit
+		//
+		if ($this->rdlength == 16) {
+
+			//
+			// PHP's inet_ntop returns IPv6 addresses in their compressed form, but we want
+			// to keep with the preferred standard, so we'll parse it manually.
+			//
+			$x = unpack('n8', $this->rdata);
+			if (count($x) == 8) {
+
+				$this->address = vsprintf("%x:%x:%x:%x:%x:%x:%x:%x", $x);
+				return true;
+			}
+		}
+
+		return false;
 	}
 
     /**
@@ -115,6 +161,7 @@ protected function _set(Net_DNS2_Packet &$packet)
      */
 	protected function _get(Net_DNS2_Packet &$packet)
 	{
+		return inet_pton($this->address);
 	}
 }
 

diff --git a/Net/DNS2/TODO b/Net/DNS2/TODO
@@ -13,7 +13,7 @@ Net_DNS2 TODO List
 
 - finish missing RR's
 
-	- AAAA, NSAP, SIG, LOC, CERT, OPT, APL, SSHFP,
+	- NSAP, SIG, LOC, CERT, OPT, APL, SSHFP,
 	  IPSECKEY, NSEC, DHCID, NSEC3, NSEC3PARAM, HIP
 
 DONE - parse BIND style input and set all the appropriate values of the RR object

diff --git a/tests/Net_DNS2_ParserTest.php b/tests/Net_DNS2_ParserTest.php
@@ -23,6 +23,7 @@ public function testParser()
 			'RT'		=> 'example.com. 300 IN RT 2 relay.prime.com.',
 			'KEY'		=> 'example.com. 300 IN KEY 256 3 7 AwEAAYCXh/ZABi8kiJIDXYmyUlHzC0CHeBzqcpyZAIjC7dK1wkRYVcUvIlpTOpnOVVfcC3Py9Ui/x45qKb0LytvK7WYAe3WyOOwk5klwIqRC/0p4luafbd2yhRMF7quOBVqYrLoHwv8i9LrV+r8dhB7rXv/lkTSI6mEZsg5rDfee8Yy1',
 			'PX'		=> 'example.com. 300 IN PX 10 ab.net2.it. o-ab.prmd-net2.admdb.c-it.',
+			'AAAA'		=> 'example.com. 300 IN AAAA 1080:0:0:0:8:800:200c:417a',
 			'SRV'		=> 'example.com. 300 IN SRV 20 0 5269 xmpp-server2.l.google.com.',
 			'NAPTR'		=> 'example.com. 300 IN NAPTR 100 10 S SIP+D2U !^.*$!sip:customer-service@example.com! _sip._udp.example.com.',
 			'KX'		=> 'example.com. 300 IN KX 10 mx1.mrhost.ca.',