Changeset 696 for trunk/cgi-bin

Timestamp:

02/13/15 17:35:24 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix most of the edge cases for initPool() being called on extending a
pool. Callers would be responsible for cleaning up parent_id in the
case of eg "merge pools". See #24.

File:

• trunk/cgi-bin/IPDB.pm (modified) (3 diffs)

trunk/cgi-bin/IPDB.pm

@@ -1240 +1240 @@
     }
 
+# Dodge an edge case - pool where IPs have been "stolen" and turned into a netblock assignment.
+# We can't just "get all the current IPs, and add the missing ones", because some IPs are
+# legitimately missing (for stretchy values of "legitimately").
+
+    my $pdata = getBlockData($dbh, $parent);
+    my $pcidr = new NetAddr::IP $pdata->{block};
+
+    if ($pcidr != $pool) {
+      # enumerate the IPs from the *old* pool, flag them as "found", so we can iterate the entire
+      # requested pool and still make sure we skip the IPs in the old pool - even if they've been
+      # "stolen" by legacy netblocks.
+      my @oldips = $pcidr->hostenum;
+      # decide whether to start excluding existing IPs at the "gateway" or "gateway+1"
+      my $ostart = ($pdata->{type} =~ /^.d$/ ? 1 : 0);
+      for (my $i = $ostart;  $i<= $#oldips; $i++) {
+        $foundips{$oldips[$i]} = 1;
+      }
+    }
+
     # enumerate the hosts in the IP range - everything except the first (net) and last (bcast) IP
     my @poolip_list = $pool->hostenum;
@@ -1246 +1265 @@
     # (but the set won't be in oooorderrrrr!  <pout>)
     for (my $i=1; $i<=$#poolip_list; $i++) {
-      $sth->execute($poolip_list[$i]->addr, $pcustid, $city, $type, $parent) unless $foundips{$poolip_list[$i]};
+      my $baseip = $poolip_list[$i]->addr;
+      if ($baseip !~ /\.(?:0|255)$/ && !$foundips{$poolip_list[$i]}) {
+        $sth->execute($baseip, $pcustid, $city, $type, $parent);
+      }
     }
 
@@ -1255 +1277 @@
         $sth->execute($pool->addr, $pcustid, $city, $type, $parent) unless $foundips{$pool->addr};
       }
-      $sth->execute($poolip_list[0]->addr, $pcustid, $city, $type, $parent) unless $poolip_list[0];
+      $sth->execute($poolip_list[0]->addr, $pcustid, $city, $type, $parent) unless $foundips{$poolip_list[0]};
       $pool--;
       if ($pool->addr !~ /\.255$/) {    # .255 can cause weirdness.