Changeset 449

Timestamp:

01/10/13 17:18:52 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix bug in location export; tinydns uses octet-truncated prefixes,
not CIDR netblocks. If a CIDR is entered, iterate over the /8s,
/16s, /24s, or /32s to create the actual entries.
Also silently bail on IPv6 locations; as of writing tinydns does
not support IPv6 for this capability.

File:

• trunk/DNSDB.pm (modified) (1 diff)

trunk/DNSDB.pm

@@ -4624 +4624 @@
     foreach my $ipprefix (split /[,\s]+/, $lochash->{$location}{iplist}) {
       $ipprefix =~ s/\s+//g;
-      print $datafile "%$location:$ipprefix\n";
+      $ipprefix = new NetAddr::IP $ipprefix;
+##fixme:  how to handle IPv6?
+next if $ipprefix->{isv6};
+      # have to account for /nn CIDR entries.  tinydns only speaks octet-sliced prefix.
+      if ($ipprefix->masklen <= 8) {
+        foreach ($ipprefix->split(8)) {
+          my $tmp = $_->addr;
+          $tmp =~ s/\.\d+\.\d+\.\d+$//;
+          print $datafile "%$location:$tmp\n";
+        }
+      } elsif ($ipprefix->masklen <= 16) {
+        foreach ($ipprefix->split(16)) {
+          my $tmp = $_->addr;
+          $tmp =~ s/\.\d+\.\d+$//;
+          print $datafile "%$location:$tmp\n";
+        }
+      } elsif ($ipprefix->masklen <= 24) {
+        foreach ($ipprefix->split(24)) {
+          my $tmp = $_->addr;
+          $tmp =~ s/\.\d+$//;
+          print $datafile "%$location:$tmp\n";
+        }
+      } else {
+        foreach ($ipprefix->split(32)) {
+          print $datafile "%$location:".$_->addr."\n";
+        }
+      }
     }
     print $datafile "%$location\n" if !$lochash->{$location}{iplist};