Changeset 106 for trunk/cgi-bin/IPDB.pm

Timestamp:

12/22/04 16:25:59 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

IPDB rewrite, first stable iteration.

-> uses allocateBlock(), deleteBlock() from IPDB module rather

than hardcoding that in the web script

-> uses global variables from IPDB module for "static" data such

as allocation types and ities (which are loaded from the
database in much the same way that master blocks have been loaded)

-> IPDB.pm contains NO locally-exiting code, nor calls to any code

which exits before returning. This allows returning status codes
to the caller, so that things like database handles can be
properly cleaned up.

There are probably also a long list of minor bugfixes that I've forgotten.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -21 +21 @@
 $VERSION        = 2.0;
 @ISA            = qw(Exporter);
-@EXPORT_OK      = qw(&initIPDBGlocals &connectDB &finish &checkDBSanity &allocateBlock
-                        &deleteBlock &mailNotify);
+@EXPORT_OK    = qw(
+        %disp_alloctypes %list_alloctypes @citylist @poplist @masterblocks
+        &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock &deleteBlock
+        &mailNotify
+        );
 
 @EXPORT         = (); # Export nothing by default.
-%EXPORT_TAGS    = ( ALL => [qw( &initIPDBGlocals &connectDB &finish &checkDBSanity
-                                &allocateBlock &deleteBlock &mailNotify)]
-                  );
+%EXPORT_TAGS    = ( ALL => [qw(
+                %disp_alloctypes %list_alloctypes @citylist @poplist @masterblocks
+                &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock
+                &deleteBlock &mailNotify
+                )]
+        );
 
 ##
@@ -36 +42 @@
 our @citylist;
 our @poplist;
+our @masterblocks;
 
 # Let's initialize the globals.
@@ -44 +51 @@
   my $sth;
 
-  # Initialize alloctypes list
-  $sth = $dbh->prepare("select type,dispname from alloctypes");
+  # Initialize alloctypes hashes
+  $sth = $dbh->prepare("select * from alloctypes order by listorder");
   $sth->execute;
-  return (undef,$sth->errstr) if $sth->err;
   while (my @data = $sth->fetchrow_array) {
-    $disp_alloctypes{$data[0]} = $data[1];
+    $disp_alloctypes{$data[0]} = $data[2];
+    if ($data[3] < 900) {
+      $list_alloctypes{$data[0]} = $data[1];
+    }
   }
 
@@ -56 +65 @@
   $sth->execute;
   return (undef,$sth->errstr) if $sth->err;
-  my $i = 0;
-  my $j = 0;
   while (my @data = $sth->fetchrow_array) {
-    $citylist[$i++] = $data[0];
+    push @citylist, $data[0];
     if ($data[1] eq 'y') {
-      $poplist[$j++] = $data[0];
+      push @poplist, $data[0];
     }
   }
+
+  # Master block list
+  $sth = $dbh->prepare("select * from masterblocks order by cidr");
+  $sth->execute;
+  for (my $i=0; my @data = $sth->fetchrow_array(); $i++) {
+    $masterblocks[$i] = new NetAddr::IP $data[0];
+  }
+  return (undef,$sth->errstr) if $sth->err;
 
   return (1,"OK");
@@ -117 +132 @@
 
 
+## IPDB::checkDBSanity()
 # Quick check to see if the db is responding.  A full integrity
 # check will have to be a separate tool to walk the IP allocation trees.
 sub checkDBSanity {
-  my $dbh = connectDB();
+  my ($dbh) = $_[0];
 
   if (!$dbh) {
-    print "Cannot connect to the database!";
+    print "No database handle, or connection has been closed.";
+    return -1;
   } else {
     # it connects, try a stmt.
@@ -134 +151 @@
     } else {
       print "Connected to the database, but could not execute test statement.  ".$sth->errstr();
+      return -1;
     }
   }
   # Clean up after ourselves.
-  $dbh->disconnect;
+#  $dbh->disconnect;
 } # end checkDBSanity
 
@@ -187 +205 @@
       return ('FAIL',$msg);
     } else {
-      return ('OK',"OK");
+      return ('OK',"$cidr");
     }