Changeset 332 for trunk

Timestamp:

05/09/12 20:22:07 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint updating export for reverse zones. See #26.

• Rework PTR handling for actual storage method used
• Tweak _ZONE (again) so it doesn't chop off a trailing 0 in an IPv6 IP address

File:

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

trunk/DNSDB.pm

@@ -843 +843 @@
       }
       # Split and reverse the order of the nibbles in the network/broadcast IPs
-      $prefix =~ s/0$// if $zone->masklen % 4 == 0;     # trim another 0 for nibble-aligned blocks first
+      # trim another 0 for nibble-aligned blocks first, but only if we really have a block, not an IP
+      $prefix =~ s/0$// if $zone->masklen % 4 == 0 && $zone->masklen != 128;
       my @nbits = reverse split //, $prefix;
       my @bbits = reverse split //, $bc;
@@ -4147 +4148 @@
       } elsif ($typemap{$type} eq 'PTR') {
 
-        # must handle both IPv4 and IPv6
-##work
-        # data should already be in suitable reverse order.
-        print $datafile "^$host:$val:$ttl:$stamp:$loc\n";
+        $zone = NetAddr::IP->new($zone);
+        if (!$zone->{isv6} && $zone->masklen > 24) {
+          ($val) = ($val =~ /\.(\d+)$/);
+          print $datafile "^$val."._ZONE($zone, 'ZONE', 'r', '.').'.in-addr.arpa'.
+                ":$host:ttl:$stamp:$loc\n";
+        } else {
+          $val = NetAddr::IP->new($val);
+          print $datafile "^".
+                _ZONE($val, 'ZONE', 'r', '.').($val->{isv6} ? '.ip6.arpa' : '.in-addr.arpa').
+                ":$host:ttl:$stamp:$loc\n";
+        }
 
       } else {