Changeset 428 for trunk

Timestamp:

07/08/10 18:07:09 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint - this change still needs testing
Trim reference to ViaNet IP ranges in IPDB.pm (see #26) by

generalizing netblock-in-DSL-pool deallocation (part of #6)

Note the diff is larger than the real change due to whitespace shuffling

File:

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

trunk/cgi-bin/IPDB.pm

@@ -721 +721 @@
       } # 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',?,'$defcustid','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
-      # are, we check to see if we can combine blocks.
-      # Execute the statement prepared in the if-else above.
-
-      $sth->execute;
+      ## Deallocate legacy blocks stashed in the middle of a DSL static IP pool
+      ## This may be expandable to an even more general case of contained netblock, or other pool types.
+
+      # Find out if the block we're deallocating is within a DSL pool
+      my $sth2 = $dbh->prepare("SELECT cidr,city,type FROM allocations WHERE type LIKE '_p' AND cidr >>= ?");
+      $sth2->execute("$cidr");
+      my ($pool,$poolcity,$pooltype) = $sth2->fetchrow_array;
+
+      if ($pool || $sth2->rows) {
+        # We've already deleted the block, now we have to stuff its IPs into the pool.
+        $pooltype =~ s/p$/i/;   # change type to static IP
+        $sth2 = $dbh->prepare("INSERT INTO poolips (pool,ip,city,type,custid) values ".
+                "('$pool',?,'$poolcity','$pooltype','$defcustid')");
+        # 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) {
+          $sth2->execute("$ip");
+        }
+        $cidr--;
+        # don't insert .255
+        $sth2->execute($cidr->addr) unless $cidr->addr =~ m|\.255$|;
+      } else {  # done returning IPs from a block to a static DSL pool
+
+        # 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
+        # are, we check to see if we can combine blocks.
+        # Execute the statement prepared in the if-else above.
+
+        $sth->execute;
 
 # NetAddr::IP->compact() attempts to produce the smallest inclusive block
@@ -756 +760 @@
 #       $cidr=.32/27, $ip1=.96/27, $ip2=.0/27, and $ip3=.64/27.
 
-      my (@together, @combinelist);
-      my $i=0;
-      while (my @data = $sth->fetchrow_array) {
-        my $testIP = new NetAddr::IP $data[0];
-        @together = $testIP->compact($cidr);
-        my $num = @together;
-        if ($num == 1) {
-          $cidr = $together[0];
-          $combinelist[$i++] = $testIP;
+        my (@together, @combinelist);
+        my $i=0;
+        while (my @data = $sth->fetchrow_array) {
+          my $testIP = new NetAddr::IP $data[0];
+          @together = $testIP->compact($cidr);
+          my $num = @together;
+          if ($num == 1) {
+            $cidr = $together[0];
+            $combinelist[$i++] = $testIP;
+          }
         }
-      }
-
-      # Clear old freeblocks entries - if any.  They should all be within
-      # the $cidr determined above.
-      $sth = $dbh->prepare("delete from freeblocks where cidr <<='$cidr'");
-      $sth->execute;
-
-      # insert "new" freeblocks entry
-      if ($type eq 'rm') {
-        $sth = $dbh->prepare("insert into freeblocks (cidr,maskbits,city)".
+
+        # Clear old freeblocks entries - if any.  They should all be within
+        # the $cidr determined above.
+        $sth = $dbh->prepare("delete from freeblocks where cidr <<='$cidr'");
+        $sth->execute;
+
+        # insert "new" freeblocks entry
+        if ($type eq 'rm') {
+          $sth = $dbh->prepare("insert into freeblocks (cidr,maskbits,city)".
                 " values ('$cidr',".$cidr->masklen.",'<NULL>')");
-      } else {
-        # Magic hackery to insert "correct" data for deallocation of
-        # non-contained blocks allocated from within a container.
-        $type = 'pr' if $con_type && $con_type eq 'pc';
-
-        $sth = $dbh->prepare("insert into freeblocks (cidr,maskbits,city,routed)".
+        } else {
+          # Magic hackery to insert "correct" data for deallocation of
+          # non-contained blocks allocated from within a container.
+          $type = 'pr' if $con_type && $con_type eq 'pc';
+
+          $sth = $dbh->prepare("insert into freeblocks (cidr,maskbits,city,routed)".
                 " values ('$cidr',".$cidr->masklen.
                 ",(select city from routed where cidr >>= '$cidr'),'".
                 (($type =~ /^(.)r$/) ? "$1" : 'y')."')");
-      }
-      $sth->execute;
-
-##TEMP
-}
-##TEMP
-
+        }
+        $sth->execute;
+
+      } # done returning IPs to the appropriate place
+
+die "blah, missed the case\n";
       # If we got here, we've succeeded.  Whew!
       $dbh->commit;
     }; # end eval
     if ($@) {
+      $msg = $@;
       eval { $dbh->rollback; };
       return ('FAIL', $msg);