Changeset 899 for trunk

Timestamp:

11/29/16 16:43:32 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix subtle bug in splitBlock() - if there was a free block at the beginning
of a container block to be split, that itself would need to be split, it
would end up deleted instead. This affected eg a /24 with .128/25 assigned,
and .0/25 free split into /26 or smaller (the .0 free block would go
missing), or a /24 with two /25 containers with no further allocations split
into /26 or smaller (both the resulting .0 and .128 free blocks would go
missing).

File:

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

trunk/cgi-bin/IPDB.pm

@@ -2247 +2247 @@
       my @nbset = $pr->{cidr}->split($args{newmask});
 
-      # set up update of existing block
+      # update existing block
       $dbh->do("UPDATE allocations SET cidr = ? WHERE id = ?", undef, ("$nbset[0]", $pr->{id}) );
 
@@ -2320 +2320 @@
 
       if (%fbdel) {
+        # pretty sure this SELECT result isn't used...
         my $delfblist = $dbh->selectall_arrayref(q{
             SELECT cidr,parent_id,id FROM freeblocks
             WHERE id in (
             }.join(',', keys %fbdel).")", {Slice=>{}} );
-        $dbh->do("DELETE FROM freeblocks WHERE id IN (".join(',', keys %fbdel).")") if %fbdel;
+        foreach my $fbd (keys %fbdel) {
+          $dbh->do("UPDATE freeblocks SET cidr = set_masklen(cidr, ?) WHERE id = ?", undef, $args{newmask}, $fbd);
+        }
       }