--- lib/PXElator/httpd.pm 2009/08/12 22:56:45 207 +++ lib/PXElator/httpd.pm 2009/08/16 00:03:30 225 @@ -24,6 +24,7 @@
@@ -49,6 +50,8 @@ use kvm; use browser; use network; +use ip; +use wireshark; use CouchDB; @@ -63,7 +66,6 @@ # parent close($client); $static_pids->{$pid} = $path; - CouchDB::audit('static', 'parent', { pid => $pid, path => $path }); return 1; } @@ -82,7 +84,7 @@ my $buff; my $pos = 0; - CouchDB::audit( 'static', 'child', { pid => $$, path => $path, type => $type, size => $size, block => $block }); + CouchDB::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost }); progress_bar::start; @@ -97,8 +99,6 @@ print STDERR "\n"; - CouchDB::audit( 'static', 'child', 'exit', { pid => $$ } ); - exit(0); } @@ -117,7 +117,7 @@ server->refresh; - CouchDB::audit( 'request', { path => $path, param => $param } ); + CouchDB::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } ); if ( my $found = static( $client,$path ) ) { warn "static $found" if $debug; @@ -139,7 +139,7 @@ if ( -e $proc ) { $html .= qq|$pid|; if ( $debug ) { - $html .= qq| ?|; + $html .= qq| ?| if $name->can('start'); $debug_proc .= qq|$proc| @@ -148,15 +148,18 @@ ; } - if ( $name->can('start_fork') ) { - $html .= qq| $_| foreach $name->start_fork; + if ( $name->can('fork_if_active') ) { + $html .= qq| $_| foreach $name->fork_if_active; } if ( $name->can('actions') ) { - $html .= qq| $_| foreach $name->actions; + $html .= qq| $_| foreach $name->actions; } } else { - $html .= qq|restart $pid exited|; + $html .= qq|restart $pid exited| if $name->can('start'); + if ( $name->can('fork_actions') ) { + $html .= qq| $_| foreach $name->fork_actions; + } } push @rows, ( $name => $html ); @@ -206,10 +209,10 @@ my $deploy; - if ( my $mac = client::mac( $ip ) ) { + if ( my $mac = client::mac_from_ip( $ip ) ) { $deploy = client::conf( $ip, 'deploy' => $param->{deploy} ); push @table, ( - 'mac' => $mac, + 'mac' => format::mac( $mac => 'html' ), 'deploy' => html::select( 'deploy', $deploy, config::available ) ); $deploy = qq|PXElinux
| . html::pre( config::for_ip( $ip ) ); @@ -246,13 +249,14 @@ map { my $ip = $_; $ip =~ s{^.+/ip/}{}; - my $arp = $arp->{ client::mac $ip, 'clean' }; + my $mac = client::mac_from_ip $ip; + my $arp = $arp->{ $mac }; $arp = $arp ? $arp->[1] : ''; $arp =~ s{$ip}{}; ( qq|$ip| , client::conf( $ip, 'hostname' ) - , client::mac( $ip ) + , format::mac( $mac => 'html' ) , html::tt( client::conf( $ip, 'deploy' ) ) , $arp ); @@ -263,11 +267,16 @@ , html::table( -3, 'mac', 'dev', 'ip', map { my $c = $arp->{$_}; - ( html::tt( $_ ), $c->[1], $c->[0] ) + ( format::mac( $_ => 'html' ), $c->[1], $c->[0] ) } sort keys %$arp ) ; } + } elsif ( $path =~ m{^/ip/?(\w+)?} ) { + print $client ok + , join("\n", map { qq|$_| } ( qw/link addr route neigh ntable tunnel maddr mroute xfrm/ )) + , ip::html( $1 ) + ; } elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) { eval 'our $' . $1 . ' = ' . $2; warn $@ if $@;