Changeset 936 for trunk

Timestamp:

12/09/22 13:38:37 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix bug with block selection for merge; if the expected resulting block is
the same size as the parent of the "starting" block for the merge, the parent
could be mistakenly included in the merge leaving the result orphaned.

Fix minor bug with listSubs() not tagging master blocks as having subblocks

File:

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

trunk/cgi-bin/IPDB.pm

@@ -288 +288 @@
   my %poolcounter;
   while (my ($oldid, $oldcidr, $oldtype, $oldparent, @oldalloc) = $asth->fetchrow_array) {
+    # don't merge the parent of the allocation selected for merge.
+    # if you really want to go there, start the merge *from* that parent.
+    next if $oldid == $mainparent;
     if ($oldtype =~ /.[enr]/) {
       # Convert leaf allocations to block of pool IP assignments
@@ -1062 +1065 @@
         custid => $custid,
         desc => $desc,
-        hassubs => ($type eq 'rm' || $type =~ /.c/ ? 1 : 0),
+        hassubs => ($type eq 'rm' || $type eq 'mm' || $type =~ /.c/ ? 1 : 0),
         id => $id,
         );