--- lib/PXElator/httpd.pm 2009/09/08 20:21:25 401 +++ lib/PXElator/httpd.pm 2009/09/10 13:08:36 419 @@ -39,12 +39,13 @@ sub menu { qq{
-home -server -brctl -ip -nmap -client +home +server +brctl +ip +nmap +client +couchdb
}} @@ -85,6 +86,8 @@ return if ! -f $full; + return if $full =~ m{\.ico$}; + if ( my $pid = fork ) { # parent close($client); @@ -215,9 +218,13 @@ } } + my $kvm = kvm::next_nr; + $kvm = qq|
create new kvm $kvm
|; + print $client ok , html::table( 2, @rows ) , $below_table + , $kvm , html::tabs( log::mac_changes ) , $debug_proc ; @@ -252,7 +259,7 @@ } elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) { my $ip = $1; - $title = $ip; + $title = $ip if $ip; if ( $param->{action} eq 'remove' ) { client::remove( $param->{change_ip} ); @@ -349,8 +356,10 @@ . '"' if $ping; $style ||= ''; + my $ip_text = qq|$ip|; + $ip_text = qq|$ip| if ip::in_dhcp_range($ip); ( - qq|$ip| + qq|$ip_text| , format::mac( $mac => 'html' ) , $arp->{$mac} , delete $conf->{hostname} @@ -456,7 +465,7 @@ my $server = IO::Socket::INET->new( Proto => 'tcp', - LocalAddr => $server::ip, +# LocalAddr => $server::ip, LocalPort => $httpd::port, Listen => SOMAXCONN, Reuse => 1 @@ -465,6 +474,7 @@ print "url $url\n"; syslogd::install_local; + client::rebuild_mac_links; while (1) { my $client = $server->accept() || next; # ALARM trickle us