split tie scalar into package ties

[pxelator] / lib / PXElator / httpd.pm

diff --git a/lib/PXElator/httpd.pm b/lib/PXElator/httpd.pm
index d5b9684..fb814a6 100644 (file)
--- a/lib/PXElator/httpd.pm
+++ b/lib/PXElator/httpd.pm
@@ -85,6 +85,8 @@ sub static {
 
        return if ! -f $full;
 
+       return if $full =~ m{\.ico$};
+
        if ( my $pid = fork ) {
                # parent
                close($client);
@@ -173,12 +175,15 @@ warn "XXX pids = ", dump( $daemons::pids );
                                                ;
                                }
 
-                               if ( $name->can('fork_if_active') ) {
-                                       $html .= qq| <a href=/start_stop/$name/$_>$_</a>| foreach $name->fork_if_active;
+                               my $class = $name;
+                               $class =~ s{\.\d+$}{};
+
+                               if ( $class->can('fork_if_active') ) {
+                                       $html .= qq| <a href=/start_stop/$name/$_>$_</a>| foreach $class->fork_if_active;
                                }
 
-                               if ( $name->can('actions') ) {
-                                       $html .= qq| <a href=/action/$name/$_>$_</a>| foreach $name->actions;
+                               if ( $class->can('actions') ) {
+                                       $html .= qq| <a href=/action/$name/$_>$_</a>| foreach $class->actions;
                                }
                        } else {
                                if ( $pid =~ m{^\d+$} ) {
@@ -212,22 +217,45 @@ warn "XXX pids = ", dump( $daemons::pids );
                        }
                }
 
+               my $kvm = kvm::next_nr;
+               $kvm = qq|<div><a href=/start_stop/kvm?nr=$kvm>create new kvm $kvm</a></div>|;
+
                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|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
+                       , 'new_clients' => qq|<input type=text name=new_clients size=3 value="$server::new_clients">|
+               );
+
+               foreach my $editable ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain' ) {
+                       my $v = eval '$server::' . $editable;
+                       push @table, ( $editable, qq|<input type=text name=$editable value="$v">| );
+               }
+
+               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|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
-                                map {
-                                       ( $_, html::tt eval '$server::'.$_ )
-                                } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir', 'conf' )
-                       )
+                       , qq|<form method=get>|
+                       , html::table( 2, @table )
+                       , qq|
+                               <input type=submit name=action value=change>
+                               </form>
+                       |
                        ;
+
        } elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
                my $ip = $1;
                $title = $ip;
@@ -295,7 +323,10 @@ warn "XXX pids = ", dump( $daemons::pids );
                                }
                        }
 
-                       print $client qq|<h2>amt info</h2>|, amt::info( $ip ) if $conf->{amt};
+                       if ( $conf->{amt} ) {
+                               print $client qq|<h2>amt network</h2>|, html::pre_dump( amt::network( $ip ) );
+                               print $client qq|<h2>amt log</h2>|, html::pre_dump( amt::log( $ip ) );
+                       }
 
                } else {
 
@@ -325,7 +356,7 @@ warn "XXX pids = ", dump( $daemons::pids );
                                                        if $ping;
                                                $style ||= '';
                                                (
-                                                       qq|<a $style name=$ip href=/client/$ip>$ip</a>|
+                                                       qq|<a $style name=$ip target=$ip href=/client/$ip>$ip</a>|
                                                        , format::mac( $mac => 'html' )
                                                        , $arp->{$mac}
                                                        , delete $conf->{hostname}
@@ -341,17 +372,42 @@ warn "XXX pids = ", dump( $daemons::pids );
                                </form>
                        |;
                }
+
+
        } 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|<input type=submit name=delif value=$c[3] style="color:red" title="remove $c[3] from bridge">|;
+                               }
+                               @c
                        } split(/\n/, `brctl show`)
-               );
+               ;
+
+               my @add_ifs = grep { ! $in_virtual->{$_} && $_ ne 'virtual' } ip::devices_up;
+
+               push @table, ( '', '', '', html::select( 'addif', @add_ifs ) . qq|<input type=submit value=add></form>| );
+
+               print $client ok
+                       , qq|<form>|
+                       , html::table( -4, @table )
+                       , qq|</form>|
+                       ;
+
+
        } elsif ( $path =~ m{^/ip/?(\w+)?} ) {
                print $client ok
                        , join("\n", map { qq|<a href=/ip/$_>$_</a>| } ( qw/link addr route neigh ntable tunnel maddr mroute xfrm/ ))
@@ -380,9 +436,11 @@ warn "XXX pids = ", dump( $daemons::pids );
                print $client redirect($url), qq|<big>$1 = $2</big><br>Location: <a href="$url">$url</a>|;
                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 +456,9 @@ sub start {
 
        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 +471,7 @@ sub start {
        print "url $url\n";
 
        syslogd::install_local;
+       client::rebuild_mac_links;
 
        while (1) {
                my $client = $server->accept() || next; # ALARM trickle us