Changeset 429 for trunk

Timestamp:

07/11/10 11:07:28 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Generalize deallocation of netblocks within a static-IP pool. Still
needs to be tweaked to correctly handle non-PPP pools. (PPP only
requires that .0 and .255 not be handed out, no matter what the CIDR
boundaries; standard netblocks have a network number, gateway, and
broadcast IP that can't be used on any size block.) See #6.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -721 +721 @@
       } # end alloctype general case
 
-      ## Deallocate legacy blocks stashed in the middle of a DSL static IP pool
+      ## Deallocate legacy blocks stashed in the middle of a static IP pool
       ## This may be expandable to an even more general case of contained netblock, or other pool types.
 
@@ -734 +734 @@
         $sth2 = $dbh->prepare("INSERT INTO poolips (pool,ip,city,type,custid) values ".
                 "('$pool',?,'$poolcity','$pooltype','$defcustid')");
+##fixme:  need to not insert net, gateway, and bcast on "real netblock" pools (DHCPish)
         # don't insert .0
-##fixme:  need to not insert .1 on "real netblock" pools (DHCPish)
         $sth2->execute($cidr->addr) unless $cidr->addr =~ m|\.0$|;
         foreach my $ip ($cidr->hostenum) {
@@ -795 +795 @@
       } # done returning IPs to the appropriate place
 
-die "blah, missed the case\n";
       # If we got here, we've succeeded.  Whew!
       $dbh->commit;