Changeset 79 for trunk

Timestamp:

11/26/04 12:35:43 (20 years ago)

Author:

Kris Deugau

Message:

/trunk

Redesigned error handling in allocateBlock() to return more useful
error messages than DBI provides

File:

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

trunk/cgi-bin/IPDB.pm

@@ -136 +136 @@
   my $alloc_from = new NetAddr::IP $_[2];
   my $sth;
-  my $msg;      # To contain the error message, if any.
+
+  # To contain the error message, if any.
+  my $msg = "Unknown error allocating $cidr as '$type'";
 
   # Enable transactions and error handling
@@ -143 +145 @@
 
   if ($type =~ /^[cdsmw]i$/) {
+    $msg = "Unable to assign static IP $cidr to $custid";
     eval {
       # We'll just have to put up with the oddities caused by SQL (un)sort order
@@ -162 +165 @@
         " where ip='$cidr'");
       $sth->execute;
-##err handle the error
+      $dbh->commit;
     };
     if ($@) {
-      $msg = $@;
       eval { $dbh->rollback; };
       return ('FAIL',$msg);
@@ -181 +183 @@
 
       eval {
+        $msg = "Unable to allocate $cidr as '$disp_alloctypes{$type}'";
         if ($type eq 'rr') {
           $sth = $dbh->prepare("update freeblocks set routed='y',city='$city'".
@@ -200 +203 @@
           # And initialize the pool, if necessary
           if ($type =~ /^.p$/) {
-            my ($pooltype) = ($type =~ /^(.)p$/);
-            # have to insert all pool IPs into poolips table as "unallocated".
-            $sth = $dbh->prepare("insert into poolips values ('$cidr',".
-                " ?, '6750400', '$city', '$pooltype', 'y', '', '', '')");
-            my @poolip_list = $cidr->hostenum;
-            if ($type eq 'dp') { # (DSLish block - *all* IPs available
-              $sth->execute($cidr->addr);
-              for (my $i=0; $i<=$#poolip_list; $i++) {
-                $sth->execute($poolip_list[$i]->addr);
-              }
-              $cidr--;
-              $sth->execute($cidr->addr);
-            } else { # (real netblock)
-              for (my $i=1; $i<=$#poolip_list; $i++) {
-                $sth->execute($poolip_list[$i]->addr);
-              }
-            }
-          } # end type = pool
+            $msg = "Could not initialize IPs in new $disp_alloctypes{$type} pool $cidr";
+            initPool($dbh,$cidr,$type,$city,0);
+          }
+
         } # routing vs non-routing netblock
+
         $dbh->commit;
       }; # end of eval
@@ -250 +240 @@
       # Begin SQL transaction block
       eval {
+        $msg = "Unable to allocate $cidr as '$disp_alloctypes{$type}'";
+
         # Delete old freeblocks entry
         $sth = $dbh->prepare("delete from freeblocks where cidr='$alloc_from'");
@@ -256 +248 @@
         # now we have to do some magic for routing blocks
         if ($type eq 'rr') {
+
           # Insert the new freeblocks entries
           # Note that non-routed blocks are assigned to <NULL>
@@ -262 +255 @@
             $sth->execute("$block", $block->masklen);
           }
+
           # Insert the entry in the routed table
           $sth = $dbh->prepare("insert into routed values ('$cidr',".
@@ -279 +273 @@
             $sth->execute("$block", $block->masklen);
           }
+
           # Insert the allocations entry
           $sth = $dbh->prepare("insert into allocations values ('$cidr',".
@@ -287 +282 @@
           # And initialize the pool, if necessary
           if ($type =~ /^.p$/) {
-            my ($pooltype) = ($type =~ /^(.)p$/);
-            # have to insert all pool IPs into poolips table as "unallocated".
-            $sth = $dbh->prepare("insert into poolips values ('$cidr',".
-                " ?, '6750400', '$city', '$pooltype', 'y', '', '', '')");
-            my @poolip_list = $cidr->hostenum;
-            if ($type eq 'dp') { # (DSLish block - *all* IPs available
-              $sth->execute($cidr->addr);
-              for (my $i=0; $i<=$#poolip_list; $i++) {
-                $sth->execute($poolip_list[$i]->addr);
-              }
-              $cidr--;
-              $sth->execute($cidr->addr);
-            } else { # (real netblock)
-              for (my $i=1; $i<=$#poolip_list; $i++) {
-                $sth->execute($poolip_list[$i]->addr);
-              }
-            }
-          } # end type = pool
+            $msg = "Could not initialize IPs in new $disp_alloctypes{$type} $cidr";
+            initPool($dbh,$cidr,$type,$city,0);
+          }
+
         } # done with netblock alloctype != rr
+
         $dbh->commit;
       }; # end eval
       if ($@) {
-        $msg = $@;
         eval { $dbh->rollback; };
         return ('FAIL',$msg);