--- lib/PXElator/httpd.pm 2009/09/08 18:28:15 400 +++ lib/PXElator/httpd.pm 2009/09/08 20:21:25 401 @@ -366,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/ ))