From 6ddc43c4fc202b96ccff60afa66db81a3ee2f4b7 Mon Sep 17 00:00:00 2001 From: Anthony Agresta Date: Fri, 7 Nov 2014 09:32:00 -0500 Subject: [PATCH] vnc: Added delay_ms option. Fixes neutrinolabs/xrdp#182 --- vnc/vnc.c | 11 +++++++++++ vnc/vnc.h | 1 + xrdp/xrdp.ini | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/vnc/vnc.c b/vnc/vnc.c index e50dd70f..bb04726d 100644 --- a/vnc/vnc.c +++ b/vnc/vnc.c @@ -979,6 +979,13 @@ lib_mod_connect(struct vnc *v) v->sck_obj = g_create_wait_obj_from_socket(v->sck, 0); v->sck_closed = 0; + if (v->delay_ms > 0) + { + g_sprintf(text, "Waiting %d ms for VNC to start...", v->delay_ms); + v->server_msg(v, text, 0); + g_sleep(v->delay_ms); + } + g_sprintf(text, "VNC connecting to %s %s", v->ip, con_port); v->server_msg(v, text, 0); error = g_tcp_connect(v->sck, v->ip, con_port); @@ -1331,6 +1338,10 @@ lib_mod_set_param(struct vnc *v, char *name, char *value) { v->keylayout = g_atoi(value); } + else if (g_strcasecmp(name, "delay_ms") == 0) + { + v->delay_ms = g_atoi(value); + } return 0; } diff --git a/vnc/vnc.h b/vnc/vnc.h index 947b521f..6d265beb 100644 --- a/vnc/vnc.h +++ b/vnc/vnc.h @@ -115,4 +115,5 @@ struct vnc char* clip_data; int clip_data_size; tbus sck_obj; + int delay_ms; }; diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini index 5aab5a22..34adb077 100644 --- a/xrdp/xrdp.ini +++ b/xrdp/xrdp.ini @@ -156,6 +156,7 @@ username=ask password=ask ip=127.0.0.1 port=-1 +#delay_ms=2000 [xrdp3] name=console @@ -164,6 +165,7 @@ ip=127.0.0.1 port=5900 username=na password=ask +#delay_ms=2000 [xrdp4] name=vnc-any @@ -175,6 +177,7 @@ password=ask #pamusername=asksame #pampassword=asksame #pamsessionmng=127.0.0.1 +#delay_ms=2000 [xrdp5] name=sesman-any @@ -183,6 +186,7 @@ ip=ask port=-1 username=ask password=ask +#delay_ms=2000 [xrdp6] name=rdp-any