Changeset 189 for trunk

Timestamp:

03/08/05 17:37:46 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Caught some buglets in the HairyPerl(TM) ('$1' vs "$1")
Corrected a potentially annoying SQL buglet relating to the

selection of which netblock an allocation is to be taken from;
under certain conditions it would pick a larger block to slice
up while there was still a perfectly usable block just the
right size waiting to be allocated.

Removed display of back-end alloctypes from success/failure notes
Corrected comments referring to alloctypes that have been altered
Updated IPDB "default" schema and alloctypes list with current

base information

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (4 diffs)
• ipdb.psql (modified) (3 diffs)
• main.cgi (modified) (4 diffs)

trunk/cgi-bin/IPDB.pm

@@ -332 +332 @@
           $sth->execute;
 
-        } else { # done with alloctype == rr
+        } else { # done with alloctype == rm
 
           # Insert the new freeblocks entries
@@ -339 +339 @@
           $sth = $dbh->prepare("insert into freeblocks (cidr,maskbits,city,routed)".
                 " values (?, ?, (select city from routed where cidr >>= '$cidr'),'".
-                (($type =~ /^(.)r$/) ? '$1' : 'y')."')");
+                (($type =~ /^(.)r$/) ? "$1" : 'y')."')");
           foreach my $block (@newfreeblocks) {
             $sth->execute("$block", $block->masklen);
@@ -370 +370 @@
           }
 
-        } # done with netblock alloctype != rr
+        } # done with netblock alloctype != rm
 
         $dbh->commit;
@@ -577 +577 @@
                 " values ('$cidr',".$cidr->masklen.
                 ",(select city from routed where cidr >>= '$cidr'),'".
-                (($type =~ /^(.)r$/) ? '$1' : 'y')."')");
+                (($type =~ /^(.)r$/) ? "$1" : 'y')."')");
       }
       $sth->execute;

trunk/cgi-bin/ipdb.psql

@@ -120 +120 @@
 GRANT ALL on "cities" to "ipdb";
 
+--
+-- Selected TOC Entries:
+--
+\connect - ipdb
+
+--
+-- TOC Entry ID 2 (OID 92809)
+--
+-- Name: alloctypes Type: TABLE Owner: ipdb
+--
+
+CREATE TABLE "alloctypes" (
+        "type" character(2) DEFAULT '' NOT NULL,
+        "listname" character varying(40) DEFAULT '',
+        "dispname" character varying(40) DEFAULT '',
+        "listorder" integer DEFAULT 0,
+        "def_custid" character varying(16) DEFAULT '',
+        Constraint "alloctypes_pkey" Primary Key ("type")
+);
+
+--
+-- TOC Entry ID 3 (OID 92809)
+--
+-- Name: alloctypes Type: ACL Owner: 
+--
+
+REVOKE ALL on "alloctypes" from PUBLIC;
+GRANT ALL on "alloctypes" to "kdeugau";
+GRANT ALL on "alloctypes" to "ipdb";
+
+--
+-- Data for TOC Entry ID 4 (OID 92809)
+--
+-- Name: alloctypes Type: TABLE DATA Owner: ipdb
+--
+
+
 COPY "alloctypes" FROM stdin;
 cd      Static Pool - Cable     Cable pool      41      CBL-BUS
@@ -125 +162 @@
 mp      Static Pool - Dialup    Static dialup pool      43      DIAL-BUS
 wp      Static Pool - Wireless  Static wireless pool    44      WL-BUS
-ce      Dynamic cable block     Dynamic cable block     103     CBL-RES
-de      Dynamic DSL block       Dynamic DSL block       102     DSL-RES
-me      Dialup netblock Dialup netblock 101     DIAL-RES
-we      Dynamic WiFi block      Dynamic WiFi block      104     WL-RES
 mm      Master block    Master block    999     6750400
-rm      Routing Routed netblock 500     6750400
 in      Internal netblock       Internal netblock       990     6750400
-en      End-use netblock        End-use netblock        100     6750400
 sd      Static Pool - Servers   Server pool     40      6750400
 cn      Customer netblock       Customer netblock       0       
@@ -143 +174 @@
 wr      Internal WAN block      Internal WAN block      201     6750400
 pc      Reserve for dynamic-route DSL netblocks Dynamic-route netblocks 202     6750400
+en      End-use netblock        End-use netblock        100     6750400
+me      Dialup netblock Dialup netblock 101     DIAL-RES
+de      Dynamic DSL block       Dynamic DSL block       102     DSL-RES
+ce      Dynamic cable block     Dynamic cable block     103     CBL-RES
+we      Dynamic WiFi block      Dynamic WiFi block      104     WL-RES
+rm      Routing Routed netblock 500     6750400
 pr      Dynamic-route DSL netblock      Dynamic-route DSL       203     
 \.

trunk/cgi-bin/main.cgi

@@ -890 +890 @@
           $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
                 " and cidr <<= '$webvar{allocfrom}' and routed='".
-                (($webvar{alloctype} =~ /^(.)r$/) ? '$1' : 'y')."' order by cidr,maskbits desc";
+                (($webvar{alloctype} =~ /^(.)r$/) ? "$1" : 'y')."' order by maskbits desc,cidr";
         } else {
           $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
-                " and routed='".(($webvar{alloctype} =~ /^(.)r$/) ? '$1' : 'y').
-                "' order by cidr,maskbits desc";
+                " and routed='".(($webvar{alloctype} =~ /^(.)r$/) ? "$1" : 'y').
+                "' order by maskbits desc,cidr";
         }
       }
@@ -976 +976 @@
     } else {
       print qq(<div class="center"><div class="heading">The block $webvar{fullcidr} was ).
-        "sucessfully added as type '$webvar{alloctype}' ".
-        "($disp_alloctypes{$webvar{alloctype}})</div></div>";
+        "sucessfully added as: $disp_alloctypes{$webvar{alloctype}}</div></div>";
     }
     syslog "notice", "$authuser allocated '$webvar{fullcidr}' to '$webvar{custid}' as ".
@@ -984 +983 @@
     syslog "err", "Allocation of '$webvar{fullcidr}' to '$webvar{custid}' as ".
         "'$webvar{alloctype}' by $authuser failed: '$msg'";
-    printError("Allocation of $webvar{fullcidr} as $disp_alloctypes{$webvar{alloctype}}".
+    printError("Allocation of $webvar{fullcidr} as '$disp_alloctypes{$webvar{alloctype}}'".
         " failed:<br>\n$msg\n");
   }
@@ -1232 +1231 @@
     $desc = "N/A";
     $notes = "N/A";
-  } elsif ($webvar{alloctype} =~ /^.i$/) { # done with alloctype=rr
+  } elsif ($webvar{alloctype} =~ /^.i$/) { # done with alloctype=[rm]m
 
     # Unassigning a static IP