Changeset 329

Timestamp:

05/09/12 16:48:23 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint, update export process to handle reverse zones. See #26.

• Split off actual record-printing to its own sub
• Duplicate domain loop for revzones

File:

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

trunk/DNSDB.pm

@@ -3959 +3959 @@
 ##fixme: slurp up further options to specify particular zone(s) to export
 
+##fixme: fail if $datafile isn't an open, writable file
+
+  # easy case - export all evarything
+  # not-so-easy case - export item(s) specified
+  # todo:  figure out what kind of list we use to export items
+
+# raw packet in unknown format:  first byte indicates length
+# of remaining data, allows up to 255 raw bytes
+
+  # tracking hash so we don't double-export A+PTR or AAAA+PTR records.
+  my %recflags;
+
+  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 ".
+        "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) {
+##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 = '';
+
+      _printrec_tiny($datafile,'n',\%recflags,$dom,$host,$type,$val,$dist,$weight,$port,$ttl,$loc,$stamp);
+
+    } # while ($recsth)
+  } # while ($domsth)
+
+  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 ".
+        "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) {
+##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 = '';
+
+      _printrec_tiny($datafile,'y',\%recflags,$revzone,$host,$type,$val,$dist,$weight,$port,$ttl,$loc,$stamp);
+
+    } # while ($recsth)
+  } # while ($domsth)
+
+} # end __export_tiny()
+
+
+# Utility sub for __export_tiny above
+sub _printrec_tiny {
+  my ($datafile,$revrec,$recflags,$zone,$host,$type,$val,$dist,$weight,$port,$ttl,$loc,$stamp) = @_;
+
   ## Convert a bare number into an octal-coded pair of octets.
   # Take optional arg to indicate a decimal or hex input.  Defaults to hex.
@@ -3970 +4033 @@
   }
 
-##fixme: fail if $datafile isn't an open, writable file
-
-  # easy case - export all evarything
-  # not-so-easy case - export item(s) specified
-  # todo:  figure out what kind of list we use to export items
-
-  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 ".
-        "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) {
-##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 = '';
-
-# raw packet in unknown format:  first byte indicates length
-# of remaining data, allows up to 255 raw bytes
-
 ##fixme?  append . to all host/val hostnames
       if ($typemap{$type} eq 'SOA') {
@@ -4005 +4042 @@
         my ($email, $primary) = (split /:/, $host)[0,1];
         my ($refresh, $retry, $expire, $min_ttl) = (split /:/, $val)[0,1,2,3];
-        print $datafile "Z$dom:$primary:$email"."::$refresh:$retry:$expire:$min_ttl:$ttl:$stamp:$loc\n";
+        print $datafile "Z$zone:$primary:$email"."::$refresh:$retry:$expire:$min_ttl:$ttl:$stamp:$loc\n";
 
       } elsif ($typemap{$type} eq 'A') {
@@ -4118 +4155 @@
       } # record type if-else
 
-    } # while ($recsth)
-  } # while ($domsth)
-} # end __export_tiny()
+} # end _printrec_tiny()