Changeset 346 for trunk

Timestamp:

06/13/12 15:05:29 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Delegation type now exports correctly, or at least as correctly as the
input data can manage. Nested super-/24 and sub-/24 delegations may
not resolve correctly depending on whether a DNS server hands out only
the super-/24 delegation records or only the CNAMEs for the sub-/24, or
both.

As a nice bonus, it doesn't matter for most delegations whether you use
explicit NS records or the "Delegation" pseudotype. Only sub-/24
delegations will not be fully created (including the CNAMEs for each IP)
with just NS records.

See #26.

File:

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

trunk/DNSDB.pm

@@ -4350 +4350 @@
 
         if ($revrec eq 'y') {
-
-print "$zone has\t$val NS $host\n";
           $val = NetAddr::IP->new($val);
-          $zone = NetAddr::IP->new($zone);
-#print "$val NS $host\n";
           # handle split-n-multiply SOA for off-octet (8 < mask < 16) or (16 < mask < 24) v4 zones
           if (!$val->{isv6} && ($val->masklen < 24) && ($val->masklen % 8 != 0)) {
-            foreach my $szone ($zone->split($val->masklen + (8 - $val->masklen % 8))) {
+            foreach my $szone ($val->split($val->masklen + (8 - $val->masklen % 8))) {
               my $szone2 = _ZONE($szone, 'ZONE.in-addr.arpa', 'r', '.');
-next if $$recflags{"$szone2-sub"} && $zone != $val;
-print " $szone2-sub     NS $host\n";
-# && $zone == $val;
+              next if $$recflags{$szone2} && $$recflags{$szone2} > $val->masklen;
               print $datafile "\&$szone2"."::$host:$ttl:$stamp:$loc\n";
-              $$recflags{"$szone2-sub"}++ if $zone != $val;
+              $$recflags{$szone2} = $val->masklen;
             }
-#print "recflags should have stuff set?\n";
-            return; # skips "default" bits just below
+          } elsif ($val->{isv6} && ($val->masklen < 64) && ($val->masklen % 4 !=0)) {
+            foreach my $szone ($val->split($val->masklen + (4 - $val->masklen % 4))) {
+              my $szone2 = _ZONE($szone, 'ZONE.ip6.arpa', 'r', '.');
+              next if $$recflags{$szone2} && $$recflags{$szone2} > $val->masklen;
+              print $datafile "\&$szone2"."::$host:$ttl:$stamp:$loc\n";
+              $$recflags{$szone2} = $val->masklen;
+            }
+          } else {
+            my $val2 = _ZONE($val, 'ZONE', 'r', '.').($val->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
+            print $datafile "\&$val2"."::$host:$ttl:$stamp:$loc\n";
+            $$recflags{$val2} = $val->masklen;
           }
-my $val2 = _ZONE($val, 'ZONE', 'r', '.').($val->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
-#print "checking recflags for $val\n";
-#return if $$recflags{$val};
-          print $datafile '&'.$val2."::$host:$ttl:$stamp:$loc\n";
-          $$recflags{"$val2-sub"}++ if $val == $zone;
-print "$zone;\t$val2-sub NS $host\n";
-##NSfixme
         } else {
           print $datafile "\&$host"."::$val:$ttl:$stamp:$loc\n";
@@ -4533 +4529 @@
         # This is intended for reverse zones, but may prove useful in forward zones.
 
-if ($revrec eq 'n') {
-  # It's an NS record.  Recurse and handle.
-  _printrec_tiny($datafile,$revrec,$recflags,$zone,$host,$reverse_typemap{'NS'},
-        $val,$dist,$weight,$port,$ttl,$loc,$stamp);
-} else {
-  # It's a delegation.  We may need to actually generate several NS records, and
-  # for IPv4 we may also need to generate a set of CNAMEs for sub-/24 blocks.
-#  print "delegation $val to $host\n";
-  my $dblock = NetAddr::IP->new($val);
-  if ($dblock->{isv6}) {
-    my @subs = $dblock->split($dblock->masklen + (4 - $dblock->masklen % 4) % 4);
-    foreach (@subs) {
-      _printrec_tiny($datafile, $revrec, $recflags, $zone, $host, $reverse_typemap{'NS'},
-        "$_", $dist, $weight, $port, $ttl, $loc, $stamp);
-    }
-  } else {
-    my @subs = $dblock->split($dblock->masklen + (8 - $dblock->masklen % 8) % 8);
-    foreach (@subs) {
-      if ($dblock->masklen <= 24) {
-        _printrec_tiny($datafile, $revrec, $recflags, $zone, $host, $reverse_typemap{'NS'},
-                "$_", $dist, $weight, $port, $ttl, $loc, $stamp);
-#print $datafile "$_ NS $host\n";
-##nsdeleg
-      } else {
-        my ($oct) = ($_->addr =~ /(\d+)$/);
-        #print "$_ CNAME $oct."._ZONE($dblock, 'ZONE.in-addr.arpa', 'r', '.')."\n";
-      }
-    }
-  }
-
-#print $datafile "C$host:$val:$ttl:$stamp:$loc\n";
-}
+        # All delegations need to create one or more NS records.  The NS record handler knows what to do.
+        _printrec_tiny($datafile,$revrec,$recflags,$zone,$host,$reverse_typemap{'NS'},
+                $val,$dist,$weight,$port,$ttl,$loc,$stamp);
+        if ($revrec eq 'y') {
+          # In the case of a sub-/24 v4 reverse delegation, we need to generate CNAMEs
+          # to redirect all of the individual IP lookups as well.
+          # Not sure how this would actually resolve if a /24 or larger was delegated
+          # one way, and a sub-/24 in that >=/24 was delegated elsewhere...
+          my $dblock = NetAddr::IP->new($val);
+          if (!$dblock->{isv6} && $dblock->masklen > 24) {
+            my @subs = $dblock->split;
+            foreach (@subs) {
+              next if $$recflags{"$_"};
+              my ($oct) = ($_->addr =~ /(\d+)$/);
+              print $datafile "C"._ZONE($_, 'ZONE.in-addr.arpa', 'r', '.').":$oct.".
+                _ZONE($dblock, 'ZONE.in-addr.arpa', 'r', '.').":$ttl:$stamp:$loc\n";
+              $$recflags{"$_"}++;
+            }
+          }
+        }
 
       } else {