--- lib/PXElator/httpd.pm	2009/08/18 12:46:41	251
+++ lib/PXElator/httpd.pm	2009/08/29 15:30:49	343
@@ -26,6 +26,7 @@
 <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>
 </div>
 
@@ -54,6 +55,9 @@
 use ip;
 use wireshark;
 use syslogd;
+use nmap;
+use ping;
+use wol;
 
 use CouchDB;
 
@@ -206,95 +210,157 @@
 			)
 			;
 	} 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;
+			}
+		}
+
+ 		if ( ! $ip ) {
+			my $peer_ip = $client->peerhost;
+
+			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 >= $from_int && $ip_int <= $to_int ) {
+				$ip = $peer_ip;
+			}
 		}
 
-		if ( $ip ne $server::ip ) {
+		if ( $ip && $ip ne $server::ip ) {
 			my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
 
+			my $nmap = qq|<a href=/nmap?scan=$ip>nmap</a>|;
+
 			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> $nmap| : qq|<a href=/wol/$ip title=wol>down</a> $nmap|,
 			);
 
-			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 )
 				);
-				$deploy = qq|<h2>PXElinux</h2>| . html::pre( config::for_ip( $ip ) );
+				if ( $config = config::for_ip( $ip ) ) {
+					$config = qq|<h2>config</h2>| . html::pre( $config );
+				}
 			}
 
 			print $client ok
 				, qq|<form method=get>|
 				, html::table( 2, @table ),
-				, qq|<input type=submit value=change></form>|
-				, $deploy
+				, qq|
+					<input type=submit name=action value=change>
+					<input type=submit name=action value=remove style="color: red">
+					</form>|
+				, $config
 				;
 
 			if ( my $amt = client::conf( $ip, 'amt' ) ) {
-				print $client qq|<h2>AMT</h2>|, amt::info( $amt );
+				print $client qq|<h2>AMT</h2>|, amt::info( $amt, $ip );
 			}
+
 		} else {
 
-			my $arp = {
-				map {
-					my @c = split(/\s+/,$_);
-					if ( $#c == 5 ) {
-						( 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( -5,
-					'ip', 'hostname', 'mac', 'deploy', 'arp',
+					'ip', 'mac', 'dev', 'hostname', 'conf',
 					map {
 						my $ip = $_;
-						$ip =~ s{^.+/ip/}{};
-						my $mac = client::mac_from_ip $ip;
-						my $arp = $arp->{ $mac };
-						$arp = $arp ? $arp->[1] : '';
-						$arp =~ s{$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 href=/client/$ip>$ip</a>|
-							, client::conf( $ip, 'hostname' )
+							qq|<a $style name=$ip href=/client/$ip>$ip</a>|
 							, format::mac( $mac => 'html' )
-							, html::tt( client::conf( $ip, 'deploy' ) )
-							, $arp
+							, $arp->{$mac}
+							, delete $conf->{hostname}
+							, join("\n", map {
+								my $name = $_;
+								my $html = $conf->{$name};
+								if ( $name eq 'amt' ) {
+									$html = qq|<a title="$html" href=http://$ip:16992/logon.htm>logon</a>|;
+								}
+								$html = qq|<pre style="display: inline">$html</pre>|
+								unless
+#0 &&
+								$html =~ s{\b(\S+)\t(\S+)\t(\S+)\b}{<b title="$1/$2">$3</b> }gs;
+								qq|<em>$name</em> $html<br>|
+							} keys %$conf )
 						);
-					}
-					glob("$server::conf/ip/*") 
-				)
-				, qq|<h2>ARP</h2>|
-				, html::table( -3, 'mac', 'dev', 'ip',
-					map {
-						my $c = $arp->{$_};
-						( format::mac( $_ => 'html' ), $c->[1], $c->[0] )
-					} sort keys %$arp
+					} 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/ ))
 			, ip::html( $1 )
 			;
+	} elsif ( $path =~ m{^/nmap} ) {
+		if ( my $scan = $param->{scan} ) {
+			nmap::scan( $scan );
+			print $client redirect("$url/client#$scan");
+		} else {
+			print $client ok, qq|
+				<form method=get>
+				<input type=text name=scan>
+				<input type=submit value=scan>
+				</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 $@;
@@ -341,6 +407,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) ) {