--- lib/PXElator/httpd.pm 2009/08/28 19:39:54 326
+++ lib/PXElator/httpd.pm 2009/08/28 19:44:38 328
@@ -276,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')
@@ -287,7 +287,7 @@
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 );
@@ -295,7 +295,7 @@
(
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| )
@@ -371,6 +371,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) ) {