--- lib/PXElator/httpd.pm	2009/08/15 22:38:02	224
+++ lib/PXElator/httpd.pm	2009/08/19 11:02:15	262
@@ -24,6 +24,7 @@
 <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>
@@ -51,6 +52,8 @@
 use browser;
 use network;
 use ip;
+use wireshark;
+use syslogd;
 
 use CouchDB;
 
@@ -122,14 +125,14 @@
 		warn "static $found" if $debug;
 	} elsif ( $path eq '/' ) {
 
-		my @rows = (
-			'debug',	qq|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
-		);
+		my @rows;
 
 		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 +141,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 +150,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 );
 		}
 
@@ -185,7 +198,12 @@
 
 	} elsif ( $path =~ m{^/server} ) {
 		print $client ok
-			, html::table( 2, map { ( $_, html::tt eval '$server::'.$_ ) } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir', 'conf' ) )
+			, html::table( 2,
+				'debug' => qq|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
+				 map {
+					( $_, html::tt eval '$server::'.$_ )
+				 } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir', 'conf' )
+			)
 			;
 	} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
 		my $ip = $1 || $client->peerhost;
@@ -222,7 +240,7 @@
 				;
 
 			if ( my $amt = client::conf( $ip, 'amt' ) ) {
-				print $client qq|<h2>AMT</h2>|, amt::info( $amt );
+				print $client qq|<h2>AMT</h2>|, amt::info( $amt, $ip );
 			}
 		} else {
 
@@ -268,6 +286,10 @@
 				)
 				;
 		}
+	} 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/ ))
@@ -295,10 +317,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(