--- lib/PXElator/httpd.pm	2009/07/31 22:52:22	104
+++ lib/PXElator/httpd.pm	2009/08/06 15:40:42	159
@@ -17,7 +17,16 @@
 use File::Slurp;
 #use JSON;
 use IO::Socket::INET;
-use Module::Refresh;
+
+sub menu {qq{
+
+<div style="font-size: 80%; color: #888">
+<a href=/>home</a>
+<a href=/server>server</a>
+<a href=/client>client</a>
+</div>
+
+}}
 
 our $pids;
 $pids = { httpd => $$ } unless defined $pids; # keep pids on refresh
@@ -38,8 +47,10 @@
 
 use html;
 our $static_pids;
-
-use Time::HiRes qw/time/;
+use progress_bar;
+use config;
+use client;
+use log;
 
 sub static {
 	my ($client,$path) = @_;
@@ -48,8 +59,6 @@
 
 	return if ! -f $full;
 
-	my $start_t = time();
-
 	if ( my $pid = fork ) {
 		# parent
 		close($client);
@@ -65,8 +74,6 @@
 
 	my $size = -s $full || return;
 
-	$client->autoflush(1);
-
 	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);
@@ -75,35 +82,35 @@
 	my $buff;
 	my $pos = 0;
 
-	print "static $path $type $size block: $block\n";
+	warn "static $path $type $size block: $block\n";
+
+	progress_bar::start;
 
 	while( my $len = read $fh, $buff, $block ) {
 		print $client $buff;
+		$client->flush;
 		$pos += $len;
-		printf "%s %d/%d %.2f%% %.2f K/s\r"
-			, $path, $pos
-			, $size, $pos * 100 / $size
-			, ( $pos / 1024 ) / ( time() - $start_t )
-			;
+		progress_bar::tick( $path, $pos, $size );
 	}
 	close($fh);
 	close($client);
 
-	print "\n";
+	print STDERR "\n";
 
-	exit;
+	warn "exit static child";
+
+	exit(0);
 }
 
 use boolean;
 
-use screen;
 use kvm;
 
 $SIG{CHLD} = 'IGNORE';
 
 sub start_stop {
 	my $daemon = shift;
-	my $pid = $pids->{$daemon};
+	my $pid = $pids->{$daemon} || 'not started';
 
 	warn "start_stop $daemon $pid\n";
 
@@ -124,10 +131,16 @@
 			# child
 			my $invoke = 'start';
 			$invoke = $1 if $daemon =~ s{/(.+)}{};
-			my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')';
-			warn "eval $eval";
-			eval $eval;
-			warn "can't start $daemon: $@" if $@;
+			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";
+			} else {
+				my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')';
+				warn "eval $eval";
+				eval $eval;
+				warn "can't start $daemon: $@" if $@;
+			}
 			exit;
 		} else {
 			die "fork error $!";
@@ -141,20 +154,15 @@
 sub get_request {
 	my ( $client, $path, $param ) = @_;
 
+	server->refresh;
+
 	warn "get_request $path ", $param ? dump( $param ) : '', "\n";
 
 	if ( my $found = static( $client,$path ) ) {
 		warn "static $found" if $debug;
 	} elsif ( $path eq '/' ) {
 
-		my $screen = $pids->{screen} ? qq|stop <tt>$pids->{screen}</tt>|	: 'start';
-		my $kvm    = $pids->{kvm}    ? qq|stop <tt>$pids->{kvm}</tt>|		:
-					 $pids->{screen} ? qq|start|							: qq|start screen first|;
-
 		my @rows = (
-			'ip',		html::tt( $server::ip ),
-			'netmask',	html::tt( $server::netmask ),
-
 			'debug',	qq|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
 		);
 
@@ -207,18 +215,40 @@
 		}
 
 		print $client $ok
+			, menu()
 			, html::table( 2, @rows )
 			, $below_table
 			, html::tabs( log::mac_changes )
 			, $debug_proc
 			;
 
+	} 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{^/our/(\w+)/(\S+)} ) {
 		eval 'our $' . $1 . ' = ' . $2;
 		warn $@ if $@;
 		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{^/start_stop/((?:screen|kvm).*)} ) { # XXX we don't want to stop all classes
+	} elsif ( $path =~ m{^/start_stop/(\S+)} ) {
 		print $client $redirect, start_stop($1);
 	} elsif ( $path =~ m{^/action/([^/]+)/(.+)} ) {
 		$1->$2();
@@ -245,9 +275,12 @@
 }
 
 use browser;
+use network;
 
 sub start {
 
+	warn 'tap ', network::tap();
+
 	my $server = IO::Socket::INET->new(
 			Proto     => 'tcp',
 			LocalPort => $httpd::port,
@@ -258,17 +291,17 @@
 	print "url $url\n";
 
 	start_stop 'browser', $url;
-	start_stop 'screen';
+	start_stop 'dhcpd';
+	start_stop 'tftpd';
+	start_stop 'dnsd';
 	start_stop 'kvm';
 
-	while (my $client = $server->accept()) {
-		$client->autoflush(1);
+	while (1) {
+		my $client = $server->accept() || next; # ALARM trickle us
 		my $request = <$client>;
 
 		warn "request $request\n" if $debug;
 
-		Module::Refresh->refresh;
-
 		if ($request =~ m{^GET (/.*) HTTP/1.[01]}) {
 			my $path = $1;
 			my $param;
@@ -285,13 +318,7 @@
 			warn "500 $request";
 		}
 
-		print $client qq{
-		<div style="font-size: 80%; color: #888">
-		<a href="">reload</a>
-		<a href=/>index</a>
-		<a href=/exit>exit</a>
-		</div>
-		} if $client->connected;
+		print $client menu() if $client->connected;
 
 	}