Changeset 897 for trunk

Timestamp:

08/08/25 12:36:19 (21 hours ago)

Author:

Kris Deugau

Message:

/trunk

(Nearly?-)final piece of the puzzle implementing ALIAS - retrieve and
publish AAAA records (at least for tinydns export). See #55.

File:

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

trunk/DNSDB.pm

@@ -1679 +1679 @@
   $res->tcp_timeout(2);
   $res->udp_timeout(2);
-  my $reply = $res->query($target);
+  # send() returns a Net::DNS::Packet which may or may not be entirely empty, we'll see in the loop below
+  my $arecs = $res->send($target, 'A');
+  my $aaaarecs = $res->send($target,'AAAA');
 
   my $liveips = '';
-  if ($reply) {
-    # default to a one-hour TTL, which should be variously modified down the chain.  Arguably this could
-    # default even lower, since "The Cloud" often uses sub-1-minute TTLs on the final A records.
-    my $minttl = 3600;
-    my @newlist;
-    foreach my $rr ($reply->answer) {  #@alist) {
-      next unless $rr->type eq "A" || $rr->type eq "AAAA";
-      push @newlist, $rr->address;
-      $minttl = $rr->ttl if $rr->ttl < $minttl;
-    }
+  # default to a one-hour TTL, which should be variously modified down the chain.  Arguably this could
+  # default even lower, since "The Cloud" often uses sub-1-minute TTLs on the final A records.
+  my $minttl = 3600;
+  my @newlist;
+  foreach my $rr ($arecs->answer, $aaaarecs->answer) {
+    next unless $rr->type eq "A" || $rr->type eq "AAAA";
+    push @newlist, $rr->address;
+    $minttl = $rr->ttl if $rr->ttl < $minttl;
+  }
+  if (@newlist) {
     # safety limit.  could arguably take this lower, or for extra
     # complexity, reference off the zone SOA minTTL
     $minttl = 60 if $minttl < 60;
     # we don't need this to be perfectly correct IP address order, just consistent.
-    $liveips = "$minttl:".join(';', sort(@newlist)) if @newlist;
-#fixme:  should it be a formal error case if there are no A records returned?
+    $liveips = "$minttl;".join(';', sort(@newlist)) if @newlist;
+#fixme:  should it be a formal error case if there are no A/AAAA records returned?
   } else {
     $errstr = "Lookup failure retrieving ALIAS IP list: ".$res->errorstring;
@@ -7189 +7191 @@
     my $attl = shift @asubs;
 
-    # output a plain old A record for each IP the target name really points to.
-    # in the event that, for whatever reason, no A records are available for $val, nothing will be output.
+    # output a plain old A or AAAA record for each IP the target name really points to.
+    # in the event that, for whatever reason, no A/AAAA records are available for $val, nothing will be output.
     foreach my $subip (@asubs) {
-      print $datafile "+$host:$subip:$attl:$stamp:$loc\n" or die $!;
+      if ($subip =~ /\d+\.\d+\.\d+\.\d+/) {
+        print $datafile "+$host:$subip:$attl:$stamp:$loc\n" or die $!;
+      } else {
+        $self->_printrec_tiny($datafile, $recid, 'n', $recflags, $self->domainName($self->_hostparent($host)),
+                $host, 28, $subip, $dist, $weight, $port, $attl, $loc, $stamp);
+      }
     }
   } # ALIAS