Changeset 642 for trunk

Timestamp:

10/17/14 16:55:34 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit really old work in admin.cgi adding rDNS

• allocate block

Location:

trunk

Files:

• cgi-bin/admin.cgi (modified) (2 diffs)
• templates/admin/alloc.tmpl (modified) (4 diffs)

trunk/cgi-bin/admin.cgi

@@ -140 +140 @@
 
   my $maskbits = $cidr->masklen;
-  my $fbtmp = findAllocateFrom($ip_dbh, $maskbits, $webvar{alloctype}, '','',
+  my ($fbid, $fb, $fbparent);
+  ($fbid, $fb, $fbparent) = findAllocateFrom($ip_dbh, $maskbits, $webvar{alloctype}, '','',
         (gimme => "$cidr", allowpriv => 1));
-
-  if ($webvar{alloctype} eq 'rm') {
-    if (!$fbtmp) {
+  $page->param(fbid => $fbid);
+  $page->param(parid => $fbparent);
+  my $rdns = getBlockRDNS($ip_dbh, id => $fbparent, type => ($webvar{alloctype} =~ /^.i$/ ? 'i' : 'b'),
+        user => $authuser);
+  $page->param(rdns => $rdns);
+  if ($webvar{alloctype} =~ /^(.)i$/) {
+    my $iptype = $1;
+    my $ptmp = getBlockData($ip_dbh, $fbparent);
+    if ($ptmp->{type} =~ /^(.)[dp]$/) {
+      my $newiptype = "$1i";
+      if ($ptmp->{type} !~ /^$iptype./) {
+        $page->param(warnmsg => "Warning:  Allocating IP as '".$disp_alloctypes{$newiptype}."' instead of '".
+                $disp_alloctypes{$webvar{alloctype}}."' to match pool ".$ptmp->{block}."\n");
+        $webvar{alloctype} = $newiptype;
+      }
+    }
+    if (!$fbid) {
+      $page->param(errmsg => "Can't allocate static IP from outside a pool!!");
+      goto ERRJUMP;
+    }
+  } else {
+    if (!$fbid) {
       $page->param(errmsg => "Can't allocate from outside a free block!!");
       goto ERRJUMP;
     }
-  } elsif ($webvar{alloctype} =~ /^(.)i$/) {
-    my $iptype = $1;
-    my $ptmp = ipParent($ip_dbh, "$cidr");
-    if ($ptmp->{type} =~ /^(.)[dp]$/) {
-      my $newiptype = "$1i";
-      $fbtmp = $ptmp->{cidr};
-      if ($ptmp->{type} !~ /^$iptype./) {
-        $page->param(warnmsg => "Warning:  Allocating IP as '".$disp_alloctypes{$newiptype}."' instead of '".
-                $disp_alloctypes{$webvar{alloctype}}."' to match pool $fbtmp\n");
-        $webvar{alloctype} = $newiptype;
-      }
-    }
-    if (!$fbtmp) {
-      $page->param(errmsg => "Can't allocate static IP from outside a pool!!");
-      goto ERRJUMP;
-    }
-  } else {
-    if (!$fbtmp) {
-      $page->param(errmsg => "Can't allocate from outside a routed block!!");
-      goto ERRJUMP;
-    }
-  }
-
-  my $alloc_from = new NetAddr::IP $fbtmp;
+  }
+
+  my $alloc_from = new NetAddr::IP $fb;
 
   my @cities;
@@ -201 +200 @@
   }
 
-  my ($retcode,$msg) = allocateBlock($ip_dbh, $webvar{cidr}, $webvar{alloc_from},
-        $webvar{custid}, $webvar{alloctype}, $webvar{city}, $webvar{desc}, $webvar{notes},
-        $webvar{circid});
+  my ($retcode,$msg) = allocateBlock($ip_dbh, cidr => $webvar{cidr}, fbid => $webvar{fbid},
+        parent => $webvar{parent}, custid => $webvar{custid}, type => $webvar{alloctype}, city => $webvar{city},
+        desc => $webvar{desc}, notes => $webvar{notes}, circid => $webvar{circid},
+        privdata => $webvar{privdata}, nodeid => $webvar{node}, rdns => $webvar{rdns}, user => $authuser);
+
   if ($retcode eq 'OK') {
     syslog "notice", "$authuser allocated '$webvar{cidr}' to '$webvar{custid}' as ".

trunk/templates/admin/alloc.tmpl

@@ -5 +5 @@
 <form method="POST" action="admin.cgi">
 <fieldset><legend class="noshow">&nbsp;</legend>
+<input type="hidden" name="parent" value="<TMPL_VAR NAME=parid>">
+<input type="hidden" name="fbid" value="<TMPL_VAR NAME=fbid>">
 <table class="regular">
 <tr class="row0">
@@ -19 +21 @@
 </tr>
 <tr class="row1">
+<td>Reverse DNS pattern:</td>
+<td><input type="text" name="rdns" value="<TMPL_VAR NAME=rdns>" size="40"><input type="button" value=" ? " onclick="helpRDNS()" class="regular"></td>
+</tr>
+<tr class="row0">
 <td>Customer ID:</td>
 <td><TMPL_VAR NAME=custid><input type="hidden" name="custid" value="<TMPL_VAR NAME=custid>"></td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td>Customer location:</td>
 <td>
@@ -31 +37 @@
 </td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td>Circuit ID:</td><td><input name="circid" size="40"></td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td>Description/Name:</td><td><input name="desc" size="40"></td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td>Notes:</td><td><textarea name="notes" rows="3" cols="40"></textarea></td>
 </tr>
@@ -43 +49 @@
 <td class="center" colspan="2">WARNING:  This will IMMEDIATELY assign this block!!</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="center" colspan="2"><input type="submit" value="  Assign  "></td>
 </tr>