--- lib/PXElator/httpd.pm 2009/08/06 18:09:30 161 +++ lib/PXElator/httpd.pm 2009/08/06 18:10:31 162 @@ -17,6 +17,7 @@ use File::Slurp; #use JSON; use IO::Socket::INET; +use Regexp::Common qw/net/; sub menu {qq{ @@ -148,7 +149,7 @@ } } -my $ok = qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n|; +my $ok = qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu(); my $redirect = qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $url\r\n\r\n|; sub get_request { @@ -215,7 +216,6 @@ } print $client $ok - , menu() , html::table( 2, @rows ) , $below_table , html::tabs( log::mac_changes ) @@ -224,25 +224,40 @@ } elsif ( $path =~ m{^/server} ) { print $client $ok - , menu() , html::table( 2, map { ( $_, eval '$server::'.$_ ) } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir' ) ) ; - } elsif ( $path =~ m{^/client} ) { - my $ip = $client->peerhost; - my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} ); - my $deploy = client::conf( $ip, 'deploy' => $param->{deploy} ); - print $client $ok - , menu() - , qq|
| - , config::for_ip( $ip ) - , qq|| - ; + } elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) { + my $ip = $1 || $client->peerhost; + if ( $ip ne $server::ip ) { + my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} ); + my $deploy = client::conf( $ip, 'deploy' => $param->{deploy} ); + print $client $ok + , qq|| + , qq|
| + , config::for_ip( $ip ) + , qq|| + ; + } else { + print $client $ok + , qq|