Skip to content

Commit

Permalink
- added support for the WKS RR
Browse files Browse the repository at this point in the history
- added test for the WKS RR
  • Loading branch information
mike.pultz committed Nov 25, 2010
1 parent 1fb3959 commit 0acf61a
Show file tree
Hide file tree
Showing 4 changed files with 297 additions and 2 deletions.
63 changes: 62 additions & 1 deletion Net/DNS2/Lookups.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ class Net_DNS2_Lookups
'MG' => 8, // RFC 1035 - obsolete, Not implemented
'MR' => 9, // RFC 1035 - obsolete, Not implemented
'NULL' => 10, // RFC 1035 - obsolete, Not implemented
'WKS' => 11, // RFC 1035 - Not implemented
'WKS' => 11, // RFC 1035
'PTR' => 12, // RFC 1035
'HINFO' => 13, // RFC 1035
'MINFO' => 14, // RFC 1035 - obsolete, Not implemented
Expand Down Expand Up @@ -262,6 +262,7 @@ class Net_DNS2_Lookups
2 => 'Net_DNS2_RR_NS',
5 => 'Net_DNS2_RR_CNAME',
6 => 'Net_DNS2_RR_SOA',
11 => 'Net_DNS2_RR_WKS',
12 => 'Net_DNS2_RR_PTR',
13 => 'Net_DNS2_RR_HINFO',
15 => 'Net_DNS2_RR_MX',
Expand Down Expand Up @@ -378,6 +379,65 @@ class Net_DNS2_Lookups
self::DNSSEC_DIGEST_SHA1 => 'SHA-1'
);

/*
* Protocols names - RFC 1010
*/
public static $protocol_by_id = array();
public static $protocol_by_name = array(

'ICMP' => 1,
'IGMP' => 2,
'GGP' => 3,
'ST' => 5,
'TCP' => 6,
'UCL' => 7,
'EGP' => 8,
'IGP' => 9,
'BBN-RCC-MON' => 10,
'NVP-II' => 11,
'PUP' => 12,
'ARGUS' => 13,
'EMCON' => 14,
'XNET' => 15,
'CHAOS' => 16,
'UDP' => 17,
'MUX' => 18,
'DCN-MEAS' => 19,
'HMP' => 20,
'PRM' => 21,
'XNS-IDP' => 22,
'TRUNK-1' => 23,
'TRUNK-2' => 24,
'LEAF-1' => 25,
'LEAF-2' => 26,
'RDP' => 27,
'IRTP' => 28,
'ISO-TP4' => 29,
'NETBLT' => 30,
'MFE-NSP' => 31,
'MERIT-INP' => 32,
'SEP' => 33,
// 34 - 60 - Unassigned
// 61 - any host internal protocol
'CFTP' => 62,
// 63 - any local network
'SAT-EXPAK' => 64,
'MIT-SUBNET' => 65,
'RVD' => 66,
'IPPC' => 67,
// 68 - any distributed file system
'SAT-MON' => 69,
// 70 - Unassigned
'IPCV' => 71,
// 72 - 75 - Unassigned
'BR-SAT-MON' => 76,
// 77 - Unassigned
'WB-MON' => 78,
'WB-EXPAK' => 79
// 80 - 254 - Unassigned
// 255 - Reserved
);

/**
* Constructor - generates some static arrays
*
Expand All @@ -402,6 +462,7 @@ public function __construct()
self::$digest_name_to_id = array_flip(self::$digest_id_to_name);
self::$rr_qtypes_by_id = array_flip(self::$rr_qtypes_by_name);
self::$rr_metatypes_by_id = array_flip(self::$rr_metatypes_by_name);
self::$protocol_by_id = array_flip(self::$protocol_by_name);
}
}

Expand Down
231 changes: 231 additions & 0 deletions Net/DNS2/RR/WKS.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */

/**
* DNS Library for handling lookups and updates.
*
* PHP Version 5
*
* Copyright (c) 2010, Mike Pultz <mike@mikepultz.com>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* * Neither the name of Mike Pultz nor the names of his contributors
* may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* @category Networking
* @package Net_DNS2
* @author Mike Pultz <mike@mikepultz.com>
* @copyright 2010 Mike Pultz <mike@mikepultz.com>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version SVN: $Id$
* @link http://pear.php.net/package/Net_DNS2
* @since File available since Release 1.0.1
*
*/

/**
* WKS Resource Record - RFC1035 section 3.4.2
*
* +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
* | ADDRESS |
* +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
* | PROTOCOL | |
* +--+--+--+--+--+--+--+--+ |
* | |
* / <BIT MAP> /
* / /
* +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
*
* @category Networking
* @package Net_DNS2
* @author Mike Pultz <mike@mikepultz.com>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @link http://pear.php.net/package/Net_DNS2
* @see Net_DNS2_RR
*
*/
class Net_DNS2_RR_WKS extends Net_DNS2_RR
{
/*
* The IP address of the service
*/
public $address;

/*
* The protocol of the service
*/
public $protocol;

/*
* bitmap
*/
public $bitmap = array();

/**
* method to return the rdata portion of the packet as a string
*
* @return string
* @access protected
*
*/
protected function rrToString()
{
$data = $this->address . ' ' . $this->protocol;

foreach($this->bitmap as $port) {
$data .= ' ' . $port;
}

return $data;
}

/**
* parses the rdata portion from a standard DNS config line
*
* @param array $rdata a string split line of values for the rdata
*
* @return boolean
* @access protected
*
*/
protected function rrFromString(array $rdata)
{
$this->address = strtolower(trim(array_shift($rdata), '.'));
$this->protocol = array_shift($rdata);
$this->bitmap = $rdata;

return true;
}

/**
* parses the rdata of the Net_DNS2_Packet object
*
* @param Net_DNS2_Packet &$packet a Net_DNS2_Packet packet to parse the RR from
*
* @return boolean
* @access protected
*
*/
protected function rrSet(Net_DNS2_Packet &$packet)
{
if ($this->rdlength > 0) {

//
// get the address and protocol value
//
$x = unpack('Naddress/Cprotocol', $this->rdata);

$this->address = long2ip($x['address']);
$this->protocol = $x['protocol'];

//
// unpack the port list bitmap
//
$port = 0;
foreach (unpack('@5/C*', $this->rdata) as $set) {

$s = sprintf("%08b", $set);

for ($i=0; $i<8; $i++, $port++) {
if ($s[$i] == '1') {
$this->bitmap[] = $port;
}
}
}
}

return true;
}

/**
* returns the rdata portion of the DNS packet
*
* @param Net_DNS2_Packet &$packet a Net_DNS2_Packet packet use for
* compressed names
*
* @return mixed either returns a binary packed
* string or null on failure
* @access protected
*
*/
protected function rrGet(Net_DNS2_Packet &$packet)
{
if (strlen($this->address) > 0) {

$data = pack('NC', ip2long($this->address), $this->protocol);

$ports = array();

$n = 0;
foreach ($this->bitmap as $port) {
$ports[$port] = 1;

if ($port > $n) {
$n = $port;
}
}
for ($i=0; $i<ceil($n/8)*8; $i++) {
if (!isset($ports[$i])) {
$ports[$i] = 0;
}
}

ksort($ports);

$string = "";
$n = 0;

foreach($ports as $s) {

$string .= $s;
$n++;

if ($n == 8) {

$data .= pack('C', bindec($string));
$string = "";
$n = 0;
}
}

return $data;
}

return null;
}
}

/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* c-hanging-comment-ender-p: nil
* End:
*/
?>
4 changes: 3 additions & 1 deletion Net/DNS2/TODO
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ Net_DNS2 TODO List
DONE- update requests
DONE - need TSIG RR

DONE- finish missing RR's
- finish missing RR's

WKS, look at ATMA

DONE - parse BIND style input and set all the appropriate values of the RR object

Expand Down
1 change: 1 addition & 0 deletions tests/Net_DNS2_ParserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public function testParser()
'NS' => 'example.com. 300 IN NS ns1.mrdns.com.',
'CNAME' => 'example.com. 300 IN CNAME www.example.com.',
'SOA' => 'example.com. 300 IN SOA ns1.mrdns.com. help.mrhost.ca. 1278700841 900 1800 86400 21400',
'WKS' => 'example.com. 300 IN WKS 128.8.1.14 6 21 25',
'PTR' => '26.in-addr.arpa. 300 IN PTR example.com.',
'HINFO' => 'example.com. 300 IN HINFO PC-Intel-700mhz "Redhat \"Linux\" 7.1"',
'MX' => 'example.com. 300 IN MX 10 mx1.mrhost.ca.',
Expand Down

0 comments on commit 0acf61a

Please sign in to comment.