Changeset 775 for trunk/cgi-bin

Timestamp:

09/25/15 17:08:32 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Further tweak splitBlock() to handle a contained block the same size as
its container - may be a common case in legacy data. Still leaves more
deeply nested same-sized container trees hanging but those should be
rare enough than manual intervention can patch it up well enough. See #7.

File:

• trunk/cgi-bin/IPDB.pm (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -1983 +1983 @@
     }
 
-    @processlist = sort { $b->{cidr}->masklen <=> $a->{cidr}->masklen } @processlist;
+    # Sort on masklen, crudely break ties by pushing container blocks down the stack.  Multiple-nested containers
+    # of the same size are virtually guaranteed to produce strange results, but should be rare enough to not matter
+    @processlist = sort { $b->{cidr}->masklen <=> $a->{cidr}->masklen || $a->{type} =~ /^.m$/ } @processlist;
 
     foreach my $pr (@processlist) {