Changeset 102 for branches

Timestamp:

12/07/04 17:56:43 (20 years ago)

Author:

Kris Deugau

Message:

/branches/stable

TEMPORARY change to "properly" deallocate static IP blocks
from 209.91.185.0/24

File:

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

branches/stable/cgi-bin/main.cgi

@@ -1554 +1554 @@
       } # end alloctype general case
 
+##TEMP
+## Temporary wrapper to "properly" deallocate sIP PPPoE/DSL "netblocks" in 209.91.185.0/24
+my $staticpool = new NetAddr::IP "209.91.185.0/24";
+##TEMP
+if ($cidr->within($staticpool)) {
+##TEMP
+  # We've already deleted the block, now we have to stuff its IPs into the pool.
+  $sth = $ip_dbh->prepare("insert into poolips values ('209.91.185.0/24',?,'6750400','','d','y','','','')");
+  $sth->execute($cidr->addr);
+  foreach my $ip ($cidr->hostenum) {
+    $sth->execute("$ip");
+  }
+  $cidr--;
+  $sth->execute($cidr->addr);
+
+##TEMP
+} else {
+##TEMP
+
       # Now we look for larger-or-equal-sized free blocks in the same master (routed)
       # (super)block. If there aren't any, we can't combine blocks anyway.  If there
@@ -1599 +1618 @@
       $sth->execute;
 
+##TEMP
+}
+##TEMP
+
       # If we got here, we've succeeded.  Whew!
       $ip_dbh->commit;