--- lib/PXElator/httpd.pm	2009/09/07 21:53:45	391
+++ lib/PXElator/httpd.pm	2009/09/10 13:08:36	419
@@ -39,12 +39,13 @@
 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>
+<a href=/ target=/>home</a>
+<a href=/server target=server>server</a>
+<a href=/brctl target=brctl>brctl</a>
+<a href=/ip target=ip>ip</a>
+<a href=/nmap target=nmap>nmap</a>
+<a href=/client target=client>client</a>
+<a href=http://$server::ip:5984/_utils/ target=couchdb>couchdb</a>
 </div>
 
 }}
@@ -85,6 +86,8 @@
 
 	return if ! -f $full;
 
+	return if $full =~ m{\.ico$};
+
 	if ( my $pid = fork ) {
 		# parent
 		close($client);
@@ -215,31 +218,48 @@
 			}
 		}
 
+		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
 			;
 
 	} elsif ( $path =~ m{^/server} ) {
-		if ( my $c = $param->{new_clients} ) {
-			server::shared( 'new_clients', $c );
+		foreach my $name ( keys %$param ) {
+			eval '$server::' . $name . '= $param->{$name}';
+		}
+		my @table = (
+			  'debug' => qq|<a href=/our/debug/| . boolean::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' ) {
+			my $v = eval '$server::' . $editable;
+			push @table, ( $editable, qq|<input type=text name=$editable value="$v">| );
+		}
+
+		foreach my $readonly ( 'base_dir', 'conf' ) {
+			my $v = eval '$server::' . $readonly;
+			push @table, ( $readonly, html::tt $v );
 		}
+			
 		print $client ok
 			, qq|<form method=get>|
-			, html::table( 2,
-				'debug' => qq|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
-				'new_clients' => qq|<input type=text name=new_clients size=3 value="| . server::shared( 'new_clients' ) . qq|">|,
-				 map {
-					( $_, html::tt eval '$server::'.$_ )
-				 } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir', 'conf' )
-			)
-			, qq|</form>|
+			, html::table( 2, @table )
+			, qq|
+				<input type=submit name=action value=change>
+				</form>
+			|
 			;
+
 	} 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} );
@@ -336,8 +356,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=$ip href=/client/$ip>$ip_text</a>|
 							, format::mac( $mac => 'html' )
 							, $arp->{$mac}
 							, delete $conf->{hostname}
@@ -353,17 +375,42 @@
 				</form>
 			|;
 		}
+
+
 	} elsif ( $path =~ m{^/brctl} ) {
-		print $client ok, html::table( -4,
+
+		system 'brctl addif virtual ' . $param->{addif} if $param->{addif};
+		system 'brctl delif virtual ' . $param->{delif} if $param->{delif};
+
+		my $in_virtual;
+
+		my @table =
 			map {
 				my @c = split(/\t+/,$_,4);
 				if ( $#c == 1 ) {
-					( '', '', '', $c[1] )
+					$in_virtual->{ $c[1] }++;
+					@c = ( '', '', '', $c[1] );
 				} else {
-					@c
+					$in_virtual->{ $c[3] }++;
+				}
+				if ( $c[3] =~ m{\d$} ) {
+					$c[3] = qq|<input type=submit name=delif value=$c[3] style="color:red" title="remove $c[3] from bridge">|;
 				}
+				@c
 			} split(/\n/, `brctl show`)
-		);
+		;
+
+		my @add_ifs = grep { ! $in_virtual->{$_} && $_ ne 'virtual' } ip::devices_up;
+
+		push @table, ( '', '', '', html::select( 'addif', @add_ifs ) . qq|<input type=submit value=add></form>| );
+
+		print $client ok
+			, qq|<form>|
+			, html::table( -4, @table )
+			, qq|</form>|
+			;
+
+
 	} 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/ ))
@@ -394,7 +441,9 @@
 	} elsif ( $path =~ m{^/start_stop/(\S+)} ) {
 		print $client redirect, daemons::start_stop($1,$param);
 	} elsif ( $path =~ m{^/action/([^/]+)/(.+)} ) {
-		$1->$2();
+		my ( $package, $method ) = ( $1, $2 );
+		$ENV{nr} = $1 if $package =~ s{\.(\d+)$}{};
+		$package->$method();
 		print $client redirect;
 	} elsif ( $path =~ m{^/kill/static/(\d+)} ) {
 		print $client redirect;
@@ -416,7 +465,7 @@
 
 	my $server = IO::Socket::INET->new(
 			Proto     => 'tcp',
-			LocalAddr => $server::ip,
+#			LocalAddr => $server::ip,
 			LocalPort => $httpd::port,
 			Listen    => SOMAXCONN,
 			Reuse     => 1
@@ -425,6 +474,7 @@
 	print "url $url\n";
 
 	syslogd::install_local;
+	client::rebuild_mac_links;
 
 	while (1) {
 		my $client = $server->accept() || next; # ALARM trickle us