Index: trunk/cgi-bin/admin.cgi =================================================================== --- trunk/cgi-bin/admin.cgi (revision 58) +++ trunk/cgi-bin/admin.cgi (revision 65) @@ -3,4 +3,5 @@ # Hack interface to make specific changes to IPDB that (for one reason # or another) can't be made through the main interface. +# ### # SVN revision info @@ -9,4 +10,5 @@ # Last update by $Author$ ### +# Copyright (C) 2004 - Kris Deugau use strict; @@ -85,4 +87,6 @@ Manually update allocation data in this /24: + +
List IP Pools for manual tweaking and updates ); } else { @@ -120,6 +124,45 @@ $webvar{custid}, $webvar{city}, $webvar{desc}, $webvar{notes}); #my ($dbh,from,block,$type,$custid,$city,$desc,$notes) = @_; -} else { - print "webvar{action} check failed"; +} elsif ($webvar{action} eq 'showpools') { + print "IP Pools currently allocated:\n". + "\n\n"; + $sth = $ip_dbh->prepare("select cidr from allocations where type like '%p' order by cidr"); + $sth->execute; + my %poolfree; + while (my @data = $sth->fetchrow_array) { + $poolfree{$data[0]} = 0; + } + $sth = $ip_dbh->prepare("select pool,ip from poolips where available='y' order by ip"); + $sth->execute; + while (my @data = $sth->fetchrow_array) { + $poolfree{$data[0]}++; + } + foreach my $key (keys %poolfree) { + print qq(). + "\n"; + } + print "
Pool# of free IPs
$key$poolfree{$key}
\n"; +} elsif ($webvar{action} eq 'tweakpool') { + showPool($webvar{pool}); +} elsif ($webvar{action} eq 'updatepool') { + $sth = $ip_dbh->prepare("update poolips set custid='$webvar{custid}', ". + "city='$webvar{city}', ptype='$webvar{ptype}', available='". + (($webvar{available} eq 'y') ? 'y' : 'n'). + "', notes='$webvar{notes}', description='$webvar{desc}' ". + "where ip='$webvar{ip}'"); + $sth->execute; + if ($sth->err) { + print "Error updating pool IP $webvar{ip}: $@
\n"; + syslog "err", "$authuser could not update pool IP $webvar{ip}: $@"; + } else { + $sth = $ip_dbh->prepare("select pool from poolips where ip='$webvar{ip}'"); + $sth->execute; + my @data = $sth->fetchrow_array; + print "$webvar{ip} in $data[0] updated\n
\n"; + syslog "notice", "$authuser updated pool IP $webvar{ip}"; + } + showPool("$data[0]"); +#} else { +# print "webvar{action} check failed: $webvar{action}"; } @@ -155,7 +198,32 @@ my $block = new NetAddr::IP $_[2]; - # First, figure out what free blocks will get mangled. + local $ip_dbh->{AutoCommit} = 0; # enable transactions, if possible + local $ip_dbh->{RaiseError} = 1; # Use local to limit to this sub + if ($from eq $block) { - # Whee! Easy. Just allocate the block + eval { + # common stuff for end-use, dialup, dynDSL, pools, etc, etc. + + $sth = $ip_dbh->prepare("delete from freeblocks where cidr='$block'"); + $sth->execute; + + # Insert the allocations entry + $sth = $ip_dbh->prepare("insert into allocations values ('$block',". + "'$custid','$type','$city','$desc','$notes',".$block->masklen.")"); + $sth->execute; + + $ip_dbh->commit; + }; # end of eval + if ($@) { + carp "Transaction aborted because $@"; + eval { $ip_dbh->rollback; }; + syslog "err", "Allocation of '$webvar{fullcidr}' to '$webvar{custid}' as ". + "'$webvar{alloctype}' by $authuser failed: '$@'"; + printAndExit("Allocation of $cidr as $full_alloc_types{$webvar{alloctype}} failed.\n"); + } else { + syslog "notice", "$authuser allocated '$block' to '$custid'". + " as '$webvar{alloctype}'"; + print "Block $block allocated to $custid.
\n"; + } } else { # The complex case. An allocation from a larger block. @@ -176,36 +244,37 @@ # insert the data here. Woo. - # Begin SQL transaction block - eval { - # Delete old freeblocks entry - $sth = $ip_dbh->prepare("delete from freeblocks where cidr='$from'"); - $sth->execute(); - - # Insert the new freeblocks entries - $sth = $ip_dbh->prepare("insert into freeblocks values (?, ?, ". - "(select city from routed where cidr >>= '$block'),'y')"); - foreach my $block (@newfreeblocks) { - $sth->execute("$block", $block->masklen); - } - # Insert the allocations entry - $sth = $ip_dbh->prepare("insert into allocations values ('$block',". - "'$custid','$type','$city','$desc','$notes',".$block->masklen.")"); - $sth->execute; - - $ip_dbh->commit; - }; # end eval - if ($@) { - carp "Transaction aborted because $@"; - eval { $ip_dbh->rollback; }; - syslog "err", "Allocation of '$block' to '$custid' as ". - "'$type' by $authuser failed: '$@'"; - print "Allocation of $block as $full_alloc_types{$type} failed.\n"; - } else { - syslog "notice", "$authuser allocated '$block' to '$custid'". - " as '$type'"; - print "OK!
\n"; + # Begin SQL transaction block + eval { + # Delete old freeblocks entry + $sth = $ip_dbh->prepare("delete from freeblocks where cidr='$from'"); + $sth->execute(); + + # Insert the new freeblocks entries + $sth = $ip_dbh->prepare("insert into freeblocks values (?, ?, ". + "(select city from routed where cidr >>= '$block'),'y')"); + foreach my $block (@newfreeblocks) { + $sth->execute("$block", $block->masklen); } - - } + # Insert the allocations entry + $sth = $ip_dbh->prepare("insert into allocations values ('$block',". + "'$custid','$type','$city','$desc','$notes',".$block->masklen.")"); + $sth->execute; + + $ip_dbh->commit; + }; # end eval + if ($@) { + carp "Transaction aborted because $@"; + eval { $ip_dbh->rollback; }; + syslog "err", "Allocation of '$block' to '$custid' as ". + "'$type' by $authuser failed: '$@'"; + print "Allocation of $block as $full_alloc_types{$type} failed.\n"; + } else { + syslog "notice", "$authuser allocated '$block' to '$custid'". + " as '$type'"; + print "Block $block allocated to $custid.
\n"; + } # done OK?/NOK! check after DB changes + + } # done "hard" allocation case. + # need to get /24 that block is part of my @bits = split /\./, $webvar{block}; @@ -213,4 +282,5 @@ showAllocs((join ".", @bits)); } + # List free blocks in a /24 for arbitrary manual allocation @@ -298,5 +368,5 @@ carp "Transaction aborted because $@"; eval { $ip_dbh->rollback; }; - syslog "err", "$authuser could not update block/IP '$webvar{block}': '$@'"; + syslog "err", "$authuser could not update block '$webvar{block}': '$@'"; } else { # If we get here, the operation succeeded. @@ -309,2 +379,36 @@ showAllocs((join ".", @bits)); } + + +# showPool() +# List all IPs in a pool, and allow arbitrary admin changes to each +# Allow changes to ALL fields +sub showPool($) { + my $pool = new NetAddr::IP $_[0]; + print qq(Listing pool $pool:\n + + + + + + + + + +). + "
Customer ID:
Customer location:
Type:
Available?
Description/name:
Notes:
Update the following record:\n"; + $sth = $ip_dbh->prepare("select * from poolips where pool='$pool' order by ip"); + $sth->execute; + while (my @data = $sth->fetchrow_array) { + print qq(). + "". + "\n"; + } + print "
$data[1]$data[2]$data[3]$data[4]$data[5]$data[6]$data[7]
\n"; +}