Changeset 356 for trunk

Timestamp:

06/29/12 17:48:31 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint: tiny-import.pl

• Add warning to header
• Remove development print in NS segment
• Fill in PTR stub (See #26)

File:

• trunk/tiny-import.pl (modified) (3 diffs)

trunk/tiny-import.pl

@@ -19 +19 @@
 ##
 
+# WARNING:  This is NOT a heavy-duty validator;  it is assumed that the data
+# being imported is more or less sane.  Only minor structural validation will
+# be done to weed out the most broken records.
+
 use strict;
 use warnings;
@@ -188 +192 @@
       if ($zone =~ /\.arpa$/) {
         ($code,$msg) = DNSDB::_zone2cidr($zone);
-        print "revzone $msg from $zone\n";
         my ($rparent) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >>= ?", undef, ("$msg"));
 ##fixme, in concert with the CNAME check for same;  automagically
@@ -210 +213 @@
     } elsif ($rec =~ /^\^/) {
       $cnt{PTR}++;
+
+      my ($rip,$host,$ttl,$stamp,$loc) = split /:/, $rec, 5;
+      $rip =~ s/^\^//;
+      $rip =~ s/\.$//;
+      $ttl = 0 if !$ttl;
+      $stamp = '' if !$stamp;
+      $loc = '' if !$loc;
+      $loc = '' if $loc =~ /^:+$/;
+      my $rparent;
+      if (my ($i, $z) = ($rip =~ /^(\d+)\.(\d+-(?:\d+\.){4}in-addr.arpa)$/) ) {
+        ($code,$msg) = DNSDB::_zone2cidr($z);
+        # Exact matches only, because we're in a sub-/24 delegation
+##fixme:  flag the type of delegation (range, subnet-with-dash, subnet-with-slash)
+# somewhere so we can recover it on export.  probably best to do that in the revzone data.
+        ($rparent) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet = ?", undef, ("$msg"));
+        $z =~ s/^[\d-]+//;
+        ($code,$msg) = DNSDB::_zone2cidr("$i.$z");      # Get the actual IP and normalize
+      } else {
+        ($code,$msg) = DNSDB::_zone2cidr($rip);
+        ($rparent) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >> ?", undef, ("$msg"));
+      }
+      if ($rparent) {
+        $recsth->execute(0, $rparent, $host, 12, $msg->addr, 0, 0, 0, $ttl);
+      } else {
+        push @deferred, $rec unless $nodefer;
+      }
 
     } elsif ($rec =~ /^\+/) {