--- lib/PXElator/httpd.pm 2009/08/28 19:44:38 328
+++ lib/PXElator/httpd.pm 2009/08/28 22:55:01 333
@@ -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,22 +286,40 @@
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
- ,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/ ))