--- lib/PXElator/httpd.pm	2009/08/28 22:29:08	330
+++ lib/PXElator/httpd.pm	2009/08/30 15:22:41	376
@@ -56,6 +56,8 @@
 use wireshark;
 use syslogd;
 use nmap;
+use ping;
+use wol;
 
 use CouchDB;
 
@@ -224,38 +226,40 @@
  		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;
 			}
 		}
 
 		if ( $ip && $ip ne $server::ip ) {
-			my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
 
+			my @editable = ( qw/hostname config homepage/ );
+
+			client::conf( $ip, $_ => $param->{$_} ) foreach @editable;
+
+			my $conf = client::all_conf( $ip );
+			my $config = delete $conf->{config};
+
+			my $nmap = qq|<a href=/nmap?scan=$ip>nmap</a>|;
 			my @table = (
+				'ping' => ping::host($ip)
+					? qq|<span style="color:green">up</span> $nmap|
+					: qq|<span style="color: red">down</span> <a href=/wol/$ip>wol</a> $nmap|
+					,
 				'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">|,
+				'mac' => format::mac( delete $conf->{mac}, 'html' ),
+				'hostname' => qq|<input type=text name=hostname value="| . delete($conf->{hostname}) . qq|">|,
+				'config' => html::select( 'config', $config, config::available ),
+				html::conf( $ip, $conf, 'edit', @editable )
 			);
 
-			my $deploy;
-
-			if ( my $mac = client::mac_from_ip( $ip ) ) {
-				$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 );
-				}
-			}
-
 			print $client ok
 				, qq|<form method=get>|
 				, html::table( 2, @table ),
@@ -263,25 +267,32 @@
 					<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 );
+			if ( $config ) {
+				if ( my $for_ip = config::for_ip( $ip ) ) {
+					print $client qq|<h2>config::for_ip</h2>| . html::pre( $for_ip );
+				}
 			}
 
+			print $client qq|<h2>amt info</h2>|, amt::info( $ip );
+
 		} else {
 
-			my $arp = client::arp_mac_dev;
-			my @ips = client::all_ips;
+			my @ping;
+			if ( my $host = $param->{ping_target} ) {
+				@ping = ( $host );
+			} elsif ( $param->{ping} ) {
+				@ping = client::all_ips;
+			}
 
-			my $ping;
-			$ping = ping::fping( @ips ) if $param->{ping};
+			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', 'dev', 'hostname', 'deploy', 'conf',
+				, html::table( -5,
+					'ip', 'mac', 'dev', 'hostname', 'conf',
 					map {
 						my $ip = $_;
 						my $conf = client::all_conf( $ip );
@@ -292,27 +303,35 @@
 							. ( $ping->{$ip} ? 'green' : 'red' )
 							. '"'
 							if $ping;
+						$style ||= '';
 						(
 							qq|<a $style name=$ip href=/client/$ip>$ip</a>|
 							, format::mac( $mac => 'html' )
 							, $arp->{$mac}
 							, delete $conf->{hostname}
-							, delete $conf->{deploy}
-							, ( %$conf ? html::pre_dump( $conf ) : qq|<a href=/nmap?scan=$ip>nmap</a>| )
-						);
-					} @ips
+							, html::conf( $ip, $conf, 'inline' )
+						)
+					} 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/ ))
@@ -330,6 +349,11 @@
 				</form>
 			|;
 		}
+	} elsif ( $path =~ m{^/wol/(\S+)} ) {
+		print $client redirect( "$url/client/$1" ), wol::power_on($1);
+	} elsif ( $path =~ m!^/amt/(\w+)/$RE{net}{IPv4}{-keep}! ) {
+		my ( $run, $ip ) = ( $1, $2 );
+		print $client redirect( "$url/client/$ip" ), amt::RemoteControl( $ip, $run );
 	} elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) {
 		eval 'our $' . $1 . ' = ' . $2;
 		warn $@ if $@;
@@ -368,6 +392,8 @@
 
 	print "url $url\n";
 
+	syslogd::install_local;
+
 	while (1) {
 		my $client = $server->accept() || next; # ALARM trickle us
 		my $request = <$client>;