Changeset 334

Timestamp:

05/09/12 22:24:27 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint updating export for reverse DNS. See #26.

• Retrieve record IDs to track A+PTR (and possibly AAAA+PTR, eventually) records so we don't double-export them
• Fix bug that snuck in to PTR export; $ttl, not a literal 'ttl'
• Fix buglet in recursive call to _printrec_tiny for AAAA+PTR; forgot to pass $recflags

File:

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

trunk/DNSDB.pm

@@ -3973 +3973 @@
 
   my $domsth = $dbh->prepare("SELECT domain_id,domain,status FROM domains WHERE status=1");
-  my $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl ".
+  my $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id ".
         "FROM records WHERE domain_id=?");
   $domsth->execute();
   while (my ($domid,$dom,$domstat) = $domsth->fetchrow_array) {
     $recsth->execute($domid);
-    while (my ($host,$type,$val,$dist,$weight,$port,$ttl) = $recsth->fetchrow_array) {
+    while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$recid) = $recsth->fetchrow_array) {
+      next if $recflags{$recid};
 ##fixme:  need to store location in the db, and retrieve it here.
 # temporarily hardcoded to empty so we can include it further down.
@@ -3990 +3991 @@
 
       _printrec_tiny($datafile,'n',\%recflags,$dom,$host,$type,$val,$dist,$weight,$port,$ttl,$loc,$stamp);
+      $recflags{$recid} = 1;
 
     } # while ($recsth)
@@ -3995 +3997 @@
 
   my $revsth = $dbh->prepare("SELECT rdns_id,revnet,status FROM revzones WHERE status=1");
-  $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl ".
+  $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id ".
         "FROM records WHERE rdns_id=?");
   $revsth->execute();
   while (my ($revid,$revzone,$revstat) = $revsth->fetchrow_array) {
     $recsth->execute($revid);
-    while (my ($host,$type,$val,$dist,$weight,$port,$ttl) = $recsth->fetchrow_array) {
+    while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$recid) = $recsth->fetchrow_array) {
+      next if $recflags{$recid};
 ##fixme:  need to store location in the db, and retrieve it here.
 # temporarily hardcoded to empty so we can include it further down.
@@ -4012 +4015 @@
 
       _printrec_tiny($datafile,'y',\%recflags,$revzone,$host,$type,$val,$dist,$weight,$port,$ttl,$loc,$stamp);
+      $recflags{$recid} = 1;
 
     } # while ($recsth)
@@ -4157 +4161 @@
           print $datafile "^".
                 _ZONE($val, 'ZONE', 'r', '.').($val->{isv6} ? '.ip6.arpa' : '.in-addr.arpa').
-                ":$host:ttl:$stamp:$loc\n";
+                ":$host:$ttl:$stamp:$loc\n";
         }
 
       } elsif ($type == 65280) { # A+PTR
+
+        print $datafile "=$host:$val:$ttl:$stamp:$loc\n";
+
       } elsif ($type == 65281) { # AAAA+PTR
 
@@ -4170 +4177 @@
           $type = 12;
         }
-        _printrec_tiny($datafile,$revrec,$zone,$host,$type,$val,$dist,$weight,$port,$ttl,$loc,$stamp);
+        _printrec_tiny($datafile,$revrec,$recflags,$zone,$host,$type,$val,$dist,$weight,$port,$ttl,$loc,$stamp);
 
       } elsif ($type == 65282) { # PTR template