Changeset 185

Timestamp:

03/01/05 16:31:04 (19 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Backport SQL/SQL-related bugfixes from /trunk r180 through 184

Location:

branches/stable/cgi-bin

Files:

• IPDB.pm (modified) (2 diffs)
• ipdb.psql (modified) (3 diffs)
• main.cgi (modified) (1 diff)

branches/stable/cgi-bin/IPDB.pm

@@ -122 +122 @@
 # Return here if we can't select.  Note that this indicates a
 # problem executing the select.
-  my $sth = $dbh->prepare("select cidr from masterblocks");
+  my $sth = $dbh->prepare("select type from alloctypes");
   $sth->execute();
   return (undef,$DBI::errstr) if ($sth->err);
@@ -156 +156 @@
   } else {
     # it connects, try a stmt.
-    my $sth = $dbh->prepare("select cidr from masterblocks");
+    my $sth = $dbh->prepare("select type from alloctypes");
     my $err = $sth->execute();
 

branches/stable/cgi-bin/ipdb.psql

@@ -1 @@
-\connect - postgres
+CREATE DATABASE ipdb;
 
 \connect ipdb ipdb
@@ -49 +49 @@
 
 CREATE TABLE "freeblocks" (
-        "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL PRIMARY KEY
+        "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL PRIMARY KEY,
         "maskbits" integer DEFAULT 128,
         "city" character varying(30) DEFAULT '',
@@ -120 +120 @@
 GRANT ALL on "cities" to "ipdb";
 
+COPY "alloctypes" FROM stdin;
+cd      Static Pool - Cable     Cable pool      41      CBL-BUS
+dp      Static Pool - DSL       DSL pool        42      DSL-BUS
+mp      Static Pool - Dialup    Static dialup pool      43      DIAL-BUS
+wp      Static Pool - Wireless  Static wireless pool    44      WL-BUS
+dc      Dynamic cable block     Dynamic cable block     103     CBL-RES
+dy      Dynamic DSL block       Dynamic DSL block       102     DSL-RES
+dn      Dialup netblock Dialup netblock 101     DIAL-RES
+dw      Dynamic WiFi block      Dynamic WiFi block      104     WL-RES
+mm      Master block    Master block    999     6750400
+rr      Routing Routed netblock 500     6750400
+in      Internal netblock       Internal netblock       990     6750400
+ee      End-use netblock        End-use netblock        100     6750400
+sd      Static Pool - Servers   Server pool     40      6750400
+cn      Customer netblock       Customer netblock       0       
+ci      Static IP - Cable       Static cable IP 21      
+di      Static IP - DSL Static DSL IP   22      
+mi      Static IP - Dialup      Static dialup IP        23      
+wi      Static IP - Wireless    Static wireless IP      24      
+si      Static IP - Server pool Server pool IP  20      6750400
+\.

branches/stable/cgi-bin/main.cgi

@@ -40 +40 @@
 ($ip_dbh,$errstr) = connectDB_My;
 if (!$ip_dbh) {
-  printAndExit("Failed to connect to database: $errstr\n");
-}
-checkDBSanity($ip_dbh);
+  printAndExit("Database error: $errstr\n");
+}
 initIPDBGlobals($ip_dbh);