--- lib/PXElator/httpd.pm	2009/08/27 19:03:56	314
+++ lib/PXElator/httpd.pm	2009/08/28 22:55:01	333
@@ -208,17 +208,34 @@
 			)
 			;
 	} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
-		my $ip = $1 || $client->peerhost;
+		my $ip = $1;
 
-		if ( my $new_ip = $param->{change_ip} ) {
-			client::change_ip( $ip, $new_ip );
-			$ip = $new_ip;
+		if ( $param->{action} eq 'remove' ) {
+			client::remove( $param->{change_ip} );
+			print $client redirect("$url/client");
+			return;
+		} elsif ( $param->{action} eq 'change' ) {
+			if ( my $new_ip = client::change_ip( $ip, $param->{change_ip} ) ) {
+				print $client redirect("$url/client#$new_ip");
+				return;
+			}
 		}
 
-		my $ip_short = (split(/\./, $ip, 4))[3];
+ 		if ( ! $ip ) {
+			my $peer_ip = $client->peerhost;
+
+			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;
+
+			# show edit for clients in our dhcp range
+ 			if ( $ip_int >= ( $network | $server::ip_from ) && $ip_int <= ( $network | $server::ip_to ) ) {
+				$ip = $peer_ip;
+			}
+		}
 
-		# if ( $ip ne $server::ip ) -- not flexible enough for tunnel endpoints
-		if ( $ip_short >= $server::ip_from && $ip_short <= $server::ip_to ) {
+		if ( $ip && $ip ne $server::ip ) {
 			my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
 
 			my @table = (
@@ -242,58 +259,67 @@
 			print $client ok
 				, qq|<form method=get>|
 				, html::table( 2, @table ),
-				, qq|<input type=submit value=change></form>|
+				, qq|
+					<input type=submit name=action value=change>
+					<input type=submit name=action value=remove style="color: red">
+					</form>|
 				, $deploy
 				;
 
 			if ( my $amt = client::conf( $ip, 'amt' ) ) {
 				print $client qq|<h2>AMT</h2>|, amt::info( $amt, $ip );
 			}
+
 		} else {
 
-			my $arp = {
-				map {
-					my @c = split(/\s+/,$_);
-					if ( $#c == 5 ) {
-						client::save_ip_mac( $c[0], $c[3] );
-						( uc $c[3] => [ $c[0] , $c[5] ] )
-					} else {
-					}
-				} read_file('/proc/net/arp')
-			};
+			my $arp = client::arp_mac_dev;
+			my @ips = client::all_ips;
 
-			warn "# arp ",dump( $arp );
+			my $ping;
+			$ping = ping::fping( @ips ) if $param->{ping};
 
 			print $client ok
 				, qq|<h2>Clients on $server::ip</h2>|
 				, html::table( -6,
-					'ip', 'mac', 'arp', 'hostname', 'deploy', 'conf',
+					'ip', 'mac', 'dev', 'hostname', 'deploy', '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;
 						(
-							qq|<a name=$ip href=/client/$ip>$ip</a>|
+							qq|<a $style name=$ip href=/client/$ip>$ip</a>|
 							, format::mac( $mac => 'html' )
-							, ( $arp->{$mac} ? $arp->{$mac}->[1] : '' )
+							, $arp->{$mac}
 							, delete $conf->{hostname}
 							, delete $conf->{deploy}
 							, ( %$conf ? html::pre_dump( $conf ) : qq|<a href=/nmap?scan=$ip>nmap</a>| )
 						);
-					}
-					sort { ip::to_int($a) cmp ip::to_int($b) }
-					map {
-						my $ip = $_;
-						$ip =~ s{^.+/ip/}{};
-						$ip;
-					} glob("$server::conf/ip/*") 
+					} @ips
 				)
 				;
+			print $client qq|
+				<form method=get>
+				<input type=submit name=ping value=ping>
+				</form>
+			|;
 		}
 	} elsif ( $path =~ m{^/brctl} ) {
-		print $client ok
-			,html::pre( `brctl show` )
-			;
+		print $client ok, html::table( -4,
+			map {
+				my @c = split(/\t+/,$_,4);
+				if ( $#c == 1 ) {
+					( '', '', '', $c[1] )
+				} else {
+					@c
+				}
+			} split(/\n/, `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/ ))
@@ -357,6 +383,7 @@
 
 		if ($request =~ m{^GET (/.*) HTTP/1.[01]}) {
 			my $path = $1;
+			$path =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/ge;
 			my $param;
 			if ( $path =~ s{\?(.+)}{} ) {
 				foreach my $p ( split(/[&;]/, $1) ) {