--- lib/PXElator/httpd.pm	2009/08/06 15:40:42	159
+++ lib/PXElator/httpd.pm	2009/08/06 22:29:58	173
@@ -17,6 +17,7 @@
 use File::Slurp;
 #use JSON;
 use IO::Socket::INET;
+use Regexp::Common qw/net/;
 
 sub menu {qq{
 
@@ -51,6 +52,7 @@
 use config;
 use client;
 use log;
+use x11;
 
 sub static {
 	my ($client,$path) = @_;
@@ -134,7 +136,7 @@
 			if ( $daemon =~ m{dhcpd|tftpd|dnsd} ) {
 				my $exec = "perl -I$server::base_dir/lib -I$server::base_dir/lib/PXElator -M$daemon -e ${daemon}::${invoke}";
 				warn "exec $exec";
-				exec "xterm -T $daemon -n $daemon -e $exec";
+				x11::xterm( $daemon => $exec );
 			} else {
 				my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')';
 				warn "eval $eval";
@@ -148,7 +150,7 @@
 	}
 }
 
-my $ok =       qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n|;
+my $ok =       qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu();
 my $redirect = qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $url\r\n\r\n|;
 
 sub get_request {
@@ -172,11 +174,12 @@
 		foreach my $name ( sort keys %$pids ) {
 			my $pid = $pids->{$name} || next;
 
-			my $html = qq|<a href=/start_stop/$name>$pid</a>|;
+			my $html;
 
 			my $proc = "/proc/$pid/status";
 
 			if ( -e $proc ) {
+				$html .= qq|<a href=/start_stop/$name>$pid</a>|;
 				if ( $debug ) {
 					$html .= qq| <a name=$pid href=#proc-$pid>?</a>|;
 
@@ -194,6 +197,8 @@
 				if ( $name->can('actions') ) {
 					$html .= qq| <a href=/action/kvm/$_>$_</a>| foreach $name->actions;
 				}
+			} else {
+				$html .= qq|<a href=/start_stop/$name>restart</a> $pid exited|;
 			}
 
 			push @rows, ( $name => $html );
@@ -215,7 +220,6 @@
 		}
 
 		print $client $ok
-			, menu()
 			, html::table( 2, @rows )
 			, $below_table
 			, html::tabs( log::mac_changes )
@@ -224,25 +228,40 @@
 
 	} elsif ( $path =~ m{^/server} ) {
 		print $client $ok
-			, menu()
 			, html::table( 2, map { ( $_, eval '$server::'.$_ ) } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir' ) )
 			;
-	} elsif ( $path =~ m{^/client} ) {
-		my $ip = $client->peerhost;
-		my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
-		my $deploy   = client::conf( $ip, 'deploy'   => $param->{deploy}   );
-		print $client $ok
-			, menu()
-			, qq|<form method=get>|
-			, html::table( 2,
-				'ip' => $ip,
-				'hostname' => qq|<input type=text name=hostname value=$hostname>|,
-				'deploy' => html::select( 'deploy', $deploy, config::available ),
-			)
-			, qq|<input type=submit value=change></form><pre>|
-			, config::for_ip( $ip )
-			, qq|</pre>|
-			;
+	} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
+		my $ip = $1 || $client->peerhost;
+		if ( $ip ne $server::ip ) {
+			my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
+			my $deploy   = client::conf( $ip, 'deploy'   => $param->{deploy}   );
+			print $client $ok
+				, qq|<form method=get>|
+				, html::table( 2,
+					'ip' => $ip,
+					'mac' => client::mac( $ip ),
+					'hostname' => qq|<input type=text name=hostname value=$hostname>|,
+					'deploy' => html::select( 'deploy', $deploy, config::available ),
+				)
+				, qq|<input type=submit value=change></form>|
+				, qq|<h2>PXElinux $deploy</h2><pre>|
+				, config::for_ip( $ip )
+				, qq|</pre>|
+				;
+		} else {
+			print $client $ok
+				, qq|<h2>Clients on $server::ip</h2>|
+				, html::table( -4,
+					'ip', 'mac', 'hostname', 'deploy',
+					map {
+						my $ip = $_;
+						$ip =~ s{^.+/ip/}{};
+						( qq|<a href=/client/$ip>$ip</a>|, client::mac($ip), client::conf( $ip, 'hostname' ), client::conf( $ip, 'deploy' ) );
+					}
+					glob("$server::conf/ip/*") 
+				)
+				;
+		}
 	} elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) {
 		eval 'our $' . $1 . ' = ' . $2;
 		warn $@ if $@;
@@ -256,17 +275,6 @@
 	} elsif ( $path =~ m{^/kill/static/(\d+)} ) {
 		print $client $redirect;
 		kill 1, $1 || kill 9, $2 && warn "killed $1";
- 	} elsif ( $path eq '/exit' ) {
-#		DESTROY;
-		exit 0;
-	} elsif ( $path =~ m{/boot} ) {
-		print $client qq{$ok
-#!gpxe
-imgfree
-login
-chain http://$server::ip:$httpd::port/
-
-			};
 	} else {
 		print $client "HTTP/1.0 404 $path\r\nConnection: close\r\nContent-type: text/html\r\n\r\n<big>404 $path</big>";
 		warn "404 $path";