Changeset 768 for trunk

Timestamp:

08/24/15 18:17:49 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

• Fix getPoolSelect to return the pool ID
• Catch some log-noise-inducing messiness in allocateBlock() on guided allocation of a static IP

File:

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

trunk/cgi-bin/IPDB.pm

@@ -1178 +1178 @@
 
   my $plist = $dbh->selectall_arrayref( q(
-        SELECT count(*) AS poolfree,p.pool AS poolblock, a.city AS poolcit
+        SELECT a.id as poolid,count(*) AS poolfree,a.cidr AS poolblock, a.city AS poolcit
         FROM poolips p
         JOIN allocations a ON p.parent_id=a.id
         WHERE p.available='y' AND a.city = ? AND p.type LIKE ?
-        GROUP BY p.pool,a.city
+        GROUP BY a.id,a.cidr,a.city
+        ORDER BY a.cidr
         ),
         { Slice => {} }, ($pcity, $ptype) );
@@ -1381 +1382 @@
   my %args = @_;
 
-  $args{cidr} = new NetAddr::IP $args{cidr};
+  if ($args{cidr} eq 'Single static IP') {
+    $args{cidr} = '';
+  } else {
+    $args{cidr} = new NetAddr::IP $args{cidr};
+  }
 
   $args{desc} = '' if !$args{desc};
@@ -1393 +1398 @@
   # Could arguably allow this for eg /120 allocations, but end users who get a single v4 IP are
   # usually given a v6 /64, and most v6 addressing schemes need at least half that address space
-  if ($args{cidr}->{isv6} && $args{rdns} =~ /\%/) {
+  if ($args{cidr} && $args{cidr}->{isv6} && $args{rdns} =~ /\%/) {
     return ('FAIL','Reverse DNS template patterns are not supported for IPv6 allocations');
   }
@@ -1426 +1431 @@
           if $isavail eq 'n';
       } else {  # IP not specified, take first available
-        ($args{cidr}) = $dbh->selectrow_array("SELECT ip FROM poolips WHERE pool=? AND available='y' ORDER BY ip",
-                undef, ($args{alloc_from}) );
+        ($args{cidr}) = $dbh->selectrow_array("SELECT ip FROM poolips WHERE parent_id=? AND available='y' ORDER BY ip",
+                undef, ($args{parent}) );
       }
       $dbh->do("UPDATE poolips SET custid = ?, city = ?,available='n', description = ?, notes = ?, ".