Changeset 300

Timestamp:

11/16/05 18:01:10 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweaked code to make it more friendly to outside calls to create
allocations.
-> Check for allocfrom now only applies if it's defined
-> Static IPs do not have /32 tagged on (no need for it)
-> Core/WAN, routed DSL, server pools/statics, and DSL pools/statics

are all forced to "choose" Sudbury as the POP. This is how our
routing works, after all...

File:

• trunk/cgi-bin/main.cgi (modified) (3 diffs)

trunk/cgi-bin/main.cgi

@@ -742 +742 @@
             " chose a smaller blocksize.";
         }
-        if ($webvar{allocfrom} ne '-') {
+        if (defined $webvar{allocfrom} && $webvar{allocfrom} ne '-') {
           $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
                 " and cidr <<= '$webvar{allocfrom}' and routed='".
@@ -847 +847 @@
   if ($code eq 'OK') {
     if ($webvar{alloctype} =~ /^.i$/) {
+      $msg =~ s|/32||;
       print qq(<div class="center"><div class="heading">The IP $msg has been allocated to customer $webvar{custid}</div>).
         ($webvar{alloctype} eq 'di' ?
@@ -918 +919 @@
   } else {
     $flag = 'n';
+    if ($webvar{alloctype} =~ /[wp][cr]|[ds][pi]/) {
+      # Set this forcibly rather than messing around elsewhere.  Yes, this *is* a hack.  PTHBTT!!
+      $webvar{pop} = 'Sudbury';
+    }
     if ($webvar{pop} =~ /^-$/) {
       $flag = 'to route the block from/through';