--- lib/PXElator/httpd.pm 2009/08/30 16:36:37 380
+++ lib/PXElator/httpd.pm 2009/09/09 12:16:41 411
@@ -39,12 +39,13 @@
sub menu {
qq{
}}
@@ -85,6 +86,8 @@
return if ! -f $full;
+ return if $full =~ m{\.ico$};
+
if ( my $pid = fork ) {
# parent
close($client);
@@ -173,12 +176,15 @@
;
}
- if ( $name->can('fork_if_active') ) {
- $html .= qq| $_| foreach $name->fork_if_active;
+ my $class = $name;
+ $class =~ s{\.\d+$}{};
+
+ if ( $class->can('fork_if_active') ) {
+ $html .= qq| $_| foreach $class->fork_if_active;
}
- if ( $name->can('actions') ) {
- $html .= qq| $_| foreach $name->actions;
+ if ( $class->can('actions') ) {
+ $html .= qq| $_| foreach $class->actions;
}
} else {
if ( $pid =~ m{^\d+$} ) {
@@ -212,22 +218,45 @@
}
}
+ my $kvm = kvm::next_nr;
+ $kvm = qq||;
+
print $client ok
, html::table( 2, @rows )
, $below_table
+ , $kvm
, html::tabs( log::mac_changes )
, $debug_proc
;
} elsif ( $path =~ m{^/server} ) {
+ foreach my $name ( keys %$param ) {
+ eval '$server::' . $name . '= $param->{$name}';
+ }
+ my @table = (
+ 'debug' => qq|$debug|,
+ , 'new_clients' => qq||
+ );
+
+ foreach my $editable ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain' ) {
+ my $v = eval '$server::' . $editable;
+ push @table, ( $editable, qq|| );
+ }
+
+ foreach my $readonly ( 'base_dir', 'conf' ) {
+ my $v = eval '$server::' . $readonly;
+ push @table, ( $readonly, html::tt $v );
+ }
+
print $client ok
- , html::table( 2,
- 'debug' => qq|$debug|,
- map {
- ( $_, html::tt eval '$server::'.$_ )
- } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir', 'conf' )
- )
+ , qq|
+ |
;
+
} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
my $ip = $1;
$title = $ip;
@@ -295,7 +324,10 @@
}
}
- print $client qq|amt info
|, html::pre_dump( amt::info( $ip ) ) if $conf->{amt};
+ if ( $conf->{amt} ) {
+ print $client qq|amt network
|, html::pre_dump( amt::network( $ip ) );
+ print $client qq|amt log
|, html::pre_dump( amt::log( $ip ) );
+ }
} else {
@@ -341,17 +373,42 @@
|;
}
+
+
} elsif ( $path =~ m{^/brctl} ) {
- print $client ok, html::table( -4,
+
+ system 'brctl addif virtual ' . $param->{addif} if $param->{addif};
+ system 'brctl delif virtual ' . $param->{delif} if $param->{delif};
+
+ my $in_virtual;
+
+ my @table =
map {
my @c = split(/\t+/,$_,4);
if ( $#c == 1 ) {
- ( '', '', '', $c[1] )
+ $in_virtual->{ $c[1] }++;
+ @c = ( '', '', '', $c[1] );
} else {
- @c
+ $in_virtual->{ $c[3] }++;
}
+ if ( $c[3] =~ m{\d$} ) {
+ $c[3] = qq||;
+ }
+ @c
} split(/\n/, `brctl show`)
- );
+ ;
+
+ my @add_ifs = grep { ! $in_virtual->{$_} && $_ ne 'virtual' } ip::devices_up;
+
+ push @table, ( '', '', '', html::select( 'addif', @add_ifs ) . qq|| );
+
+ print $client ok
+ , qq||
+ ;
+
+
} elsif ( $path =~ m{^/ip/?(\w+)?} ) {
print $client ok
, join("\n", map { qq|$_| } ( qw/link addr route neigh ntable tunnel maddr mroute xfrm/ ))
@@ -380,9 +437,11 @@
print $client redirect($url), qq|$1 = $2
Location: $url|;
server::debug( $debug ) if $1 eq 'debug';
} elsif ( $path =~ m{^/start_stop/(\S+)} ) {
- print $client redirect, daemons::start_stop($1);
+ print $client redirect, daemons::start_stop($1,$param);
} elsif ( $path =~ m{^/action/([^/]+)/(.+)} ) {
- $1->$2();
+ my ( $package, $method ) = ( $1, $2 );
+ $ENV{nr} = $1 if $package =~ s{\.(\d+)$}{};
+ $package->$method();
print $client redirect;
} elsif ( $path =~ m{^/kill/static/(\d+)} ) {
print $client redirect;
@@ -398,9 +457,9 @@
warn 'network ', network::setup();
- daemons::start_stop 'browser', $url;
+ daemons::start_stop 'browser', { url => $url };
daemons::start_stop $_ foreach ( qw/dhcpd tftpd dnsd syslogd/ );
- daemons::start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device
+# daemons::start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device
my $server = IO::Socket::INET->new(
Proto => 'tcp',
@@ -413,6 +472,7 @@
print "url $url\n";
syslogd::install_local;
+ client::rebuild_mac_links;
while (1) {
my $client = $server->accept() || next; # ALARM trickle us