--- lib/PXElator/httpd.pm 2009/09/08 16:54:35 393 +++ lib/PXElator/httpd.pm 2009/09/08 20:21:25 401 @@ -223,20 +223,33 @@ ; } elsif ( $path =~ m{^/server} ) { - if ( my $c = $param->{new_clients} ) { - server::shared( 'new_clients', $c ); + 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 , qq|
| - , html::table( 2, - 'debug' => qq|$debug|, - 'new_clients' => qq||, - map { - ( $_, html::tt eval '$server::'.$_ ) - } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain', 'base_dir', 'conf' ) - ) - , qq|
| + , html::table( 2, @table ) + , qq| + + + | ; + } elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) { my $ip = $1; $title = $ip; @@ -353,17 +366,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|
| + , html::table( -4, @table ) + , qq|
| + ; + + } elsif ( $path =~ m{^/ip/?(\w+)?} ) { print $client ok , join("\n", map { qq|$_| } ( qw/link addr route neigh ntable tunnel maddr mroute xfrm/ ))