--- lib/PXElator/httpd.pm	2009/09/08 20:38:26	403
+++ lib/PXElator/httpd.pm	2010/01/23 21:00:01	488
@@ -18,6 +18,7 @@
 #use JSON;
 use IO::Socket::INET;
 use Regexp::Common qw/net/;
+use YAML;
 
 our $title;
 
@@ -36,19 +37,6 @@
 </html>
 }}
 
-sub menu {
-qq{
-<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>
-
-}}
-
 our $port = 7777;
 
 use server;
@@ -63,7 +51,6 @@
 use log;
 use x11;
 use amt;
-use boolean;
 use daemons;
 
 use kvm;
@@ -76,7 +63,29 @@
 use ping;
 use wol;
 
-use CouchDB;
+use store;
+
+
+sub menu {
+	my $store_url = $url;
+	$store_url =~ s{:\d+.+}{:28017};
+qq{
+<div style="font-size: 80%; color: #888">
+<a target=pids href=/ >home</a>
+|
+<a target=server href=/server >server</a>
+<a target=server href=/brctl >brctl</a>
+<a target=server href=/ip >ip</a>
+|
+<a target=store href=$store_url >store</a>
+<a target=store href=/store/query >query</a>
+|
+<a target=client href=/nmap >nmap</a>
+<a target=client href=/client >client</a>
+</div>
+
+}}
+
 
 sub static {
 	my ($client,$path) = @_;
@@ -109,7 +118,7 @@
 	my $buff;
 	my $pos = 0;
 
-	CouchDB::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost });
+	store::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost });
 
 	progress_bar::start;
 
@@ -137,12 +146,17 @@
 	qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $to\r\n\r\n|
 }
 
+sub toggle {
+	my $v = shift;
+	return $v ? 0 : 1;
+}
+
 sub get_request {
 	my ( $client, $path, $param ) = @_;
 
 	server->refresh;
 
-	CouchDB::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } );
+	store::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } );
 
 	$title = $path;
 
@@ -217,9 +231,13 @@
 			}
 		}
 
+		my $kvm = kvm::next_nr;
+		$kvm = qq|<div><a href=/start_stop/kvm?nr=$kvm>create new kvm $kvm</a></div>|;
+
 		print $client ok
 			, html::table( 2, @rows )
 			, $below_table
+			, $kvm
 			, html::tabs( log::mac_changes )
 			, $debug_proc
 			;
@@ -229,11 +247,11 @@
 			eval '$server::' . $name . '= $param->{$name}';
 		}
 		my @table = (
-			  'debug' => qq|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
+			  'debug' => qq|<a href=/our/debug/| . toggle($debug) . qq|>$debug</a>|,
 			, 'new_clients' => qq|<input type=text name=new_clients size=3 value="$server::new_clients">|
 		);
 
-		foreach my $editable ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain' ) {
+		foreach my $editable ( 'ip', 'bcast', 'netmask', 'ip_from', 'ip_to', 'domain' ) {
 			my $v = eval '$server::' . $editable;
 			push @table, ( $editable, qq|<input type=text name=$editable value="$v">| );
 		}
@@ -252,9 +270,25 @@
 			|
 			;
 
+	} elsif ( $path =~ m{^/store/query} ) {
+		print $client ok
+			, qq|<table>|
+		;
+		store::query( sub {
+			my $o = shift;
+			my $p = delete( $o->{package} );
+			delete( $o->{_id} );
+
+			# XXX sigh, dump dies if we don't do this
+			delete $o->{$_} foreach ( grep { ! defined $o->{$_} } keys %$o );
+
+			print $client qq|<tr><td>|, join(qq|</td><td>|, map { $p->{$_} } keys %$p ), qq|</td><td><pre>|, dump( $o ), qq|</pre></td></tr>\n|;
+		});
+		print $client qq|</table>|;
+
 	} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
 		my $ip = $1;
-		$title = $ip;
+		$title = $ip if $ip;
 
 		if ( $param->{action} eq 'remove' ) {
 			client::remove( $param->{change_ip} );
@@ -326,6 +360,8 @@
 
 		} else {
 
+			print $client ok qq|<h2>Clients on $server::ip</h2>|;
+
 			my @ping;
 			if ( my $host = $param->{ping_target} ) {
 				@ping = ( $host );
@@ -336,31 +372,40 @@
 			my $ping = ping::fping( @ping ) if @ping;
 			my $arp = client::arp_mac_dev;
 
-			print $client ok
-				, qq|<h2>Clients on $server::ip</h2>|
-				, html::table( -5,
-					'ip', 'mac', 'dev', 'hostname', 'conf',
-					map {
-						my $ip = $_;
-						my $conf = client::all_conf( $ip );
-						my $mac = delete $conf->{mac} || '';
-						my $style;
-						$style
-							= 'style="color:'
-							. ( $ping->{$ip} ? 'green' : 'red' )
-							. '"'
-							if $ping;
-						$style ||= '';
-						(
-							qq|<a $style name=$ip target=$ip href=/client/$ip>$ip</a>|
-							, format::mac( $mac => 'html' )
-							, $arp->{$mac}
-							, delete $conf->{hostname}
-							, html::conf( $ip, $conf, 'inline' )
-						)
-					} client::all_ips
-				)
+			my @clients;
+
+			foreach my $ip ( client::all_ips ) {
+				
+				my $conf = client::all_conf( $ip );
+				my $mac = delete $conf->{mac} || '';
+				my $dev = $arp->{$mac};
+
+ 				next unless $dev || $param->{all};
+
+				my $style
+					= 'style="color:'
+					. ( $ping->{$ip} ? 'green' : 'red' )
+					. '"'
+					if $ping;
+
+				$style ||= '';
+				my $ip_text = qq|<tt>$ip</tt>|;
+				$ip_text = qq|<tt><b>$ip</b></tt>| if ip::in_dhcp_range($ip);
+
+				$dev = qq|<tt>$dev</tt>| if $dev;
+
+				push @clients
+					, qq|<a $style name=$ip target=client href=/client/$ip>$ip_text</a>|
+					, format::mac( $mac => 'html' )
+					, $dev
+					, delete $conf->{hostname}
+					, html::conf( $ip, $conf, 'inline' )
 				;
+			}
+
+			my $all = $param->{all} ? 0 : 1;
+
+			print $client html::table( -5, 'ip', 'mac', qq|<a href="?all=$all">dev</a>|, 'hostname', 'conf', @clients );
 			print $client qq|
 				<form method=get>
 				<input type=text   name=ping_target   size=15>
@@ -458,7 +503,7 @@
 
 	my $server = IO::Socket::INET->new(
 			Proto     => 'tcp',
-			LocalAddr => $server::ip,
+#			LocalAddr => $server::ip,
 			LocalPort => $httpd::port,
 			Listen    => SOMAXCONN,
 			Reuse     => 1
@@ -473,7 +518,21 @@
 		my $client = $server->accept() || next; # ALARM trickle us
 		my $request = <$client>;
 
-		warn "request $request\n" if $debug;
+		my $headers;
+
+		while ( my $header = <$client> ) {
+			chomp $header;
+			last if $header =~ m{^\s*$};
+			my ( $n, $v ) = split(/:\s*/, $header);
+			$headers->{ lc $n } = $v;
+		}
+
+		if ( my $host = $headers->{host} ) {
+			$url = 'http://' . $host;
+			$url .= ":$port" unless $url =~ m{:\d+$};
+		}
+
+		warn "## $url ## $request", dump( $headers ) if $debug;
 
 		if ($request =~ m{^GET (/.*) HTTP/1.[01]}) {
 			my $path = $1;