Changeset 581 for trunk

Timestamp:

01/02/14 13:22:11 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Add an option to show the formal .arpa zone name for reverse zone NS
records instead of the logical CIDR zone.

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• dns.cgi (modified) (1 diff)
• dnsdb.conf (modified) (1 diff)
• export.pl (modified) (1 diff)
• textrecs.cgi (modified) (1 diff)

trunk/DNSDB.pm

@@ -213 +213 @@
                 force_refresh   => 1,
                 lowercase       => 0,   # mangle as little as possible by default
+                showrec_arpa_ns => 0,   # show formal .arpa zone name instead of logical CIDR on reverse NS records
         );
 
@@ -242 +243 @@
 
   # Several settings are booleans.  Handle multiple possible ways of setting them.
-  for my $boolopt ('log_failures', 'force_refresh', 'lowercase', 'usecache') {
+  for my $boolopt ('log_failures', 'force_refresh', 'lowercase', 'usecache', 'showrec_arpa_ns') {
     if ($self->{$boolopt} ne '1' && $self->{$boolopt} ne '0') {
       # true/false, on/off, yes/no all valid.
@@ -1342 +1343 @@
       $cfg->{force_refresh}     = $1 if /^force_refresh\s*=\s*([a-z01]+)/i;
       $cfg->{lowercase}         = $1 if /^lowercase\s*=\s*([a-z01]+)/i;
+      $cfg->{showrec_arpa_ns}   = $1 if /^showrec_arpa_ns\s*=\s*([a-z01]+)/i;
 # not supported in dns.cgi yet
 #      $cfg->{templatedir}      = $1 if m{^templatedir\s*=\s*([a-z0-9/_.-]+)}i;

trunk/dns.cgi

@@ -2004 +2004 @@
 
   foreach my $rec (@$foo2) {
+    # NS records.  Need to do this first before we convert the type-value to the text representation
+    if ($rev eq 'y' && $dnsdb->{showrec_arpa_ns} && $rec->{type} == $reverse_typemap{NS}) {
+      my $tmp = new NetAddr::IP $rec->{val};
+      $rec->{val} = DNSDB::_ZONE($tmp, 'ZONE', 'r', '.').($tmp->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
+    }
     $rec->{type} = $typemap{$rec->{type}};
     $rec->{fwdzone} = $rev eq 'n';

trunk/dnsdb.conf

@@ -38 +38 @@
 #lowercase = 0
 
+# Show formal .arpa zone name instead of usual CIDR for reverse zone NS records?
+#showrec_arpa_ns = 0
+
 ## General RPC options
 # may already be obsolete.  how do we want to run RPC requests?

trunk/export.pl

@@ -29 +29 @@
 my $dnsdb = new DNSDB;
 
+#open TINYDATA, ">small/tinydata";
 open TINYDATA, ">tinydata";
 
-$dnsdb->export('tiny', *TINYDATA);
+$dnsdb->export('tiny', *TINYDATA) or die "fatal: ".$dnsdb->errstr."\n";

trunk/textrecs.cgi

@@ -83 +83 @@
   $rec->{val} = "$rec->{distance}  $rec->{weight}  $rec->{port}  $rec->{val}" if $rec->{type} eq 'SRV';
   if ($webvar{revrec} eq 'y') {
+    if ($dnsdb->{showrec_arpa_ns} && $rec->{type} eq 'NS') {
+      my $tmp = new NetAddr::IP $rec->{val};
+      $rec->{val} = DNSDB::_ZONE($tmp, 'ZONE', 'r', '.').($tmp->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
+    }
     printf "%-16s\t%d\t%s\t%s\n", $rec->{val}, $rec->{ttl}, $rec->{type}, $rec->{host};
   } else {