Changeset 866 for trunk

Timestamp:

09/20/22 17:58:38 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

BIND export, unwinding dev saves, 18 of many many

• Move publish_template_bind() out of PTR template block to file-level, since it's called from several blocks, and in any case subs-of-subs aren't actually a thing in Perl as of writing

File:

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

trunk/DNSDB/ExportBIND.pm

@@ -360 +360 @@
     return if $val->{isv6};
 
+    if ($val->masklen <= 16) {
+      foreach my $sub ($val->split(16)) {
+        __publish_template_bind($sub, $recflags, $host, $zonefiles->{$loc}, $ttl, $stamp, $loc, $zone, 1);
+      }
+    } else {
+      __publish_template_bind($val, $recflags, $host, $zonefiles->{$loc}, $ttl, $stamp, $loc, $zone, 1);
+    }
+  } # PTR template
+
+  elsif ($type == 65283) { # A+PTR template
+    $val = NetAddr::IP->new($val);
+    # Just In Case.  An A+PTR should be impossible to add to a v6 revzone via API.
+    return if $val->{isv6};
+
+    if ($val->masklen < 16) {
+      foreach my $sub ($val->split(16)) {
+        __publish_template_bind($sub, $recflags, $host, $zonefiles->{$loc}, $ttl, $stamp, $loc, $zone, 0);
+      }
+    } else {
+      __publish_template_bind($val, $recflags, $host, $zonefiles->{$loc}, $ttl, $stamp, $loc, $zone, 0);
+    }
+  } # A+PTR template
+ 
+  elsif ($type == 65284) { # AAAA+PTR template
+    # Stub for completeness.  Could be exported to DNS software that supports
+    # some degree of internal automagic in generic-record-creation
+    # (eg http://search.cpan.org/dist/AllKnowingDNS/ )
+  } # AAAA+PTR template
+
+} # printrec_bind()
+
+
 sub __publish_template_bind {
   my $sub = shift;
@@ -410 +442 @@
     }
   }
-} # __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
-
-  elsif ($type == 65283) { # A+PTR template
-    $val = NetAddr::IP->new($val);
-    # Just In Case.  An A+PTR should be impossible to add to a v6 revzone via API.
-    return if $val->{isv6};
-
-    if ($val->masklen < 16) {
-      foreach my $sub ($val->split(16)) {
-        $self->__publish_subnet($sub, $recflags, $host, $zonefiles->{$loc}, $ttl, $stamp, $loc, $zone, 0);
-      }
-    } else {
-      $self->__publish_subnet($val, $recflags, $host, $zonefiles->{$loc}, $ttl, $stamp, $loc, $zone, 0);
-    }
-  } # A+PTR template
- 
-  elsif ($type == 65284) { # AAAA+PTR template
-    # Stub for completeness.  Could be exported to DNS software that supports
-    # some degree of internal automagic in generic-record-creation
-    # (eg http://search.cpan.org/dist/AllKnowingDNS/ )
-  } # AAAA+PTR template
-
-} # printrec_bind()
-
+} # __publish_template_bind()
 
 1;