--- lib/PXElator/kvm.pm	2009/08/04 17:16:11	140
+++ lib/PXElator/kvm.pm	2009/08/16 21:35:23	229
@@ -6,40 +6,63 @@
 
 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';
 
-sub start_fork { qw/monitor wireshark/ }
+# AC = private, AD = multicast, AE = local
 
-sub monitor {
-	exec "xterm -fg red -e nc $server::ip 10000";
+our $nr = 0;
+
+sub port {
+	my $del = shift;
+	my $port = 10000 + $nr;
+	return join( $del, $server::ip, $port );
 }
 
-sub wireshark {
-	exec "sudo wireshark -k -i tap0";
+sub fork_if_active { qw/monitor/ }
+
+use x11;
+
+sub monitor {
+	x11::xterm( "monitor $nr" => 'nc ' . port(' ') );
 }
 
-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 $ifname = 'kvm0';
+
+#	system "ifconfig $ifname down";
+#	system "brctl delif virtual $ifname";
+#	system "tunctl -d $ifname";
+
+	system "tunctl -t $ifname"; # -u $server::user
+	system "ifconfig $ifname up";
+	system "brctl addif virtual $ifname";
 
 	my $kvm = qq|
-		vdeq kvm -m $memory_size -net nic,vlan=1,macaddr=$mac
-		-net vde,vlan=1,sock=/var/run/vde2/tap0.ctl
+		kvm -m $memory_size -net nic,macaddr=$mac
+		-net tap,ifname=$ifname,script=no
 		-boot n
-		-monitor $monitor
+		-monitor tcp:$mon,server,nowait
 	|;
+	#	-runas $server::user
 	$kvm =~ s{\s+}{ }gs;
 
 	warn $kvm;