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

Timestamp:

01/06/05 15:03:33 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

SQL cleanup:

• Made liberal use of "<<=" operator and "where" for DBMS-layer CIDR comparisons
• Made liberal use of "select count(*) from ... where ..." in place of much more cumbersome "select * from ..." constructs

General code cleanup:

• Better SQL allowed removal of a number of "if $cidr->contains($block)" constructs
• Removed some unnecessary code originally added to fit existing legacy code
• Cleaned up comments (indenation consistency, notes on DB fields)
• Added a few ##fixme tags where the intended function and execution aren't clear, or don't quite work correctly in some odd edge cases
• Moved %allocated, %free, %routed, %bigfree hashes to IPDB.pm as globals

File:

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

trunk/cgi-bin/IPDB.pm

@@ -23 +23 @@
 @EXPORT_OK    = qw(
         %disp_alloctypes %list_alloctypes @citylist @poplist @masterblocks
+        %allocated %free %routed %bigfree
         &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock &deleteBlock
         &mailNotify
@@ -30 +31 @@
 %EXPORT_TAGS    = ( ALL => [qw(
                 %disp_alloctypes %list_alloctypes @citylist @poplist @masterblocks
+                %allocated %free %routed %bigfree
                 &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock
                 &deleteBlock &mailNotify
@@ -43 +45 @@
 our @poplist;
 our @masterblocks;
+our %allocated;
+our %free;
+our %routed;
+our %bigfree;
 
 # Let's initialize the globals.
@@ -77 +83 @@
   for (my $i=0; my @data = $sth->fetchrow_array(); $i++) {
     $masterblocks[$i] = new NetAddr::IP $data[0];
+    $allocated{"$masterblocks[$i]"} = 0;
+    $free{"$masterblocks[$i]"} = 0;
+    $bigfree{"$masterblocks[$i]"} = 128; # Larger number means smaller block.
+                                        # Set to 128 to prepare for IPv6
+    $routed{"$masterblocks[$i]"} = 0;
   }
   return (undef,$sth->errstr) if $sth->err;