Changeset 108

Timestamp:

07/20/11 18:01:23 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Add timestamp and location stub output in export_tiny() to

support tinydns' automagical recod-is-valid timestamp and
split-horizon DNS capability respectively (once the data is
provided in the database, and tools can manipulate it)

Export PTR records
Add stub space for "other" record export - note that due to

the way Net::DNS provides the data via rdatastr, we can't
(easily) reconstruct the real record data.

File:

• trunk/DNSDB.pm (modified) (9 diffs)

trunk/DNSDB.pm

@@ -1605 +1605 @@
     $recsth->execute($domid);
     while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$lval) = $recsth->fetchrow_array) {
+##fixme:  need to store location in the db, and retrieve it here.
+# temporarily hardcoded to empty so we can include it further down.
+my $loc = '';
+
+##fixme:  record validity timestamp. tinydns supports fiddling with timestamps.
+# note $ttl must be set to 0 if we want to use tinydns's auto-expiring timestamps.
+# timestamps are TAI64
+# ~~ 2^62 + time()
+my $stamp = '';
+
       $val = $lval if $lval;
 
@@ -1616 +1626 @@
         # val is abused to contain refresh:retry:expire:minttl
 ##fixme:  "manual" serial vs tinydns-autoserial
-        print $datafile "Z$host"."::$val:$ttl\n";
+        print $datafile "Z$host"."::$val:$ttl:$stamp:$loc\n";
 
       } elsif ($typemap{$type} eq 'A') {
 
-        print $datafile "+$host:$val:$ttl\n";
+        print $datafile "+$host:$val:$ttl:$stamp:$loc\n";
 
       } elsif ($typemap{$type} eq 'NS') {
 
-        print $datafile "\&$host"."::$val:$ttl\n";
+        print $datafile "\&$host"."::$val:$ttl:$stamp:$loc\n";
 
       } elsif ($typemap{$type} eq 'AAAA') {
@@ -1631 +1641 @@
         my $altgrp = 0;
         my @altconv;
-        # Split in to up to 8 groups of hex digits (allows for :: 0-collapsing)
+        # Split in to up to 8 groups of hex digits (allows for IPv6 :: 0-collapsing)
         foreach (split /:/, $val) {
           if (/^$/) {
@@ -1647 +1657 @@
           print $datafile '\000\000'x(9-$altgrp) if $octet =~ /^s$/;
         }
-        print $datafile ":$ttl\n";
+        print $datafile ":$ttl:$stamp:$loc\n";
 
       } elsif ($typemap{$type} eq 'MX') {
 
-        print $datafile "\@$host"."::$val:$dist:$ttl\n";
+        print $datafile "\@$host"."::$val:$dist:$ttl:$stamp:$loc\n";
 
       } elsif ($typemap{$type} eq 'TXT') {
@@ -1657 +1667 @@
 ##fixme:  split v-e-r-y long TXT strings?  will need to do so for BIND export, at least
         $val =~ s/:/\\072/g;    # may need to replace other symbols
-        print $datafile "'$host:$val:$ttl\n";
+        print $datafile "'$host:$val:$ttl:$stamp:$loc\n";
 
 # by-hand TXT
@@ -1678 +1688 @@
       } elsif ($typemap{$type} eq 'CNAME') {
 
-        print $datafile "C$host:$val:$ttl\n";
+        print $datafile "C$host:$val:$ttl:$stamp:$loc\n";
 
       } elsif ($typemap{$type} eq 'SRV') {
@@ -1691 +1701 @@
           printf $datafile "\\%0.3o%s", length($_), $_;
         }
-        print $datafile "\\000:$ttl\n";
+        print $datafile "\\000:$ttl:$stamp:$loc\n";
 
       } elsif ($typemap{$type} eq 'RP') {
@@ -1707 +1717 @@
           printf $datafile "\\%0.3o%s", length($_), $_;
         }
-        print $datafile "\\000:$ttl\n";
+        print $datafile "\\000:$ttl:$stamp:$loc\n";
 
       } elsif ($typemap{$type} eq 'PTR') {
@@ -1713 +1723 @@
         # must handle both IPv4 and IPv6
 ##work
+        # data should already be in suitable reverse order.
+        print $datafile "^$host:$val:$ttl:$stamp:$loc\n";
+
+      } else {
+        # raw record.  we don't know what's in here, so we ASS-U-ME the user has
+        # put it in correctly, since either the user is messing directly with the
+        # database, or the record was imported via AXFR
+        # <split by char>
+        # convert anything not a-zA-Z0-9.- to octal coding
+
+##fixme: add flag to export "unknown" record types - note we'll probably end up
+# mangling them since they were written to the DB from Net::DNS::RR::<type>->rdatastr.
+        #print $datafile ":$host:$type:$val:$ttl:$stamp:$loc\n";
 
       } # record type if-else