Changeset 126 for branches/stable

Timestamp:

01/18/05 13:13:14 (19 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Re-port temporary hack to "properly" deallocate contiguous-IP
DSL "netblocks". Since the code moved from main.cgi to IPDB.pm,
it isn't a simple patch. :/

File:

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

branches/stable/cgi-bin/IPDB.pm

@@ -476 +476 @@
       } # end alloctype general case
 
+##TEMP
+## Temporary wrapper to "properly" deallocate sIP PPPoE/DSL "netblocks" in 209.91.185.0/24
+## Note that we should really general-case this.
+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','Sudbury','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
@@ -521 +541 @@
       $sth->execute;
 
+##TEMP
+}
+##TEMP
+
       # If we got here, we've succeeded.  Whew!
       $dbh->commit;