--- lib/PXElator/httpd.pm 2009/08/03 08:52:32 118 +++ lib/PXElator/httpd.pm 2009/08/05 13:25:55 149 @@ -18,6 +18,15 @@ #use JSON; use IO::Socket::INET; +sub menu {qq{ + +
+home +server +
+ +}} + our $pids; $pids = { httpd => $$ } unless defined $pids; # keep pids on refresh @@ -98,7 +107,7 @@ sub start_stop { my $daemon = shift; - my $pid = $pids->{$daemon}; + my $pid = $pids->{$daemon} || 'not started'; warn "start_stop $daemon $pid\n"; @@ -136,6 +145,8 @@ sub get_request { my ( $client, $path, $param ) = @_; + server->refresh; + warn "get_request $path ", $param ? dump( $param ) : '', "\n"; if ( my $found = static( $client,$path ) ) { @@ -147,9 +158,6 @@ $pids->{screen} ? qq|start| : qq|start screen first|; my @rows = ( - 'ip', html::tt( $server::ip ), - 'netmask', html::tt( $server::netmask ), - 'debug', qq|$debug|, ); @@ -202,12 +210,18 @@ } print $client $ok + , menu() , html::table( 2, @rows ) , $below_table , html::tabs( log::mac_changes ) , $debug_proc ; + } 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{^/our/(\w+)/(\S+)} ) { eval 'our $' . $1 . ' = ' . $2; warn $@ if $@; @@ -240,9 +254,12 @@ } use browser; +use network; sub start { + warn 'tap ', network::tap(); + my $server = IO::Socket::INET->new( Proto => 'tcp', LocalPort => $httpd::port, @@ -278,13 +295,7 @@ warn "500 $request"; } - print $client qq{ -
- reload - index - exit -
- } if $client->connected; + print $client menu() if $client->connected; }