Changeset 745

Timestamp:

06/16/15 17:47:30 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Add a flag to _toPool() to indicate whether to return all of the
allocations converted. Defaults to "off", but required so that rDNS
deletes can be called with the complete list of leaf blocks converted.
Also return type code of merged/returned blocks for further internal
processing.
See #8.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -229 +229 @@
   my $convblock = shift;  # May be smaller than the block referenced by $poolparent
   my $pooltype = shift;
+  my $retall = shift || 0;
 
   # there is probably a way to avoid the temporary $foo here
@@ -283 +284 @@
         $poolcounter{"$newip"}++;
       }
-    } elsif ($oldalloc[2] =~ /.[dp]/) {
+    } elsif ($oldtype =~ /.[dp]/) {
       # Reparent IPs in an existing pool, and rewrite their type
       $updsth->execute($poolparent, $poolclass.'i', $oldid);
@@ -294 +295 @@
     $delsth->execute($oldid) unless $oldid == $poolparent;
     # Return the converted blocks, but only the immediate peers, not the entire tree
-    push @retlist, { block => $oldcidr, mtype => $disp_alloctypes{$oldtype} }
-        if $oldparent == $mainparent;
-  }
+    push @retlist, { block => $oldcidr, mdisp => $disp_alloctypes{$oldtype}, mtype => $oldtype }
+        if (($oldparent == $mainparent) || $retall) && $oldid != $poolparent;
+  } # while $asth->fetch
+
   return \@retlist;
 } # end _toPool()