Changeset 834 for trunk/DNSDB.pm

Timestamp:

04/19/22 16:34:34 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

Accumulated tinkering on compact-recs.pl, part 1

• Switch module-finding blob to latest theoretically-good form. See #80.
• Fix broken handling of "n'th natural IP" on compaction, possibly also on export
• Trim some development comments

File:

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

trunk/DNSDB.pm

@@ -1798 +1798 @@
   my $tmpl = shift;
   my $ip = shift;
-  my $subnet = shift;   # for %ngb and %c
+  my $subnet = shift;   # %ngb, %c, and %x
   my $ipindex = shift;  # for %c
 
@@ -1842 +1842 @@
 
     if ($cn) {
-      # "natural n'th IP in the block" pattern
-      $$tmpl =~ s/$cn/$ipindex+1/e;
+      # "n'th natural IP in the block" pattern.
+      my $iptmp = new NetAddr::IP $ip;
+      my $natdex = scalar($iptmp - $$subnet);
+      $natdex++;
+      $$tmpl =~ s/$cn/$natdex/;
     }