--- lib/PXElator/httpd.pm	2009/08/09 16:37:46	179
+++ lib/PXElator/httpd.pm	2009/08/11 15:55:26	200
@@ -29,17 +29,6 @@
 
 }}
 
-our $pids;
-$pids = { httpd => $$ } unless defined $pids; # keep pids on refresh
-
-sub DESTROY {
-	warn "pids ",dump( $pids );
-	foreach ( values %$pids ) {
-		warn "kill $_";
-		kill 1,$_ || kill 9, $_;
-	}
-}
-
 our $port = 7777;
 
 use server;
@@ -53,6 +42,14 @@
 use client;
 use log;
 use x11;
+use amt;
+use boolean;
+use daemons;
+
+use kvm;
+use browser;
+use network;
+
 
 sub static {
 	my ($client,$path) = @_;
@@ -104,54 +101,15 @@
 	exit(0);
 }
 
-use boolean;
-
-use kvm;
-
-$SIG{CHLD} = 'IGNORE';
-
-sub start_stop {
-	my $daemon = shift;
-	my $pid = $pids->{$daemon} || 'not started';
-
-	warn "start_stop $daemon $pid\n";
-
-	if ( $pid =~ m{^\d+$} ) {
-		my $pstree = `pstree -p $pid`;
-		my @pids = $pstree =~ m{\((\d+)\)}g;
-		warn "pstree $pstree pids ",dump( @pids );
-		kill 1, $_ foreach reverse @pids;
-		$pids->{$daemon} = 'stopped';
-		return qq|$daemon pid $pid stopped|;
-	} else {
-		if ( $pid = fork ) {
-			# parent
-			$pids->{$daemon} = $pid;
-			warn "forked $daemon $pid\n";
-			return qq|$daemon pid $pid started|;
-		} elsif ( defined $pid ) {
-			# child
-			my $invoke = 'start';
-			$invoke = $1 if $daemon =~ s{/(.+)}{};
-			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";
-				x11::xterm( $daemon => $exec );
-			} else {
-				my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')';
-				warn "eval $eval";
-				eval $eval;
-				warn "can't start $daemon: $@" if $@;
-			}
-			exit;
-		} else {
-			die "fork error $!";
-		}
-	}
+sub ok {
+	qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu()
 }
 
-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 redirect {
+	my $to = shift;
+	$to ||= $url;
+	qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $to\r\n\r\n|
+}
 
 sub get_request {
 	my ( $client, $path, $param ) = @_;
@@ -170,9 +128,8 @@
 
 		my $debug_proc = '';
 
-		warn 'pids: ', dump( $pids ) if $debug;
-		foreach my $name ( sort keys %$pids ) {
-			my $pid = $pids->{$name} || next;
+		foreach my $name ( sort keys %$daemons::pids ) {
+			my $pid = $daemons::pids->{$name} || next;
 
 			my $html;
 
@@ -219,7 +176,7 @@
 			}
 		}
 
-		print $client $ok
+		print $client ok
 			, html::table( 2, @rows )
 			, $below_table
 			, html::tabs( log::mac_changes )
@@ -227,53 +184,101 @@
 			;
 
 	} elsif ( $path =~ m{^/server} ) {
-		print $client $ok
-			, html::table( 2, map { ( $_, eval '$server::'.$_ ) } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir' ) )
+		print $client ok
+			, html::table( 2, 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;
+
+		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} );
-			my $deploy   = client::conf( $ip, 'deploy'   => $param->{deploy}   );
-			print $client $ok
+
+			my @table = (
+				'ip' => qq|<input type=text name=change_ip value="$ip" onChange="document.getElementById('old_ip').style.display = '';"><span id=old_ip style="display: none; color: #888;">old: $ip<span>|,
+				'hostname' => qq|<input type=text name=hostname value="$hostname">|,
+			);
+
+			my $deploy;
+
+			if ( my $mac = client::mac( $ip ) ) {
+				$deploy = client::conf( $ip, 'deploy' => $param->{deploy} );
+				push @table, (
+					'mac' => $mac,
+					'deploy' => html::select( 'deploy', $deploy, config::available )
+				);
+				$deploy = qq|<h2>PXElinux</h2>| . html::pre( config::for_ip( $ip ) );
+			}
+
+			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 ),
-				)
+				, html::table( 2, @table ),
 				, qq|<input type=submit value=change></form>|
-				, qq|<h2>PXElinux $deploy</h2><pre>|
-				, config::for_ip( $ip )
-				, qq|</pre>|
+				, $deploy
 				;
+
+			if ( my $amt = client::conf( $ip, 'amt' ) ) {
+				print $client qq|<h2>AMT</h2>|, amt::info( $amt );
+			}
 		} else {
-			print $client $ok
+
+			my $arp = {
+				map {
+					my @c = split(/\s+/,$_);
+					if ( $#c == 5 ) {
+						( uc $c[3] => [ $c[0] , $c[5] ] )
+					} else {
+					}
+				} read_file('/proc/net/arp')
+			};
+
+			warn "# arp ",dump( $arp );
+
+			print $client ok
 				, qq|<h2>Clients on $server::ip</h2>|
-				, html::table( -4,
-					'ip', 'mac', 'hostname', 'deploy',
+				, html::table( -5,
+					'ip', 'hostname', 'mac', 'deploy', 'arp',
 					map {
 						my $ip = $_;
 						$ip =~ s{^.+/ip/}{};
-						( qq|<a href=/client/$ip>$ip</a>|, client::mac($ip), client::conf( $ip, 'hostname' ), client::conf( $ip, 'deploy' ) );
+						my $arp = $arp->{ client::mac $ip, 'clean' };
+						$arp = $arp ? $arp->[1] : '';
+						$arp =~ s{$ip}{};
+						(
+							qq|<a href=/client/$ip>$ip</a>|
+							, client::conf( $ip, 'hostname' )
+							, client::mac( $ip )
+							, html::tt( client::conf( $ip, 'deploy' ) )
+							, $arp
+						);
 					}
 					glob("$server::conf/ip/*") 
 				)
+				, qq|<h2>ARP</h2>|
+				, html::table( -3, 'mac', 'dev', 'ip',
+					map {
+						my $c = $arp->{$_};
+						( html::tt( $_ ), $c->[1], $c->[0] )
+					} sort keys %$arp
+				)
 				;
 		}
 	} 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>|;
+		print $client redirect($url), qq|<big>$1 = $2</big><br>Location: <a href="$url">$url</a>|;
 		server::debug( $debug ) if $1 eq 'debug';
 	} elsif ( $path =~ m{^/start_stop/(\S+)} ) {
-		print $client $redirect, start_stop($1);
+		print $client redirect, daemons::start_stop($1);
 	} elsif ( $path =~ m{^/action/([^/]+)/(.+)} ) {
 		$1->$2();
-		print $client $redirect;
+		print $client redirect;
 	} elsif ( $path =~ m{^/kill/static/(\d+)} ) {
-		print $client $redirect;
+		print $client redirect;
 		kill 1, $1 || kill 9, $2 && warn "killed $1";
 	} else {
 		print $client "HTTP/1.0 404 $path\r\nConnection: close\r\nContent-type: text/html\r\n\r\n<big>404 $path</big>";
@@ -282,15 +287,17 @@
 
 }
 
-use browser;
-use network;
-
 sub start {
 
 	warn 'tap ', network::tap();
 
+	daemons::start_stop 'browser', $url;
+	daemons::start_stop $_ foreach ( qw/dhcpd tftpd dnsd/ );
+	daemons::start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device
+
 	my $server = IO::Socket::INET->new(
 			Proto     => 'tcp',
+			LocalAddr => $server::ip,
 			LocalPort => $httpd::port,
 			Listen    => SOMAXCONN,
 			Reuse     => 1
@@ -298,12 +305,6 @@
 
 	print "url $url\n";
 
-	start_stop 'browser', $url;
-	start_stop 'dhcpd';
-	start_stop 'tftpd';
-	start_stop 'dnsd';
-	start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device
-
 	while (1) {
 		my $client = $server->accept() || next; # ALARM trickle us
 		my $request = <$client>;