Changeset 695 for trunk/cgi-bin/main.cgi

Timestamp:

02/13/15 12:26:44 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Mostly fix up edge case of extending an IP pool allocation. See #24.

File:

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

trunk/cgi-bin/main.cgi

@@ -904 +904 @@
   $page->param(vlan     => $blockinfo->{vlan});
 
+  # Reserved-for-expansion
+  $page->param(reserve  => $blockinfo->{reserve});
+  $page->param(reserve_id => $blockinfo->{reserve_id});
+  my $newblock = NetAddr::IP->new($cidr->addr, $cidr->masklen - 1)->network;
+  $page->param(newblock => $newblock);
+
   # not happy with the upside-down logic, but...
   $page->param(swipable => $blockinfo->{type} !~ /.i/);
@@ -961 +967 @@
   }
 
+  # Merge with reserved freeblock
+  $updargs{fbmerge} = $webvar{expandme} if $webvar{expandme};
+
   my ($code,$msg) = updateBlock($ip_dbh, %updargs, iprev => \%iprev);