File kvm-studio-vnc.patch of Package kvm
Index: qemu-kvm-0.12.5/vnc.c
===================================================================
--- qemu-kvm-0.12.5.orig/vnc.c
+++ qemu-kvm-0.12.5/vnc.c
@@ -48,6 +48,7 @@
static VncDisplay *vnc_display; /* needed for info vnc */
static DisplayChangeListener *dcl;
+static int allowed_connections = 0;
static char *addr_to_string(const char *format,
struct sockaddr_storage *sa,
@@ -1044,6 +1045,8 @@ static void vnc_disconnect_start(VncStat
static void vnc_disconnect_finish(VncState *vs)
{
+ static int num_disconnects = 0;
+
if (vs->input.buffer) {
qemu_free(vs->input.buffer);
vs->input.buffer = NULL;
@@ -1076,10 +1079,19 @@ static void vnc_disconnect_finish(VncSta
vnc_remove_timer(vs->vd);
qemu_free(vs);
+
+ num_disconnects++;
+ if(allowed_connections > 0 && allowed_connections <= num_disconnects) {
+ VNC_DEBUG("Maximum number of disconnects (%d) reached:"
+ " Session terminating\n", allowed_connections);
+ exit(0);
+ }
}
int vnc_client_io_error(VncState *vs, int ret, int last_errno)
{
+ static int num_disconnects = 0;
+
if (ret == 0 || ret == -1) {
if (ret == -1) {
switch (last_errno) {
@@ -2478,6 +2490,39 @@ char *vnc_display_local_addr(DisplayStat
return vnc_socket_local_addr("%s:%s", vs->lsock);
}
+static void read_file_password(DisplayState *ds, char *filename)
+{
+ FILE *pfile = NULL;
+ char *passwd = NULL;
+ int start = 0, length = 0, rc = 0;
+
+ if(strlen(filename) == 0) {
+ printf("No file supplied\n");
+ return;
+ }
+
+ pfile = fopen(filename, "r");
+ if(pfile == NULL) {
+ printf("Could not read from %s\n", filename);
+ return;
+ }
+
+ start = ftell(pfile);
+ fseek(pfile, 0L, SEEK_END);
+ length = ftell(pfile);
+ fseek(pfile, 0L, start);
+
+ passwd = malloc(length+1);
+ rc = fread(passwd, 1, length, pfile);
+ fclose(pfile);
+
+ if(rc == length && rc > 0) {
+ vnc_display_password(ds, passwd);
+ }
+
+ free(passwd);
+}
+
int vnc_display_open(DisplayState *ds, const char *display)
{
VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
@@ -2507,7 +2552,36 @@ int vnc_display_open(DisplayState *ds, c
while ((options = strchr(options, ','))) {
options++;
if (strncmp(options, "password", 8) == 0) {
+ char *start, *end;
+ start = strchr(options, '=');
+ end = strchr(options, ',');
password = 1; /* Require password auth */
+ if (start && (!end || (start < end))) {
+ int len = end ? end-(start+1) : strlen(start+1);
+ char *text = qemu_malloc(len+1);
+ strncpy(text, start+1, len);
+ text[len] = '\0';
+
+ if (strncmp(options, "password-file=", 14) == 0) {
+ read_file_password(ds, text);
+ } else {
+ vnc_display_password(ds, text);
+ }
+
+ free(text);
+ }
+ } else if (strncmp(options, "allowed-connections=", 20) == 0) {
+ char *start, *end;
+ start = strchr(options, '=');
+ end = strchr(options, ',');
+ if (start && (!end || (start < end))) {
+ int len = end ? end-(start+1) : strlen(start+1);
+ char *text = qemu_malloc(len+1);
+ strncpy(text, start+1, len);
+ text[len] = '\0';
+ VNC_DEBUG("Maximum number of disconnects: %s\n", text);
+ allowed_connections = atoi(text);
+ }
} else if (strncmp(options, "reverse", 7) == 0) {
reverse = 1;
} else if (strncmp(options, "to=", 3) == 0) {