--- lib/PXElator/httpd.pm	2009/08/11 15:13:19	199
+++ lib/PXElator/httpd.pm	2009/08/17 13:25:48	243
@@ -24,6 +24,8 @@
 <div style="font-size: 80%; color: #888">
 <a href=/>home</a>
 <a href=/server>server</a>
+<a href=/brctl>brctl</a>
+<a href=/ip>ip</a>
 <a href=/client>client</a>
 </div>
 
@@ -49,7 +51,11 @@
 use kvm;
 use browser;
 use network;
+use ip;
+use wireshark;
+use syslogd;
 
+use CouchDB;
 
 sub static {
 	my ($client,$path) = @_;
@@ -61,7 +67,6 @@
 	if ( my $pid = fork ) {
 		# parent
 		close($client);
-		print "http static child $pid\n";
 		$static_pids->{$pid} = $path;
 		return 1;
 	}
@@ -81,7 +86,7 @@
 	my $buff;
 	my $pos = 0;
 
-	warn "static $path $type $size block: $block\n";
+	CouchDB::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost });
 
 	progress_bar::start;
 
@@ -96,8 +101,6 @@
 
 	print STDERR "\n";
 
-	warn "exit static child";
-
 	exit(0);
 }
 
@@ -116,7 +119,7 @@
 
 	server->refresh;
 
-	warn "get_request $path ", $param ? dump( $param ) : '', "\n";
+	CouchDB::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } );
 
 	if ( my $found = static( $client,$path ) ) {
 		warn "static $found" if $debug;
@@ -128,8 +131,10 @@
 
 		my $debug_proc = '';
 
+warn "XXX pids = ", dump( $daemons::pids );
+
 		foreach my $name ( sort keys %$daemons::pids ) {
-			my $pid = $daemons::pids->{$name} || next;
+			my $pid = $daemons::pids->{$name}; # || next;
 
 			my $html;
 
@@ -138,7 +143,7 @@
 			if ( -e $proc ) {
 				$html .= qq|<a href=/start_stop/$name>$pid</a>|;
 				if ( $debug ) {
-					$html .= qq| <a name=$pid href=#proc-$pid>?</a>|;
+					$html .= qq| <a name=$pid href=#proc-$pid>?</a>| if $name->can('start');
 
 					$debug_proc
 						.= qq|<a name=proc-$pid href=#$pid>$proc</a><pre style="font-size: 10%">|
@@ -147,17 +152,27 @@
 						;
 				}
 
-				if ( $name->can('start_fork') ) {
-					$html .= qq| <a href=/start_stop/kvm/$_>$_</a>| foreach $name->start_fork;
+				if ( $name->can('fork_if_active') ) {
+					$html .= qq| <a href=/start_stop/$name/$_>$_</a>| foreach $name->fork_if_active;
 				}
 
 				if ( $name->can('actions') ) {
-					$html .= qq| <a href=/action/kvm/$_>$_</a>| foreach $name->actions;
+					$html .= qq| <a href=/action/$name/$_>$_</a>| foreach $name->actions;
 				}
 			} else {
-				$html .= qq|<a href=/start_stop/$name>restart</a> $pid exited|;
+				if ( $pid =~ m{^\d+$} ) {
+					$html .= qq|$pid exited |
+				} else {
+					$html .= qq|$pid |;
+				}
+				$html .= qq|<a href=/start_stop/$name>restart</a>| if $pid || $name->can('start');
+				if ( $name->can('fork_actions') ) {
+					$html .= qq| <a href=/start_stop/$name/$_>$_</a>| foreach $name->fork_actions;
+				}
 			}
 
+			die "no html generated" unless $html;
+
 			push @rows, ( $name => $html );
 		}
 
@@ -189,6 +204,12 @@
 			;
 	} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
 		my $ip = $1 || $client->peerhost;
+
+		if ( my $new_ip = $param->{change_ip} ) {
+			client::change_ip( $ip, $new_ip );
+			$ip = $new_ip;
+		}
+
 		if ( $ip ne $server::ip ) {
 			my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
 
@@ -199,10 +220,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|<h2>PXElinux</h2>| . html::pre( config::for_ip( $ip ) );
@@ -239,13 +260,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|<a href=/client/$ip>$ip</a>|
 							, client::conf( $ip, 'hostname' )
-							, client::mac( $ip )
+							, format::mac( $mac => 'html' )
 							, html::tt( client::conf( $ip, 'deploy' ) )
 							, $arp
 						);
@@ -256,11 +278,20 @@
 				, 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{^/brctl} ) {
+		print $client ok
+			,html::pre( `brctl show` )
+			;
+	} elsif ( $path =~ m{^/ip/?(\w+)?} ) {
+		print $client ok
+			, join("\n", map { qq|<a href=/ip/$_>$_</a>| } ( 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 $@;
@@ -283,10 +314,10 @@
 
 sub start {
 
-	warn 'tap ', network::tap();
+	warn 'network ', network::setup();
 
 	daemons::start_stop 'browser', $url;
-	daemons::start_stop $_ foreach ( qw/dhcpd tftpd dnsd/ );
+	daemons::start_stop $_ foreach ( qw/dhcpd tftpd dnsd syslogd/ );
 	daemons::start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device
 
 	my $server = IO::Socket::INET->new(