Changeset 695

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.

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (2 diffs)
• cgi-bin/main.cgi (modified) (2 diffs)
• templates/edit.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -1232 +1232 @@
     # have to insert all pool IPs into poolips table as "unallocated".
     $sth = $dbh->prepare("INSERT INTO poolips (ip,custid,city,type,parent_id) VALUES (?,?,?,?,?)");
+
+    # in case of pool extension by some means, we need to see what IPs were already inserted
+    my $tmp1 = $dbh->selectall_arrayref("SELECT ip FROM poolips WHERE parent_id = ?", undef, $parent);
+    my %foundips;
+    foreach (@{$tmp1}) {
+      $foundips{$_->[0]} = 1;
+    }
+
+    # enumerate the hosts in the IP range - everything except the first (net) and last (bcast) IP
     my @poolip_list = $pool->hostenum;
+
+    # always check/add IPs from gw+1 through bcast-1:
+    # (but the set won't be in oooorderrrrr!  <pout>)
+    for (my $i=1; $i<=$#poolip_list; $i++) {
+      $sth->execute($poolip_list[$i]->addr, $pcustid, $city, $type, $parent) unless $foundips{$poolip_list[$i]};
+    }
+
+    # now do the special case - DSL/PPP blocks can use the "net", "gw", and "bcast" IPs.
+    # we exclude .0 and .255 anyway, since while they'll mostly work, they *will* behave badly here and there.
     if ($class eq 'all') { # (DSL-ish block - *all* IPs available
       if ($pool->addr !~ /\.0$/) {      # .0 causes weirdness.
-        $sth->execute($pool->addr, $pcustid, $city, $type, $parent);
-      }
-      for (my $i=0; $i<=$#poolip_list; $i++) {
-        $sth->execute($poolip_list[$i]->addr, $pcustid, $city, $type, $parent);
-      }
+        $sth->execute($pool->addr, $pcustid, $city, $type, $parent) unless $foundips{$pool->addr};
+      }
+      $sth->execute($poolip_list[0]->addr, $pcustid, $city, $type, $parent) unless $poolip_list[0];
       $pool--;
       if ($pool->addr !~ /\.255$/) {    # .255 can cause weirdness.
-        $sth->execute($pool->addr, $pcustid, $city, $type, $parent);
-      }
-    } else { # (real netblock)
-      for (my $i=1; $i<=$#poolip_list; $i++) {
-        $sth->execute($poolip_list[$i]->addr, $pcustid, $city, $type, $parent);
+        $sth->execute($pool->addr, $pcustid, $city, $type, $parent) unless $foundips{$pool->addr};
       }
     }
@@ -1315 +1327 @@
   return ('FAIL', 'No fields to update') if !@fieldlist;
 
-  push @vallist, $args{block};
   my $sql = "UPDATE $updtable SET ";
   $sql .= join " = ?, ", @fieldlist;
-  $sql .= " = ? WHERE $keyfield = ?";
 
   eval {
+    # check for block merge first...
+    if ($args{fbmerge}) {
+      my $cidr = NetAddr::IP->new($binfo->{block});
+      my $newblock = NetAddr::IP->new($cidr->addr, $cidr->masklen - 1)->network;
+      # safety net?  make sure mergeable block passed in is really one or both of
+      # a) reserved for expansion of the block and
+      # b) confirmed CIDR-combinable
+      # "safety? SELECT foo FROM freeblocks WHERE cidr << ? AND masklen(cidr) = ?, $newblock, ".$cidr->masklen."\n";
+      $dbh->do("DELETE FROM freeblocks WHERE id=?", undef, $args{fbmerge});
+      # ... so we can append the change in the stored CIDR field to extend the allocation.
+      $sql .= " = ?, cidr";
+      push @vallist, $newblock;
+      # if we have an IP pool, call initPool to fill in any missing entries in the pool
+      if ($binfo->{type} =~ /^.p$/) {
+        my ($code,$rmsg) = initPool($dbh, "$newblock", $binfo->{type}, $binfo->{city}, 'all', $args{block});
+        die $rmsg if $code eq 'FAIL';
+      } elsif ($binfo->{type} =~ /^.d$/) {
+        my ($code,$rmsg) = initPool($dbh, "$newblock", $binfo->{type}, $binfo->{city}, 'normal', $args{block});
+        die $rmsg if $code eq 'FAIL';
+      }
+    }
+
+    # append another SQL fragment
+    push @vallist, $args{block};
+    $sql .= " = ? WHERE $keyfield = ?";
+
     # do the update
     $dbh->do($sql, undef, @vallist);

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);
 

trunk/templates/edit.tmpl

@@ -21 +21 @@
 <td class="regular"><TMPL_VAR NAME=block></td>
 </tr>
+
+<TMPL_IF reserve>
+<tr>
+<td class="heading">Expand allocation:</td>
+<td>
+<input type="checkbox" name="expandme" value="<TMPL_VAR NAME=reserve_id>">Add <TMPL_VAR NAME=reserve> to make <TMPL_VAR NAME=newblock>
+<input type="hidden" name="newblock" value="<TMPL_VAR NAME=newblock>">
+</td>
+</tr>
+</TMPL_IF>
 
 <tr>