--- lib/PXElator/httpd.pm	2009/08/28 19:41:16	327
+++ lib/PXElator/httpd.pm	2009/08/28 23:30:38	334
@@ -224,13 +224,14 @@
  		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;
+			my $netmask  = ip::to_int $server::netmask;
+			my $network  = ip::to_int($server::ip) & $netmask;
+			my $from_int = $network | $server::ip_from;
+			my $to_int   = $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 ) ) {
+ 			if ( $ip_int >= $from_int && $ip_int <= $to_int ) {
 				$ip = $peer_ip;
 			}
 		}
@@ -269,20 +270,18 @@
 			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[5] )
-					} else {
-					}
-				} read_file('/proc/net/arp')
-			};
+			my @ping;
+			if ( my $host = $param->{ping_target} ) {
+				@ping = ( $host );
+			} elsif ( $param->{ping} ) {
+				@ping = client::all_ips;
+			}
 
-			warn "# arp ",dump( $arp );
+			my $ping = ping::fping( @ping ) if @ping;
+			my $arp = client::arp_mac_dev;
 
 			print $client ok
 				, qq|<h2>Clients on $server::ip</h2>|
@@ -292,8 +291,15 @@
 						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 name=$ip href=/client/$ip>$ip</a>|
+							qq|<a $style name=$ip href=/client/$ip>$ip</a>|
 							, format::mac( $mac => 'html' )
 							, $arp->{$mac}
 							, delete $conf->{hostname}
@@ -303,11 +309,24 @@
 					} client::all_ips
 				)
 				;
+			print $client qq|
+				<form method=get>
+				<input type=text   name=ping_target   size=15>
+				<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/ ))
@@ -371,6 +390,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) ) {