--- lib/PXElator/httpd.pm	2009/08/27 19:03:56	314
+++ lib/PXElator/httpd.pm	2009/08/28 19:41:16	327
@@ -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,7 +259,10 @@
 			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
 				;
 
@@ -256,7 +276,7 @@
 					my @c = split(/\s+/,$_);
 					if ( $#c == 5 ) {
 						client::save_ip_mac( $c[0], $c[3] );
-						( uc $c[3] => [ $c[0] , $c[5] ] )
+						( uc $c[3] => $c[5] )
 					} else {
 					}
 				} read_file('/proc/net/arp')
@@ -267,7 +287,7 @@
 			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 );
@@ -275,18 +295,12 @@
 						(
 							qq|<a 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/*") 
+					} client::all_ips
 				)
 				;
 		}