--- lib/PXElator/httpd.pm	2009/08/10 16:36:16	193
+++ lib/PXElator/httpd.pm	2009/08/28 15:58:25	320
@@ -24,6 +24,9 @@
 <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=/nmap>nmap</a>
 <a href=/client>client</a>
 </div>
 
@@ -49,7 +52,12 @@
 use kvm;
 use browser;
 use network;
+use ip;
+use wireshark;
+use syslogd;
+use nmap;
 
+use CouchDB;
 
 sub static {
 	my ($client,$path) = @_;
@@ -61,7 +69,6 @@
 	if ( my $pid = fork ) {
 		# parent
 		close($client);
-		print "http static child $pid\n";
 		$static_pids->{$pid} = $path;
 		return 1;
 	}
@@ -81,7 +88,7 @@
 	my $buff;
 	my $pos = 0;
 
-	warn "static $path $type $size block: $block\n";
+	CouchDB::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost });
 
 	progress_bar::start;
 
@@ -96,33 +103,38 @@
 
 	print STDERR "\n";
 
-	warn "exit static child";
-
 	exit(0);
 }
 
-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 ok {
+	qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu()
+}
+
+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 ) = @_;
 
 	server->refresh;
 
-	warn "get_request $path ", $param ? dump( $param ) : '', "\n";
+	CouchDB::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } );
 
 	if ( my $found = static( $client,$path ) ) {
 		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;
 
@@ -131,7 +143,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%">|
@@ -140,17 +152,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 );
 		}
 
@@ -169,7 +191,7 @@
 			}
 		}
 
-		print $client $ok
+		print $client ok
 			, html::table( 2, @rows )
 			, $below_table
 			, html::tabs( log::mac_changes )
@@ -177,31 +199,62 @@
 			;
 
 	} 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' ) )
+		print $client ok
+			, 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;
-		if ( $ip ne $server::ip ) {
+		my $ip = $1;
+
+		if ( my $new_ip = $param->{change_ip} ) {
+			client::change_ip( $ip, $new_ip );
+			$ip = $new_ip;
+		}
+
+ 		if ( ! $ip ) {
+			my $peer_ip = $client->peerhost;
+
+warn "XXX peer_ip $peer_ip";
+
+			my $netmask = ip::to_int $server::netmask;
+			my $network = ip::to_int $server::ip & $netmask;
+			my ( $from, $to ) = ( $network | $server::ip_from, $network | $server::ip_to );
+			my $ip_int  = ip::to_int $peer_ip;
+
+warn dump( $ip_int, $from, $to );
+
+			# show edit for our our class
+ 			if ( $ip_int >= ( $network | $server::ip_from ) && $ip_int <= ( $network | $server::ip_to ) ) {
+				$ip = $peer_ip;
+			}
+		}
+
+		if ( $ip && $ip ne $server::ip ) {
 			my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
 
 			my @table = (
-				'ip' => $ip,
-				'hostname' => qq|<input type=text name=hostname value=$hostname>|,
+				'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 ) ) {
+			if ( my $mac = client::mac_from_ip( $ip ) ) {
 				$deploy = client::conf( $ip, 'deploy' => $param->{deploy} );
 				push @table, (
-					'mac' => $mac,
+					'mac' => format::mac( $mac => 'html' ),
 					'deploy' => html::select( 'deploy', $deploy, config::available )
 				);
-				$deploy = qq|<h2>PXElinux</h2>| . html::pre( config::for_ip( $ip ) );
+				if ( my $pxelinux = config::for_ip( $ip ) ) {
+					$deploy = qq|<h2>PXElinux</h2>| . html::pre( $pxelinux );
+				}
 			}
 
-			print $client $ok
+			print $client ok
 				, qq|<form method=get>|
 				, html::table( 2, @table ),
 				, qq|<input type=submit value=change></form>|
@@ -209,7 +262,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 {
 
@@ -217,6 +270,7 @@
 				map {
 					my @c = split(/\s+/,$_);
 					if ( $#c == 5 ) {
+						client::save_ip_mac( $c[0], $c[3] );
 						( uc $c[3] => [ $c[0] , $c[5] ] )
 					} else {
 					}
@@ -225,47 +279,65 @@
 
 			warn "# arp ",dump( $arp );
 
-			print $client $ok
+			print $client ok
 				, qq|<h2>Clients on $server::ip</h2>|
-				, html::table( -5,
-					'ip', 'hostname', 'mac', 'deploy', 'arp',
+				, html::table( -6,
+					'ip', 'mac', 'arp', 'hostname', 'deploy', 'conf',
 					map {
 						my $ip = $_;
-						$ip =~ s{^.+/ip/}{};
-						my $arp = $arp->{ client::mac $ip, 'clean' };
-						$arp = $arp ? $arp->[1] : '';
-						$arp =~ s{$ip}{};
+						my $conf = client::all_conf( $ip );
+						my $mac = delete $conf->{mac} || '';
 						(
-							qq|<a href=/client/$ip>$ip</a>|
-							, client::conf( $ip, 'hostname' )
-							, client::mac( $ip )
-							, html::tt( client::conf( $ip, 'deploy' ) )
-							, $arp
+							qq|<a name=$ip href=/client/$ip>$ip</a>|
+							, format::mac( $mac => 'html' )
+							, ( $arp->{$mac} ? $arp->{$mac}->[1] : '' )
+							, delete $conf->{hostname}
+							, delete $conf->{deploy}
+							, ( %$conf ? html::pre_dump( $conf ) : qq|<a href=/nmap?scan=$ip>nmap</a>| )
 						);
 					}
-					glob("$server::conf/ip/*") 
-				)
-				, qq|<h2>ARP</h2>|
-				, html::table( -3, 'mac', 'dev', 'ip',
+					sort { ip::to_int($a) cmp ip::to_int($b) }
 					map {
-						my $c = $arp->{$_};
-						( html::tt( $_ ), $c->[1], $c->[0] )
-					} sort keys %$arp
+						my $ip = $_;
+						$ip =~ s{^.+/ip/}{};
+						$ip;
+					} glob("$server::conf/ip/*") 
 				)
 				;
 		}
+	} 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/ ))
+			, ip::html( $1 )
+			;
+	} elsif ( $path =~ m{^/nmap} ) {
+		if ( my $scan = $param->{scan} ) {
+			nmap::scan( $scan );
+			print $client redirect("$url/client#$scan");
+		} else {
+			print $client ok, qq|
+				<form method=get>
+				<input type=text name=scan>
+				<input type=submit value=scan>
+				</form>
+			|;
+		}
 	} 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, daemons::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>";
@@ -276,10 +348,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(