Changeset 354 for trunk

Timestamp:

06/29/12 12:49:20 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint on tiny-import.pl

• normalize some whitespace now that the code seems to be working
• remove some stale working comments

File:

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

trunk/tiny-import.pl

@@ -123 +123 @@
     if ($rec =~ /^=/) {
       $cnt{APTR}++;
-if ($rec !~ /^=(?:\*|\\052)?[a-z0-9\._-]+:[\d\.]+:\d*/i) {
-  print "bad A+PTR $rec\n";
-  return;
-#=sud-rr-iGi0-1_sud-gw1-iGi4-2.vianet.ca::10.10.10.13:900::in
-}
+
+##fixme:  do checks like this for all types
+      if ($rec !~ /^=(?:\*|\\052)?[a-z0-9\._-]+:[\d\.]+:\d*/i) {
+        print "bad A+PTR $rec\n";
+        return;
+      }
       my ($host,$ip,$ttl,$stamp,$loc) = split /:/, $rec, 5;
       $host =~ s/^=//;
@@ -146 +147 @@
     } elsif ($rec =~ /^C/) {
       $cnt{CNAME}++;
+
       my ($host,$targ,$ttl,$stamp,$loc) = split /:/, $rec, 5;
       $host =~ s/^C//;
@@ -176 +178 @@
     } elsif ($rec =~ /^\&/) {
       $cnt{NS}++;
+
     } elsif ($rec =~ /^\^/) {
       $cnt{PTR}++;
+
     } elsif ($rec =~ /^\+/) {
       $cnt{A}++;
+
     } elsif ($rec =~ /^Z/) {
       $cnt{SOA}++;
-#Z128.91.209.in-addr.arpa:ns1.vianet.ca.:dnsadmin.vianet.ca.::1209600:1209600:900:900:900:
+
       my ($zone,$master,$contact,$serial,$refresh,$retry,$expire,$minttl,$ttl,$stamp,$loc) = split /:/, $rec, 11;
       $zone =~ s/^Z//;
@@ -202 +207 @@
         $recsth->execute($domid, 0, "$contact:$master", 6, "$refresh:$retry:$expire:$minttl", 0, 0, 0, $ttl);
       }
-      return;  # since we don't use the "standard" record-add call at the bottom
+
     } elsif ($rec =~ /^\@/) {
       $cnt{MX}++;
+
     } elsif ($rec =~ /^'/) {
       $cnt{TXT}++;
@@ -225 +231 @@
     } elsif ($rec =~ /^\./) {
       $cnt{NSASOA}++;
+
       my ($fqdn, $ip, $ns, $ttl, $stamp, $loc) = split /:/, $rec, 6;
       $fqdn =~ s/^\.//;
@@ -254 +261 @@
 # Even the auto-nameserver-fqdn comes out...  ugly.
 
-##work
       } else {
         my ($domid) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE lower(domain) = lower(?)",
@@ -271 +277 @@
     } elsif ($rec =~ /^\%/) {
       $cnt{VIEWS}++;
+
     } elsif ($rec =~ /^:/) {
       $cnt{NCUST}++;
@@ -276 +283 @@
 # recognition and handling for the core common types, this must deal with the leftovers.
 # :fqdn:type:rdata:ttl:time:loc
-#:mx2.sys.vianet.ca:44:\001\001\215\272\152\152\123\142\120\071\320\106\160\364\107\372\153\116\036\111\247\135:900::sys
-#:_sipfederationtls._tcp.ncstechnology.com:33:\000\144\000\001\023\305\006sipfed\006online\004lync\003com\000:3600::
-
-my (undef, $fqdn, $type, $rdata, $ttl, $time, $loc) = split /:/, $rec;
-
-if ($type == 33) {
-  # SRV
-  my ($prio, $weight, $port, $target) = (0,0,0,0);
-
-  my @tmp = _byteparse(\$rdata, 2);
-  $prio = $tmp[0] * 256 + $tmp[1];
-  @tmp = _byteparse(\$rdata, 2);
-  $weight = $tmp[0] * 256 + $tmp[1];
-  @tmp = _byteparse(\$rdata, 2);
-  $port = $tmp[0] * 256 + $tmp[1];
-
-  $rdata =~ s/\\\d{3}/./g;
-  ($target) = ($rdata =~ /^\.(.+)\.$/);
+
+      my (undef, $fqdn, $type, $rdata, $ttl, $stamp, $loc) = split /:/, $rec, 7;
+      $ttl = 0 if !$ttl;
+      $stamp = '' if !$stamp;
+      $loc = '' if !$loc;
+      $loc = '' if $loc =~ /^:+$/;
+
+      if ($type == 33) {
+        # SRV
+        my ($prio, $weight, $port, $target) = (0,0,0,0);
+
+        my @tmp = _byteparse(\$rdata, 2);
+        $prio = $tmp[0] * 256 + $tmp[1];
+        @tmp = _byteparse(\$rdata, 2);
+        $weight = $tmp[0] * 256 + $tmp[1];
+        @tmp = _byteparse(\$rdata, 2);
+        $port = $tmp[0] * 256 + $tmp[1];
+
+        $rdata =~ s/\\\d{3}/./g;
+        ($target) = ($rdata =~ /^\.(.+)\.$/);
 # hmm.  the above *should* work, but What If(TM) we have ASCII-range bytes
 # representing the target's fqdn part length(s)?  axfr-get doesn't seem to,
@@ -306 +315 @@
 #  }
 
-  my $domid = DNSDB::_hostparent($dbh, $fqdn);
-  if ($domid) {
-    $recsth->execute($domid, 0, $fqdn, $type, $target, $prio, $weight, $port, $ttl) if $domid;
-  } else {
-    push @deferred, $rec unless $nodefer;
-  }
-
-} elsif ($type == 28) {
-  # AAAA
-
-  my @v6;
-
-  for (my $i=0; $i < 8; $i++) {
-    my @tmp = _byteparse(\$rdata, 2);
-    push @v6, sprintf("%0.4x", $tmp[0] * 256 + $tmp[1]);
-  }
-  my $val = NetAddr::IP->new(join(':', @v6));
-
-  my $domid = DNSDB::_hostparent($dbh, $fqdn);
-  if ($domid) {
-    $recsth->execute($domid, 0, $fqdn, $type, $val->addr, 0, 0, 0, $ttl) if $domid;
-  } else {
-    push @deferred, $rec unless $nodefer;
-  }
-
-} else {
-  # ... uhhh, dunno
-}
+        my $domid = DNSDB::_hostparent($dbh, $fqdn);
+        if ($domid) {
+          $recsth->execute($domid, 0, $fqdn, 33, $target, $prio, $weight, $port, $ttl) if $domid;
+        } else {
+          push @deferred, $rec unless $nodefer;
+        }
+
+      } elsif ($type == 28) {
+        # AAAA
+        my @v6;
+
+        for (my $i=0; $i < 8; $i++) {
+          my @tmp = _byteparse(\$rdata, 2);
+          push @v6, sprintf("%0.4x", $tmp[0] * 256 + $tmp[1]);
+        }
+        my $val = NetAddr::IP->new(join(':', @v6));
+
+        my ($rdns) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >> ?", undef, ("$val"));
+        if ($rdns) {
+          $recsth->execute(0, $rdns, $fqdn, 28, $val->addr, 0, 0, 0, $ttl);
+        } else {
+          push @deferred, $rec unless $nodefer;
+        }
+
+      } else {
+        # ... uhhh, dunno
+      }
 
     } else {
       $cnt{other}++;
-  print " $_\n";
+      print " $_\n";
     }
   }