maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add frame timeout. Reduce frame max duration to 40ms.

Browse Source
This commit is contained in:
Michael Jumper 2013-08-20 21:13:26 -07:00
parent 280622c027
commit 1887102505
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/protocols/rdp/client.h
View File

@ -54,7 +54,14 @@
/**
* The maximum duration of a frame in milliseconds.
*/
#define GUAC_RDP_FRAME_DURATION 80
#define GUAC_RDP_FRAME_DURATION 40
/**
* The amount of time to allow per message read within a frame, in
* milliseconds. If the server is silent for at least this amount of time, the
* frame will be considered finished.
*/
#define GUAC_RDP_FRAME_TIMEOUT 15
/**
* Client data that will remain accessible through the guac_client.

2
src/protocols/rdp/guac_handlers.c
View File

@ -260,7 +260,7 @@ int rdp_guac_client_handle_messages(guac_client* client) {
/* Wait again if frame remaining */
if (frame_remaining > 0)
wait_result = rdp_guac_client_wait_for_messages(client,
frame_remaining*1000);
GUAC_RDP_FRAME_TIMEOUT*1000);
else
break;

9
src/protocols/vnc/client.h
View File

@ -47,7 +47,14 @@
/**
* The maximum duration of a frame in milliseconds.
*/
#define GUAC_VNC_FRAME_DURATION 80
#define GUAC_VNC_FRAME_DURATION 40
/**
* The amount of time to allow per message read within a frame, in
* milliseconds. If the server is silent for at least this amount of time, the
* frame will be considered finished.
*/
#define GUAC_VNC_FRAME_TIMEOUT 15
extern char* __GUAC_CLIENT;

3
src/protocols/vnc/guac_handlers.c
View File

@ -75,7 +75,8 @@ int vnc_guac_client_handle_messages(guac_client* client) {
/* Wait again if frame remaining */
if (frame_remaining > 0)
wait_result = WaitForMessage(rfb_client, frame_remaining*1000);
wait_result = WaitForMessage(rfb_client,
GUAC_VNC_FRAME_TIMEOUT*1000);
else
break;