Changeset 550 for branches/stable

Timestamp:

11/12/12 17:31:34 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Commit semihack allocate-from-browsed-freeblock changes to stable branch

Location:

branches/stable/cgi-bin

Files:

• IPDB.pm (modified) (1 diff)
• main.cgi (modified) (7 diffs)

branches/stable/cgi-bin/IPDB.pm

@@ -345 +345 @@
 #       and available='y' order by ip limit 1);
 
-      $sth = $dbh->prepare("select ip from poolips where pool='$alloc_from'".
-        " and available='y' order by ip");
-      $sth->execute;
-
-      my @data = $sth->fetchrow_array;
-      $cidr = $data[0];  # $cidr is already declared when we get here!
+# If no specific IP was requested, pick the next available one from the pool.
+      if (!$cidr) {
+        $sth = $dbh->prepare("select ip from poolips where pool='$alloc_from'".
+          " and available='y' order by ip");
+        $sth->execute;
+
+        my @data = $sth->fetchrow_array;
+        $cidr = $data[0];  # $cidr is already declared when we get here!
+      }
 
       $sth = $dbh->prepare("update poolips set custid='$custid',".

branches/stable/cgi-bin/main.cgi

@@ -389 +389 @@
   while (my @data = $sth->fetchrow_array()) {
     my $cidr = new NetAddr::IP $data[0];
-    my @row = ("$cidr", $cidr->range);
+    my @row = (
+        ($IPDBacl{$authuser} =~ /a/ ?
+                qq(<a href="$IPDB::webpath/cgi-bin/main.cgi?action=assign&block=$cidr&fbtype=n">$cidr</a>)
+                : $cidr),
+        $cidr->range);
     printRow(\@row, 'color1' ) if($count%2==0);
     printRow(\@row, 'color2' ) if($count%2!=0);
@@ -544 +548 @@
     #   -> if $data[2] (aka poolips.available) == 'n' then we print the unassign link
     #      else we print a blank space
-    my @row = ( qq(<a href="$IPDB::webpath/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
+    my @row;
+    if ($data[2] eq 'y' && $IPDBacl{$authuser} =~ /a/) {
+      push @row, qq(<a href="$IPDB::webpath/cgi-bin/main.cgi?action=assign&block=$data[0]&fbtype=i">$data[0]</a>);
+    } else {
+      push @row, qq(<a href="$IPDB::webpath/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>);
+    }
+    push @row, (
         $data[1],$data[2],$data[3],
         ( (($data[2] eq 'n') && ($IPDBacl{$authuser} =~ /d/)) ?
@@ -578 +588 @@
     close HTML;
     my $block = new NetAddr::IP $webvar{block};
-    $html =~ s|\$\$BLOCK\$\$|$block|g;
-    $html =~ s|\$\$MASKBITS\$\$|$block->masklen|;
+
     my $typelist = '';
 
@@ -592 +601 @@
     # get fbtype='n' (aka a non-routed freeblock).  However, should
     # someone manage to get there, they get what they deserve.
-    if ($webvar{fbtype} ne 'y') {
-      # Snag the type of the block from the database.  We have no
-      # convenient way to pass this in from the calling location.  :/
-      $sth = $ip_dbh->prepare("select type from allocations where cidr >>='$block'");
-      $sth->execute;
-      my @data = $sth->fetchrow_array;
-      $data[0] =~ s/c$/r/;      # Munge the type into the correct form
-      $typelist = "$list_alloctypes{$data[0]}<input type=hidden name=alloctype value=$data[0]>\n";
-    } else {
+#    if ($webvar{fbtype} ne 'y') {
+#      # Snag the type of the block from the database.  We have no
+#      # convenient way to pass this in from the calling location.  :/
+#      $sth = $ip_dbh->prepare("select type from allocations where cidr >>='$block'");
+#      $sth->execute;
+#      my @data = $sth->fetchrow_array;
+#      $data[0] =~ s/c$/r/;     # Munge the type into the correct form
+#      $typelist = "$list_alloctypes{$data[0]}<input type=hidden name=alloctype value=$data[0]>\n";
+#    } else {
+if ($webvar{fbtype} eq 'n') {
+  $typelist = "Routed netblock<input type=hidden name=alloctype value=rm>\n";
+  $html =~ s|\$\$ALLOCBLOCK\$\$|<input name=block size=25 value="$block">|;
+  $html =~ s|\$\$BLOCK\$\$|$block|g;
+} elsif ($webvar{fbtype} eq 'i') {
+  my ($iptype,$pool) = $ip_dbh->selectrow_array("SELECT type,pool FROM poolips WHERE ip = ?", undef, ($block));
+  $typelist = "$list_alloctypes{$iptype}<input type=hidden name=alloctype value=$iptype>\n";
+  $html =~ s|\$\$ALLOCBLOCK\$\$|$block<input type=hidden name=block size=25 value="$block">|;
+  $html =~ s|\$\$BLOCK\$\$|$pool|g;
+} else {
+  $html =~ s|\$\$ALLOCBLOCK\$\$|<input name=block size=25 value="$block">|;
+  $html =~ s|\$\$BLOCK\$\$|$block|g;
       $typelist .= qq(<select name="alloctype">\n);
       $sth = $ip_dbh->prepare("select type,listname from alloctypes where listorder < 500 ".
-        "and type not like '_i' and type not like '_r' order by listorder");
+        "and type not like '_i' order by listorder");
       $sth->execute;
       my @data = $sth->fetchrow_array;
       $typelist .= "<option value='$data[0]' selected>$data[1]</option>\n";
-      while (my @data = $sth->fetchrow_array) {
+      while (@data = $sth->fetchrow_array) {
         $typelist .= "<option value='$data[0]'>$data[1]</option>\n";
       }
@@ -700 +721 @@
 #  + Different flavours of netblock
 
-  if ($webvar{alloctype} =~ /^.i$/) {
+  if ($webvar{alloctype} =~ /^.i$/ && $webvar{fbassign} ne 'y') {
     my ($base,undef) = split //, $webvar{alloctype};    # split into individual chars
 
@@ -722 +743 @@
 
     if ($webvar{fbassign} eq 'y') {
+      $alloc_from = new NetAddr::IP $webvar{allocfrom};
+## possibly messy behaviour:  force the _from and block to be the network addr?
+      $alloc_from = qq($alloc_from<input type=hidden name=alloc_from value="$alloc_from">);
       $cidr = new NetAddr::IP $webvar{block};
       $webvar{maskbits} = $cidr->masklen;
@@ -790 +814 @@
       }
       $cidr = new NetAddr::IP $data[0];
+
+# this chunk now specific to "guided" allocation;  freeblock-select can now slice-n-dice on its own.
+      $alloc_from = qq($cidr<input type=hidden name=alloc_from value="$cidr">);
+      # If the block to be allocated is smaller than the one we found,
+      # figure out the "real" block to be allocated.
+      if ($cidr->masklen() ne $webvar{maskbits}) {
+        my $maskbits = $cidr->masklen();
+        my @subblocks;
+        while ($maskbits++ < $webvar{maskbits}) {
+          @subblocks = $cidr->split($maskbits);
+        }
+        $cidr = $subblocks[0];
+      }
     } # check for freeblocks assignment or IPDB-controlled assignment
 
-    $alloc_from = qq($cidr<input type=hidden name=alloc_from value="$cidr">);
-
-    # If the block to be allocated is smaller than the one we found,
-    # figure out the "real" block to be allocated.
-    if ($cidr->masklen() ne $webvar{maskbits}) {
-      my $maskbits = $cidr->masklen();
-      my @subblocks;
-      while ($maskbits++ < $webvar{maskbits}) {
-        @subblocks = $cidr->split($maskbits);
-      }
-      $cidr = $subblocks[0];
-    }
+
   } # if ($webvar{alloctype} =~ /^.i$/)