Changeset 506 for branches

Timestamp:

11/15/11 17:20:49 (13 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Minor bugfixes for IPv6

Location:

branches/stable/cgi-bin

Files:

• admin.cgi (modified) (1 diff)
• extras/db2rwhois.pl (modified) (1 diff)
• main.cgi (modified) (2 diffs)

branches/stable/cgi-bin/admin.cgi

@@ -133 +133 @@
   # OK, we know what we're allocating.
 
-  if ($webvar{cidr} !~ /^\s*(\d{1,3}\.){3}\d{1,3}(\/\d{2})?\s*$/) {
-    printAndExit("Can't allocate something that's not a netblock/ip");
-  }
+#  if ($webvar{cidr} !~ /^\s*(\d{1,3}\.){3}\d{1,3}(\/\d{2})?\s*$/) {
+#    printAndExit("Can't allocate something that's not a netblock/ip");
+#  }
 
   $sth = $ip_dbh->prepare("select def_custid from alloctypes where type='$webvar{alloctype}'");

branches/stable/cgi-bin/extras/db2rwhois.pl

@@ -74 +74 @@
         "not (cidr <<= '10.0.0.0/8') and ".
         "not (type = 'wr') and ".
-        "masklen(cidr) <=30 and ".
+        "((masklen(cidr) <=30 and family(cidr)=4) or (masklen(cidr) <=56 and family(cidr)=6)) and ".
         "cidr <<= ?");
 

branches/stable/cgi-bin/main.cgi

@@ -437 +437 @@
     # Prefix subblocks with "Sub "
     my @row = ( (($data[2] =~ /^.r$/) ? 'Sub ' : '').
-        qq(<a href="/ip/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
+        qq(<a href="/ip/cgi-bin/main.cgi?action=edit&block=$data[0]&reallyblock=1">$data[0]</a>),
         $data[1], $disp_alloctypes{$data[2]}, $data[3], 
         ($data[4] eq 'y' ? ($ncust == 0 ? 'Yes<small>*</small>' : 'Yes') : 'No'), $data[5]);
@@ -996 +996 @@
   # Two cases:  block is a netblock, or block is a static IP from a pool
   # because I'm lazy, we'll try to make the SELECT's bring out identical)ish) data
-  if ($webvar{block} =~ /\/32$/) {
+  if ($webvar{block} =~ /\/32$/ && !$webvar{reallyblock}) {
     $sql = "select ip,custid,type,city,circuitid,description,notes,modifystamp,privdata,oldcustid from poolips where ip='$webvar{block}'";
   } else {