cleanup and use x11::xterm

diff --git a/lib/PXElator/kvm.pm b/lib/PXElator/kvm.pm
index 299255e..89c2100 100644 (file)
--- a/lib/PXElator/kvm.pm
+++ b/lib/PXElator/kvm.pm
@@ -6,39 +6,55 @@ use autodie;
 
 use server;
 
+use Data::Dump qw/dump/;
+
 our $memory_size = 512;
-our $mac = 'AC:DE:48:00:00:01'; # AC = private, AD = multicast, AE = local
-our $monitor = 'tcp:' . $server::ip . ':10000,server,nowait';
+
+# AC = private, AD = multicast, AE = local
+
+our $nr = 0;
+
+sub port {
+       my $del = shift;
+       my $port = 10000 + $nr;
+       return join( $del, $server::ip, $port );
+}
 
 sub start_fork { qw/monitor wireshark/ }
 
+use x11;
+
 sub monitor {
-       exec "xterm -fg red -e nc $server::ip 10000";
+       x11::xterm( "monitor $nr" => 'nc ' . port(' ') );
 }
 
 sub wireshark {
-       exec "sudo wireshark -k -i tap0";
+       exec "wireshark -k -i tap0";
 }
 
-sub actions { qw/reset window/ }
+sub actions { qw/reset activate/ }
 
 sub reset {
-       my $sock = IO::Socket::INET->new( $server::ip .':10000' );
+       my $sock = IO::Socket::INET->new( port(':') );
        print $sock "system_reset\n";
        close $sock;
 }
 
-sub window {
+sub activate {
        system "xdotool windowactivate `xdotool search --class kvm`"
 }
 
 sub start {
+       my $nr = shift || 0;
+
+       my $mac = sprintf('AC:DE:48:00:00:%02x', $nr);
+       my $mon = port(':');
 
        my $kvm = qq|
                vdeq kvm -m $memory_size -net nic,vlan=1,macaddr=$mac
                -net vde,vlan=1,sock=/var/run/vde2/tap0.ctl
                -boot n
-               -monitor $monitor
+               -monitor tcp:$mon,server,nowait
        |;
        $kvm =~ s{\s+}{ }gs;