--- lib/PXElator/httpd.pm	2009/08/28 19:39:54	326
+++ lib/PXElator/httpd.pm	2009/08/29 00:06:32	335
@@ -56,6 +56,8 @@
 use wireshark;
 use syslogd;
 use nmap;
+use ping;
+use wol;
 
 use CouchDB;
 
@@ -224,13 +226,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;
 			}
 		}
@@ -241,18 +244,19 @@
 			my @table = (
 				'ip' => qq|<input type=text name=change_ip value="$ip" onChange="document.getElementById('old_ip').style.display = '';"><span id=old_ip style="display: none; color: #888;">old: $ip<span>|,
 				'hostname' => qq|<input type=text name=hostname value="$hostname">|,
+				'ping' => ping::host($ip) ? qq|<span style="color:green">up</span>| : qq|<a href=/wol/$ip title=wol>down</a>|,
 			);
 
-			my $deploy;
+			my $config;
 
 			if ( my $mac = client::mac_from_ip( $ip ) ) {
-				$deploy = client::conf( $ip, 'deploy' => $param->{deploy} );
+				my $deploy = client::conf( $ip, 'deploy' => $param->{deploy} );
 				push @table, (
 					'mac' => format::mac( $mac => 'html' ),
 					'deploy' => html::select( 'deploy', $deploy, config::available )
 				);
-				if ( my $pxelinux = config::for_ip( $ip ) ) {
-					$deploy = qq|<h2>PXElinux</h2>| . html::pre( $pxelinux );
+				if ( $config = config::for_ip( $ip ) ) {
+					$config = qq|<h2>config</h2>| . html::pre( $config );
 				}
 			}
 
@@ -263,39 +267,44 @@
 					<input type=submit name=action value=change>
 					<input type=submit name=action value=remove style="color: red">
 					</form>|
-				, $deploy
+				, $config
 				;
 
 			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 @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>|
 				, 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;
+						$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} ? $arp->{$mac}->[1] : '' )
+							, $arp->{$mac}
 							, delete $conf->{hostname}
 							, delete $conf->{deploy}
 							, ( %$conf ? html::pre_dump( $conf ) : qq|<a href=/nmap?scan=$ip>nmap</a>| )
@@ -303,11 +312,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/ ))
@@ -325,6 +347,8 @@
 				</form>
 			|;
 		}
+	} elsif ( $path =~ m{^/wol/(\S+)} ) {
+		print $client redirect( "$url/client/$1" ), wol::power_on($1);
 	} elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) {
 		eval 'our $' . $1 . ' = ' . $2;
 		warn $@ if $@;
@@ -371,6 +395,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) ) {