From: Peter Dinda <pdinda@northwestern.edu>
Date: Thu, 26 Apr 2012 22:59:13 +0000 (-0500)
Subject: Usability enhancements for v3_vncserver
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=384394434d203f0c19d2ef8f1bc45a446759e270

Usability enhancements for v3_vncserver
---

diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index aad54ba..f69af46 100644
--- a/linux_usr/Makefile
+++ b/linux_usr/Makefile
@@ -50,7 +50,7 @@ EXPERIMENTAL_EXECS = 	v3_simulate  \
 #
 PRECOMPILED_EXECS = x0vncserver
 
-COPIED_EXECS = v3_vncserver
+COPIED_EXECS = v3_x0vncserver
 
 #
 # Libraries that we need to build
@@ -133,8 +133,8 @@ v3_user_keyed_stream_file : v3_user_keyed_stream_file.c libv3_user_keyed_stream.
 #
 # VNC support is compiled separately
 #
-v3_vncserver : x0vncserver
-	cp x0vncserver v3_vncserver
+v3_x0vncserver : x0vncserver
+	cp x0vncserver v3_x0vncserver
 
 
 #
diff --git a/linux_usr/v3_vncclient b/linux_usr/v3_vncclient
new file mode 100755
index 0000000..3aca886
--- /dev/null
+++ b/linux_usr/v3_vncclient
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use Getopt::Long;
+
+$port = 5951;
+$password = "";
+
+&GetOptions("port=i"=>\$port, "password=s"=>\$password);
+
+
+system "vncviewer localhost:$port\n";
+
+
diff --git a/linux_usr/v3_vncserver b/linux_usr/v3_vncserver
new file mode 100755
index 0000000..82ef652
--- /dev/null
+++ b/linux_usr/v3_vncserver
@@ -0,0 +1,20 @@
+#!/usr/bin/perl -w
+
+use Getopt::Long;
+
+$port = 5951;
+$password = "";
+
+&GetOptions("port=i"=>\$port, "password=s"=>\$password);
+
+$#ARGV==0 or die "usage: v3_vncserver [--port=port] [--password=password] /dev/v3-vmN\n";
+
+$vm=shift;
+
+system "echo \"$password\" | vncpasswd -f > ./.vncpasswd";
+
+system "v3_x0vncserver --PasswordFile=./.vncpasswd -rfbport $port $vm >/dev/null 2>&1 & echo \$! > ./.vncpid";
+ 
+print STDERR "pid of server is stored in ./.vncpid\n";
+print "You can now connect to port $port with password \"$password\"\n";
+
diff --git a/linux_usr/x0vncserver b/linux_usr/x0vncserver
index d173fe8..a16fa85 100755
Binary files a/linux_usr/x0vncserver and b/linux_usr/x0vncserver differ