--- lib/PXElator/httpd.pm	2009/08/09 22:05:09	188
+++ lib/PXElator/httpd.pm	2009/08/15 22:38:02	224
@@ -24,6 +24,7 @@
 <div style="font-size: 80%; color: #888">
 <a href=/>home</a>
 <a href=/server>server</a>
+<a href=/ip>ip</a>
 <a href=/client>client</a>
 </div>
 
@@ -49,7 +50,9 @@
 use kvm;
 use browser;
 use network;
+use ip;
 
+use CouchDB;
 
 sub static {
 	my ($client,$path) = @_;
@@ -61,7 +64,6 @@
 	if ( my $pid = fork ) {
 		# parent
 		close($client);
-		print "http static child $pid\n";
 		$static_pids->{$pid} = $path;
 		return 1;
 	}
@@ -81,7 +83,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,20 +98,25 @@
 
 	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;
@@ -169,7 +176,7 @@
 			}
 		}
 
-		print $client $ok
+		print $client ok
 			, html::table( 2, @rows )
 			, $below_table
 			, html::tabs( log::mac_changes )
@@ -177,31 +184,37 @@
 			;
 
 	} elsif ( $path =~ m{^/server} ) {
-		print $client $ok
+		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 @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 ) );
 			}
 
-			print $client $ok
+			print $client ok
 				, qq|<form method=get>|
 				, html::table( 2, @table ),
 				, qq|<input type=submit value=change></form>|
@@ -212,31 +225,66 @@
 				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' ), html::tt client::conf( $ip, 'deploy' ) );
+						my $mac = client::mac_from_ip $ip;
+						my $arp = $arp->{ $mac };
+						$arp = $arp ? $arp->[1] : '';
+						$arp =~ s{$ip}{};
+						(
+							qq|<a href=/client/$ip>$ip</a>|
+							, client::conf( $ip, 'hostname' )
+							, format::mac( $mac => 'html' )
+							, 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->{$_};
+						( format::mac( $_ => 'html' ), $c->[1], $c->[0] )
+					} sort keys %$arp
+				)
 				;
 		}
+	} 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{^/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>";
@@ -249,6 +297,10 @@
 
 	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,
@@ -259,10 +311,6 @@
 
 	print "url $url\n";
 
-	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
-
 	while (1) {
 		my $client = $server->accept() || next; # ALARM trickle us
 		my $request = <$client>;