--- lib/PXElator/httpd.pm 2009/08/28 19:41:16 327 +++ lib/PXElator/httpd.pm 2009/08/28 22:29:08 330 @@ -269,20 +269,14 @@ 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[5] ) - } else { - } - } read_file('/proc/net/arp') - }; + my $arp = client::arp_mac_dev; + my @ips = client::all_ips; - warn "# arp ",dump( $arp ); + my $ping; + $ping = ping::fping( @ips ) if $param->{ping}; print $client ok , qq|

Clients on $server::ip

| @@ -292,17 +286,28 @@ my $ip = $_; my $conf = client::all_conf( $ip ); my $mac = delete $conf->{mac} || ''; + my $style; + $style + = 'style="color:' + . ( $ping->{$ip} ? 'green' : 'red' ) + . '"' + if $ping; ( - qq|$ip| + qq|$ip| , format::mac( $mac => 'html' ) , $arp->{$mac} , delete $conf->{hostname} , delete $conf->{deploy} , ( %$conf ? html::pre_dump( $conf ) : qq|nmap| ) ); - } client::all_ips + } @ips ) ; + print $client qq| +
+ +
+ |; } } elsif ( $path =~ m{^/brctl} ) { print $client ok @@ -371,6 +376,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) ) {