Changeset 864 for trunk

Timestamp:

09/20/22 17:09:46 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

BIND export, unwinding dev saves, 16 of many many

• Trim out the extra voodoo in the AAAA block; BIND understands AAAA records just fine
• Uncomment $recflags in PTR and A+PTR blocks
• Add PTR template block, with light modification outputting BIND-format records

File:

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

trunk/DNSDB/ExportBIND.pm

@@ -273 +273 @@
   elsif ($typemap{$type} eq 'AAAA') {
 #    ($host,$val) = __revswap($host,$val) if $revrec eq 'y';
-    my $altgrp = 0;
-    my @altconv;
-    # Split in to up to 8 groups of hex digits (allows for IPv6 :: 0-collapsing)
-    foreach (split /:/, $val) {
-      if (/^$/) {
-        # flag blank entry;  this is a series of 0's of (currently) unknown length
-        $altconv[$altgrp++] = 's';
-      } else {
-        # call sub to convert 1-4 hex digits to 2 string-rep octal bytes
-        $altconv[$altgrp++] = octalize($_)
-      }
-    }
-    my $prefix = ":$host:28:";
-    foreach my $octet (@altconv) {
-      # if not 's', output
-      $prefix .= $octet unless $octet =~ /^s$/;
-      # if 's', output (9-array length)x literal '\000\000'
-      $prefix .= '\000\000'x(9-$altgrp) if $octet =~ /^s$/;
-    }
     print {$zonefiles->{$loc}} "$host  $ttl    IN      AAAA    $val\n" or die $!;
   } # AAAA
@@ -317 +298 @@
 
   elsif ($typemap{$type} eq 'PTR') {
-#    $$recflags{$val}++;
+    $$recflags{$val}++;
     if ($revrec eq 'y') {
 
@@ -352 +333 @@
     # Recurse to PTR or A as appropriate because BIND et al don't share
     # the tinydns concept of merged forward/reverse records
-#    $$recflags{$val}++;
+    $$recflags{$val}++;
     if ($revrec eq 'y') {
       printrec_bind($zonefiles, $recid, $revrec, $loclist, $zone, $host, 12, $val, $distance, $weight, $port, $ttl,
@@ -367 +348 @@
   } # A+PTR
 
+  elsif ($type == 65282) { # PTR template
+    # only useful for v4 with standard DNS software, since this expands all
+    # IPs in $zone (or possibly $val?) with autogenerated records
+    $val = NetAddr::IP->new($val);
+    return if $val->{isv6};
+
+sub __publish_template_bind {
+  my $sub = shift;
+  my $recflags = shift;
+  my $hpat = shift;
+  my $fh = shift;
+  my $ttl = shift;
+  my $stamp = shift;
+  my $loc = shift;
+  my $zone = new NetAddr::IP shift;
+  my $ptrflag = shift || 0;    ##fixme:  default to PTR instead of A record for the BIND variant of this sub?
+
+  # do this conversion once, not (number-of-ips-in-subnet) times
+  my $arpabase = _ZONE($zone, 'ZONE.in-addr.arpa', 'r', '.');
+
+  my $iplist = $sub->splitref(32);
+  my $ipindex = -1;
+  foreach (@$iplist) {
+    my $ip = $_->addr;
+    $ipindex++;
+    # make as if we split the non-octet-aligned block into octet-aligned blocks as with SOA
+    my $lastoct = (split /\./, $ip)[3];
+
+    # Allow smaller entries to override longer ones, eg, a specific PTR will
+    # always publish, overriding any template record containing that IP.
+    # %blank% also needs to be per-IP here to properly cascade overrides with
+    # multiple nested templates
+    next if $$recflags{$ip}; # && $self->{skip_bcast_255}
+    $$recflags{$ip}++;
+    next if $hpat eq '%blank%';
+
+    my $rec = $hpat;  # start fresh with the template for each IP
+##fixme:  there really isn't a good way to handle sub-/24 zones here.  This way at least
+# seems less bad than some alternatives.
+    $dnsdb->_template4_expand(\$rec, $ip, \$sub, $ipindex);
+    # _template4_expand may blank $rec;  if so, don't publish a record
+    next if !$rec;
+##fixme:  trim merged record type voodoo.  "if ($ptrflag) {} else {}" ?
+    if ($ptrflag || $zone->masklen > 24) {
+#      print $fh "^$lastoct.$arpabase:$rec:$ttl:$stamp:$loc\n" or die $!;
+      print $fh "$lastoct.$arpabase    $ttl    IN      PTR     $rec\n" or die $!;
+      if (!$ptrflag) {
+        # print a separate A record.  Arguably we could use an = record here instead.
+#        print $fh "+$rec:$ip:$ttl:$stamp:$loc\n" or die $!;
+      }
+    } else {
+      # A record, not merged
+#      print $fh "=$rec:$ip:$ttl:$stamp:$loc\n" or die $!;
+      print $fh "$rec  $ttl    IN      A       $ip\n" or die $!;
+    }
+  }
+} # __publish_subnet_bind()
+
+    if ($val->masklen <= 16) {
+      foreach my $sub ($val->split(16)) {
+        __publish_subnet($sub, $recflags, $host, $zonefiles->{$loc}, $ttl, $stamp, $loc, $zone, 1);
+      }
+    } else {
+      __publish_subnet($val, $recflags, $host, $zonefiles->{$loc}, $ttl, $stamp, $loc, $zone, 1);
+    }
+  } # PTR template
+
 } # printrec_bind()