Changeset 708 for trunk

Timestamp:

03/09/16 14:09:07 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Refine TXT record export because of Stupid Clients Wot Ought Not To Be
Handling DNS. Some client libraries apparently get grumpy about TXT
records being split at 127 characters, which tinydns does automatically
on its native handling for TXT rcords. Add an option to generate
"generic" records split at 255 characters instead.

Location:

trunk

Files:

• DNSDB.pm (modified) (4 diffs)
• dnsdb.conf (modified) (1 diff)

trunk/DNSDB.pm

@@ -222 +222 @@
                 template_skip_0 => 0,   # publish .0 by default
                 template_skip_255       => 0,   # publish .255 by default
+                # allow TXT records to be dealt with mostly automatically by DNS server?
+                autotxt         => 1,
         );
 
@@ -252 +254 @@
   # Several settings are booleans.  Handle multiple possible ways of setting them.
   for my $boolopt ('log_failures', 'force_refresh', 'lowercase', 'usecache',
-        'template_skip_0', 'template_skip_255') {
+        'template_skip_0', 'template_skip_255', 'autotxt') {
     if ($self->{$boolopt} ne '1' && $self->{$boolopt} ne '0') {
       # true/false, on/off, yes/no all valid.
@@ -1852 +1854 @@
       $cfg->{template_skip_0}   = $1 if /^template_skip_0\s*=\s*([a-z01]+)/i;
       $cfg->{template_skip_255} = $1 if /^template_skip_255\s*=\s*([a-z01]+)/i;
+      $cfg->{autotxt}           = $1 if /^force_refresh\s*=\s*([a-z01]+)/i;
 # not supported in dns.cgi yet
 #      $cfg->{templatedir}      = $1 if m{^templatedir\s*=\s*([a-z0-9/_.-]+)}i;
@@ -6264 +6267 @@
 # trying to interpret DNS data at all.
 
-    print $datafile ":$host:16:";
-    my @txtsegs = $val =~ /.{1,255}/g;
-    foreach (@txtsegs) {
-      my $len = length($_);
-      s/:/\\072/g;
-      printf $datafile "\\%0.3o%s", $len, $_;
-    }
-    print $datafile ":$ttl:$stamp:$loc\n";
-
-#    $val =~ s/:/\\072/g;       # may need to replace other symbols
-#make this an option?
-#    print $datafile "'$host:$val:$ttl:$stamp:$loc\n" or die $!;
+    if ($self->{autotxt}) {
+      # let tinydns deal with splitting the record.  note tinydns autosplits at 127
+      # characters, not 255.  Because Reasons.
+      $val =~ s/:/\\072/g;      # may need to replace other symbols
+      print $datafile "'$host:$val:$ttl:$stamp:$loc\n" or die $!;
+    } else {
+      print $datafile ":$host:16:";
+      my @txtsegs = $val =~ /.{1,255}/g;
+      foreach (@txtsegs) {
+        my $len = length($_);
+        s/:/\\072/g;
+        printf $datafile "\\%0.3o%s", $len, $_;
+      }
+      print $datafile ":$ttl:$stamp:$loc\n";
+    }
 
 # by-hand TXT

trunk/dnsdb.conf

@@ -49 +49 @@
 #showrev_arpa = 0
 
+# Let DNS server autosplit long TXT records however it pleases, or hand-generate the split points?
+#autosplit = 1
 
 ## General RPC options