Changeset 574 for trunk

Timestamp:

12/21/12 17:39:09 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Work in progress, see #5:
Tweak initPool(), and calls to initPool(), to properly set rdepth
Also a minor error-reporting cleanup in initPool()

File:

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

trunk/cgi-bin/IPDB.pm

@@ -843 +843 @@
         if ($args{type} =~ /^.p$/) {
           $msg = "Could not initialize IPs in new $disp_alloctypes{$args{type}} $args{cidr}";
-          my ($code,$rmsg) = initPool($dbh, $args{cidr}, $args{type}, $args{city}, "all");
+          my ($code,$rmsg) = initPool($dbh, $args{cidr}, $args{type}, $args{city}, "all", $args{rdepth}+1);
           die $rmsg if $code eq 'FAIL';
         } elsif ($args{type} =~ /^.d$/) {
           $msg = "Could not initialize IPs in new $disp_alloctypes{$args{type}} $args{cidr}";
-          my ($code,$rmsg) = initPool($dbh, $args{cidr}, $args{type}, $args{city}, "normal");
+          my ($code,$rmsg) = initPool($dbh, $args{cidr}, $args{type}, $args{city}, "normal", $args{rdepth}+1);
           die $rmsg if $code eq 'FAIL';
         }
@@ -856 +856 @@
       }
 # end node hack
+
         $dbh->commit;
       }; # end of eval
@@ -920 +921 @@
         if ($args{type} =~ /^.p$/) {
           $msg = "Could not initialize IPs in new $disp_alloctypes{$args{type}} $args{cidr}";
-          my ($code,$rmsg) = initPool($dbh, $args{cidr}, $args{type}, $args{city}, "all");
+          my ($code,$rmsg) = initPool($dbh, $args{cidr}, $args{type}, $args{city}, "all", $args{rdepth}+1);
           die $rmsg if $code eq 'FAIL';
         } elsif ($args{type} =~ /^.d$/) {
           $msg = "Could not initialize IPs in new $disp_alloctypes{$args{type}} $args{cidr}";
-          my ($code,$rmsg) = initPool($dbh, $args{cidr}, $args{type}, $args{city}, "normal");
+          my ($code,$rmsg) = initPool($dbh, $args{cidr}, $args{type}, $args{city}, "normal", $args{rdepth}+1);
           die $rmsg if $code eq 'FAIL';
         }
@@ -959 +960 @@
 # function and should ONLY EVER get called from allocateBlock()
 sub initPool {
-  my ($dbh,undef,$type,$city,$class) = @_;
+  my ($dbh,undef,$type,$city,$class,$rdepth) = @_;
   my $pool = new NetAddr::IP $_[1];
+
+  # IPv6 does not lend itself to IP pools as supported
+  return ('FAIL',"Refusing to create IPv6 static IP pool") if $pool->{isv6};
+  # IPv4 pools don't make much sense beyond even /24.  Allow up to 4096-host footshooting anyway.
+  # NetAddr::IP won't allow more than a /16 (65k hosts).
+  return ('FAIL',"Refusing to create oversized static IP pool") if $pool->masklen <= 20;
 
 ##fixme Need to just replace 2nd char of type with i rather than capturing 1st char of type
@@ -975 +982 @@
   eval {
     # have to insert all pool IPs into poolips table as "unallocated".
-    $sth = $dbh->prepare("insert into poolips (pool,ip,custid,city,type)".
-        " values ('$pool', ?, '$defcustid', ?, '$type')");
+    $sth = $dbh->prepare("INSERT INTO poolips (pool,ip,custid,city,type,rdepth)".
+        " VALUES ('$pool', ?, '$defcustid', ?, '$type', $rdepth)");
     my @poolip_list = $pool->hostenum;
     if ($class eq 'all') { # (DSL-ish block - *all* IPs available
@@ -994 +1001 @@
       }
     }
+    $dbh->commit;
   };
   if ($@) {
-    $msg = $@." '".$sth->errstr."'";
+    $msg = $@;
     eval { $dbh->rollback; };
     return ('FAIL',$msg);