--- lib/PXElator/httpd.pm 2009/08/27 16:47:42 309 +++ lib/PXElator/httpd.pm 2009/08/28 19:41:16 327 @@ -26,6 +26,7 @@ server brctl ip +nmap client @@ -54,6 +55,7 @@ use ip; use wireshark; use syslogd; +use nmap; use CouchDB; @@ -206,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 = ( @@ -240,7 +259,10 @@ print $client ok , qq|
| + , qq| + + + | , $deploy ; @@ -253,7 +275,8 @@ map { my @c = split(/\s+/,$_); if ( $#c == 5 ) { - ( uc $c[3] => [ $c[0] , $c[5] ] ) + client::save_ip_mac( $c[0], $c[3] ); + ( uc $c[3] => $c[5] ) } else { } } read_file('/proc/net/arp') @@ -264,33 +287,20 @@ print $client ok , qq|