--- lib/PXElator/httpd.pm	2009/09/09 09:41:03	407
+++ lib/PXElator/httpd.pm	2009/09/14 21:11:23	433
@@ -36,19 +36,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;
@@ -78,6 +65,27 @@
 
 use CouchDB;
 
+
+sub menu {
+	my $couch_url = $url;
+	$couch_url =~ s{:\d+.+}{:5984/_utils/};
+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=couch href=$couch_url >couchdb</a>
+|
+<a target=client href=/nmap >nmap</a>
+<a target=client href=/client >client</a>
+</div>
+
+}}
+
+
 sub static {
 	my ($client,$path) = @_;
 
@@ -237,7 +245,7 @@
 			, '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">| );
 		}
@@ -258,7 +266,7 @@
 
 	} 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} );
@@ -355,8 +363,10 @@
 							. '"'
 							if $ping;
 						$style ||= '';
+						my $ip_text = qq|<tt>$ip</tt>|;
+						$ip_text = qq|<tt><b>$ip</b></tt>| if ip::in_dhcp_range($ip);
 						(
-							qq|<a $style name=$ip target=$ip href=/client/$ip>$ip</a>|
+							qq|<a $style name=$ip target=client href=/client/$ip>$ip_text</a>|
 							, format::mac( $mac => 'html' )
 							, $arp->{$mac}
 							, delete $conf->{hostname}
@@ -462,7 +472,7 @@
 
 	my $server = IO::Socket::INET->new(
 			Proto     => 'tcp',
-			LocalAddr => $server::ip,
+#			LocalAddr => $server::ip,
 			LocalPort => $httpd::port,
 			Listen    => SOMAXCONN,
 			Reuse     => 1
@@ -477,7 +487,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;