Changeset 404 for trunk

Timestamp:

05/11/10 18:05:54 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge "temporary" fix-up-the-IP-pool deallocation hack. See #13.

This will be regularized and integrated down the road since it's
likely that legacy data may show the same constructs, and there
are probably advantages to *creating* similar allocations new.

See #6.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -704 +704 @@
       } # 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.
+  my $sth2 = $dbh->prepare("insert into poolips values ('209.91.185.0/24',?,'6750400','Sudbury','di','y','','','')");
+  $sth2->execute($cidr->addr);
+  foreach my $ip ($cidr->hostenum) {
+    $sth2->execute("$ip");
+  }
+  $cidr--;
+  $sth2->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
@@ -751 +771 @@
       }
       $sth->execute;
+
+##TEMP
+}
+##TEMP
 
       # If we got here, we've succeeded.  Whew!