--- lib/PXElator/httpd.pm	2009/07/30 14:16:59	57
+++ lib/PXElator/httpd.pm	2009/07/30 21:31:30	67
@@ -19,45 +19,64 @@
 use IO::Socket::INET;
 use Module::Refresh;
 
+our $pids = { httpd => $$ };
+
+sub DESTROY {
+	warn "pids ",dump( $pids );
+	foreach ( values %$pids ) {
+		warn "kill $_";
+		kill 1,$_ || kill 9, $_;
+	}
+}
+
 our $port = 7777;
-our $debug = 1;
 
 use server;
-our $url = "http://$server::ip:$port/";
+our $debug = server::debug;
+our $url = "http://$server::ip:$port";
 
 use html;
 
 sub static {
 	my ($client,$path) = @_;
 
-	$path = "tftp/$path";
+	my $full = "$server::base_dir/tftp/$path";
 
-	if ( ! -e $path ||  -d $path ) {
-		print $client "HTTP/1.0 404 $path not found\r\n";
-		return;
-	}
+	return if ! -f $full;
 
-	my $type = 'text/plain';
+	my $type = 'application/octet-stream';
 	$type = 'text/html' if $path =~ m{\.htm};
 	$type = 'application/javascript' if $path =~ m{\.js};
+	$type = 'text/plain' if $path =~ m{\.txt};
+
+	my $size = -s $full || return;
+
+	print $client "HTTP/1.0 200 OK\r\nContent-Type: $type\r\nContent-Length: $size\r\nConnection: close\r\n\r\n";
+
+	open(my $fh, $full);
+	print "static $path $type $size\n";
+
+	my $block = 8192;
+	my $buff;
+	my $pos = 0;
 
-	print $client "HTTP/1.0 200 OK\r\nContent-Type: $type\r\nContent-Length: ", -s $path,"\r\n\r\n";
-	open(my $html, $path);
-	while(<$html>) {
-		print $client $_;
+	while( my $len = read $fh, $buff, $block ) {
+		print $client $buff;
+		$pos += $len;
+		printf "%s %d/%d %.2f%%\r", $path, $pos, $size, $pos * 100 / $size;
 	}
-	close($html);
+	close($fh);
+	close($client);
+
+	print "$path $pos == $size OK\n";
 
 	return $path;
 }
 
-my $ok = "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n";
-
 use boolean;
 
 use screen;
 use kvm;
-our $pids;
 
 $SIG{CHLD} = 'IGNORE';
 
@@ -65,12 +84,12 @@
 	my $daemon = shift;
 	my $pid = $pids->{$daemon};
 
-	warn "start_stop $daemon pids: ",dump( $pids );
+	warn "start_stop $daemon $pid pids: ",dump( $pids );
 
-	if ( $pid ) {
+	if ( $pid =~ m{^\d+$} ) {
 		warn "kill 9 $pid";
 		kill 9, $pid;
-		delete $pids->{$daemon};
+		$pids->{$daemon} = 'stopped';
 		return qq|$daemon pid $pid stopped|;
 	} else {
 		if ( $pid = fork ) {
@@ -80,7 +99,7 @@
 			return qq|$daemon pid $pid started|;
 		} elsif ( defined $pid ) {
 			# child
-			my $eval = $daemon . '::start';
+			my $eval = $daemon . '::start(' . ( @_ ? dump(@_) : '' ) . ')';
 			warn "eval $eval";
 			eval $eval;
 			warn "can't start $daemon: $@" if $@;
@@ -91,6 +110,9 @@
 	}
 }
 
+my $ok =       qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n|;
+my $redirect = qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $url\r\n\r\n|;
+
 sub get_request {
 	my ( $client, $path, $param ) = @_;
 
@@ -104,20 +126,36 @@
 		my $kvm    = $pids->{kvm}    ? qq|stop <tt>$pids->{kvm}</tt>|		:
 					 $pids->{screen} ? qq|start|							: qq|start screen first|;
 
-		print $client $ok,
-		html::table( 2,
-			'pid',    $$,
-			'debug',  qq|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
-			'screen', qq|<a href=/screen>$screen</a>|,
-			'kvm',    qq|<a href=/kvm>$kvm</a>|,
+		my @rows = (
+			'ip',		html::tt( $server::ip ),
+			'netmask',	html::tt( $server::netmask ),
+
+			'debug',	qq|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
 		);
+		foreach my $name ( %$pids ) {
+			my $pid = $pids->{$name} || next;
+			my $proc = "/proc/$pid/status";
+
+			my $html = qq|<a href=/$name>$pid</a>|;
+			$html   .= qq|<pre style="font-size: 10%">|
+					.  ( $debug && -e $proc ? read_file($proc) : '' )
+					.  qq|</pre>| if $debug;
+
+			push @rows, ( $name => $html );
+		}
+
+		print $client $ok, html::table( 2, @rows );
 
 	} elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) {
 		eval 'our $' . $1 . ' = ' . $2;
 		warn $@ if $@;
-		print $client qq|HTTP/1.1 302 Found\r\nLocation: $url\r\nContent-type: text/html\r\n\r\n<big>$1 = $2</big><br>Location: <a href="$url">$url</a>|;
+		print $client $redirect, qq|<big>$1 = $2</big><br>Location: <a href="$url">$url</a>|;
+		server::debug( $debug ) if $1 eq 'debug';
 	} elsif ( $path =~ m{^/(screen|kvm)} ) {
-		print $client $ok, start_stop($1);
+		print $client $redirect, start_stop($1);
+ 	} elsif ( $path eq '/exit' ) {
+#		DESTROY;
+		exit 0;
 	} elsif ( $path =~ m{/boot} ) {
 		print $client qq{$ok
 #!gpxe
@@ -133,6 +171,8 @@
 
 }
 
+use browser;
+
 sub start {
 
 	my $server = IO::Socket::INET->new(
@@ -144,7 +184,9 @@
 
 	print "url $url\n";
 
-	system "/mnt/llin/rest/cvs/uzbl/uzbl -u $url &";
+	start_stop 'browser', $url;
+	start_stop 'screen';
+	start_stop 'kvm';
 
 	while (my $client = $server->accept()) {
 		$client->autoflush(1);
@@ -174,7 +216,8 @@
 		print $client qq{
 		<div style="font-size: 80%; color: #888">
 		<a href="">reload</a>
-		<a href="/">index</a>
+		<a href=/>index</a>
+		<a href=/exit>exit</a>
 		</div>
 		} if $client->connected;