Changeset 78

Timestamp:

11/23/04 17:44:12 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Updated allocBlock() to properly handle and return errors
"Temporarily" copy-pasted initPool() code into allocBlock()

-> Depending on real functionality, this may become permanent. :(

File:

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

trunk/cgi-bin/IPDB.pm

@@ -22 +22 @@
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(&initIPDBGlocals &connectDB &finish &checkDBSanity &allocateBlock
-                        &initPool &mailNotify);
+                        &mailNotify);
 
 @EXPORT         = (); # Export nothing by default.
-%EXPORT_TAGS    = ( ALL => [qw( &initIPDBGlocals &connectDB &checkDBSanity
-                                &allocateBlock &initPool &mailNotify)]
+%EXPORT_TAGS    = ( ALL => [qw( &initIPDBGlocals &connectDB &finish &checkDBSanity
+                                &allocateBlock &mailNotify)]
                   );
 
@@ -136 +136 @@
   my $alloc_from = new NetAddr::IP $_[2];
   my $sth;
+  my $msg;      # To contain the error message, if any.
 
   # Enable transactions and error handling
@@ -164 +165 @@
     };
     if ($@) {
-      # failure
+      $msg = $@;
+      eval { $dbh->rollback; };
+      return ('FAIL',$msg);
     } else {
-      # success
+      return ('OK',"OK");
     }
 
   } else { # end IP-from-pool allocation
-    # Set $cidr here as it may not be a valid IP address elsewhere.
-#    my $cidr = new NetAddr::IP $webvar{fullcidr};
 
     if ($cidr == $alloc_from) {
@@ -189 +190 @@
         } else {
           # common stuff for end-use, dialup, dynDSL, pools, etc, etc.
-##err How to handle pools?
-##workhere
-#print "IPDB.pm: $cidr\n";
           $sth = $dbh->prepare("delete from freeblocks where cidr='$cidr'");
           $sth->execute;
@@ -199 +197 @@
                 $cidr->masklen.",'$circid')");
           $sth->execute;
-## if $type =~ /^[cdsmw]p$/ initpool($dbh,$cidr,$type)
+
+          # 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
         } # routing vs non-routing netblock
         $dbh->commit;
-      };  # end of eval
-##err
+      }; # end of eval
       if ($@) {
+        $msg = $@;
         eval { $dbh->rollback; };
-        return (2,$@);
+        return ('FAIL',$@);
       } else {
-## do we return here or ?
-        return (1,"OK");
-        # Success
-      } # error handler
+        return ('OK',"OK");
+      }
 
     } else { # cidr != alloc_from
@@ -268 +284 @@
                 ",'$circid')");
           $sth->execute;
-##err do we initPool here, or force the caller to do it?
-# Flexibility says we let the caller do it, to allow more options.
+
+          # 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
         } # done with netblock alloctype != rr
         $dbh->commit;
       }; # end eval
       if ($@) {
+        $msg = $@;
         eval { $dbh->rollback; };
-        return (2,$@);
+        return ('FAIL',$msg);
       } else {
-##err
-        return (1,"OK");
+        return ('OK',"OK");
       }
 
@@ -293 +328 @@
 # indicating whether the pool should allow allocation of literally every
 # IP, or if it should reserve network/gateway/broadcast IPs
+# Note that this is NOT done in a transaction, that's why it's a private
+# function and should ONLY EVER get called from allocateBlock()
 sub initPool {
   my ($dbh,undef,$type,$city,$class) = @_;
   my $pool = new NetAddr::IP $_[1];
 
-  my $pooltype = ($type =~ /^(.)p$/);
+  my ($pooltype) = ($type =~ /^(.)p$/);
   my $sth;
 
-  # Enable transactions and error handling
-  local $dbh->{AutoCommit} = 0; # These need to be local so we don't
-  local $dbh->{RaiseError} = 1; # step on our toes by accident.
-
-  # Begin SQL transaction block
-  eval {
-    # have to insert all pool IPs into poolips table as "unallocated".
-    $sth = $dbh->prepare("insert into poolips values ('$pool',".
+  # have to insert all pool IPs into poolips table as "unallocated".
+  $sth = $dbh->prepare("insert into poolips values ('$pool',".
         " ?, '6750400', '$city', '$pooltype', 'y', '', '', '')");
-    my @poolip_list = $pool->hostenum;
-    if ($class) { # (real netblock)
-      for (my $i=1; $i<=$#poolip_list; $i++) {
-        $sth->execute($poolip_list[$i]->addr);
-      }
-    } else { # (DSL-ish block - *all* IPs available
-      $sth->execute($pool->addr);
-      for (my $i=0; $i<=$#poolip_list; $i++) {
-        $sth->execute($poolip_list[$i]->addr);
-      }
-      $pool--;
-      $sth->execute($pool->addr);
+  my @poolip_list = $pool->hostenum;
+  if ($class eq 'all') { # (DSL-ish block - *all* IPs available
+    $sth->execute($pool->addr);
+    for (my $i=0; $i<=$#poolip_list; $i++) {
+      $sth->execute($poolip_list[$i]->addr);
     }
-    $dbh->commit;
-  }; # end eval
-  if ($@) {
-    eval { $dbh->rollback; };
-print "$@\n";
-    return (2,"$@");
-  } else {
-##err
-    return (1,"OK");
+    $pool--;
+    $sth->execute($pool->addr);
+  } else { # (real netblock)
+    for (my $i=1; $i<=$#poolip_list; $i++) {
+      $sth->execute($poolip_list[$i]->addr);
+    }
   }
-
 } # end initPool()