Changeset 822

Timestamp:

12/04/20 13:30:21 (3 years ago)

Author:

Kris Deugau

Message:

/trunk

Fifteenth sampled iteration of bind-import

File:

• trunk/bind-import (modified) (5 diffs)

trunk/bind-import

@@ -31 +31 @@
 
 my $dnsdb = new DNSDB;
+
 my $dryrun = 0;
 
@@ -140 +141 @@
     if ($zid) {
       die "zone $origzone already present, not merging records\n";
-#print "dbg: skip add domain\n";
+#print "dbg: skip add revzone\n";
 #      $zname = new NetAddr::IP $zname;
 #      $zname = DNSDB::_ZONE($zname, 'ZONE', 'r', '.').($zname->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
@@ -150 +151 @@
     $zid = $dnsdb->domainID($zname,':ANY:');
     if ($zid) {
-      die "zone $origzone already present, not merging records\n";
+#      die "zone $origzone already present, not merging records\n";
 #print "dbg: skip add domain\n";
     }
-    ($zid) = $dnsdb->{dbh}->selectrow_array("INSERT INTO domains (domain,group_id,status,default_location,zserial) VALUES (?,?,?,?,?) RETURNING domain_id",
-        undef, ($zname, $group, $status, $location, $serial));
+#    ($zid) = $dnsdb->{dbh}->selectrow_array("INSERT INTO domains (domain,group_id,status,default_location,zserial) VALUES (?,?,?,?,?) RETURNING domain_id",
+#       undef, ($zname, $group, $status, $location, $serial));
 
   }
@@ -205 +206 @@
 
 $i++;
-last if $i > 17;
+#last if $i > 17;
 #print "line $i: ($rec)\n";
     if (my ($macro,$mdetail) = ($rec =~ /^\s*\$(TTL|ORIGIN|INCLUDE|GENERATE)\s+(.+)/) ) {
@@ -562 +563 @@
 #    unless ($dryrun) {
       my ($code, $msg);
-      if ($rev eq 'n') {
-        ($code,$msg) = $dnsdb->addRec('n', $rev, $zid, \$curlabel, \$itype, \$rdata, $ttl,
-          $location, undef, undef, $distance, $weight, $port);
-      } else {
-        ($code,$msg) = $dnsdb->addRec('y', $rev, $zid, \$rdata, \$itype, \$curlabel, $ttl,
-          $location, undef, undef, $distance, $weight, $port);
-      }
+
+# swap curlabel/rdata for revzones, because our internal metastorage only knows about "host" and "val"
+# keep the originals Just In Case(TM)
+$curlabel =~ s/\.$//;   # dnsadmin doesn't store trailing dots
+my $inshost = $curlabel;
+my $insval = $rdata;
+if ($rev eq 'y') {
+  $inshost = $rdata;
+  $insval = $curlabel;
+}
+print "dbg: maybeip next ($insval)\n";
+my $addr = NetAddr::IP->new($insval) if DNSDB::_maybeip(\$insval);
+my $fields;
+my @vallist;
+
+($code,$msg) = $validators{$itype}($dnsdb, defrec => 'n', revrec => $rev, id => $zid,
+        host => \$inshost, rectype => \$itype, val => \$insval, addr => $addr,
+        dist => \$distance, port => \$port, weight => \$weight,
+        fields => \$fields, vallist => \@vallist);
+
+# Add standard common fields
+$fields .= "host,type,val,ttl,".DNSDB::_recparent('n',$rev);
+push @vallist, ($inshost,$itype,$insval,$ttl,$zid);
+
+my $vallen = '?'.(',?'x$#vallist);
+
+print "INSERT INTO records ($fields) VALUES ($vallen);\n".join("','", @vallist)."\n";
+
+#      if ($rev eq 'n') {
+#        ($code,$msg) = $dnsdb->addRec('n', $rev, $zid, \$curlabel, \$itype, \$rdata, $ttl,
+#          $location, undef, undef, $distance, $weight, $port);
+#      } else {
+#        ($code,$msg) = $dnsdb->addRec('y', $rev, $zid, \$rdata, \$itype, \$curlabel, $ttl,
+#          $location, undef, undef, $distance, $weight, $port);
+#      }
       print "$code: $msg\n" if $code ne 'OK';
 #    }