--- lib/PXElator/httpd.pm 2009/08/27 17:44:03 311
+++ lib/PXElator/httpd.pm 2009/08/28 23:30:38 334
@@ -208,17 +208,35 @@
)
;
} 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_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 ) -- 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,65 +260,73 @@
print $client ok
, qq|
|
+ , qq|
+
+
+ |
, $deploy
;
if ( my $amt = client::conf( $ip, 'amt' ) ) {
print $client qq|AMT
|, 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|Clients on $server::ip
|
, 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|$ip|
+ qq|$ip|
, format::mac( $mac => 'html' )
- , ( $arp->{$mac} ? $arp->{$mac}->[1] : '' )
+ , $arp->{$mac}
, delete $conf->{hostname}
, delete $conf->{deploy}
, ( %$conf ? html::pre_dump( $conf ) : qq|nmap| )
);
- }
- sort { ip::to_int($a) cmp ip::to_int($b) }
- map {
- my $ip = $_;
- $ip =~ s{^.+/ip/}{};
- $ip;
- } glob("$server::conf/ip/*")
- )
- , qq|ARP
|
- , html::table( -3, 'ip', 'mac', 'dev',
- map {
- my $c = $arp->{$_};
- ( $c->[0], format::mac( $_ => 'html' ), $c->[1] )
- } sort keys %$arp
+ } client::all_ips
)
;
+ print $client qq|
+
+ |;
}
} 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|$_| } ( qw/link addr route neigh ntable tunnel maddr mroute xfrm/ ))
@@ -364,6 +390,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) ) {