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

GUACAMOLE-484: Merge ensure disconnect reason code is checked for orderly RDP disconnect.

Browse Source
This commit is contained in:
Nick Couchman 2018-01-22 15:29:26 -05:00
commit 8c844e6eab
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/protocols/rdp/rdp.c
View File

@ -763,21 +763,14 @@ static int guac_rdp_handle_connection(guac_client* client) {
pthread_mutex_lock(&(rdp_client->rdp_lock)); pthread_mutex_lock(&(rdp_client->rdp_lock));
/* Check the libfreerdp fds */ /* Check the libfreerdp fds */
if (!freerdp_check_fds(rdp_inst)) { if (!freerdp_check_fds(rdp_inst)
guac_client_abort(client, || !freerdp_channels_check_fds(channels, rdp_inst)) {
GUAC_PROTOCOL_STATUS_UPSTREAM_UNAVAILABLE,
"Error handling RDP file descriptors");
pthread_mutex_unlock(&(rdp_client->rdp_lock));
return 1;
}
/* Check channel fds */ /* Flag connection failure */
if (!freerdp_channels_check_fds(channels, rdp_inst)) { wait_result = -1;
guac_client_abort(client,
GUAC_PROTOCOL_STATUS_UPSTREAM_UNAVAILABLE,
"Error handling RDP channel file descriptors");
pthread_mutex_unlock(&(rdp_client->rdp_lock)); pthread_mutex_unlock(&(rdp_client->rdp_lock));
return 1; break;
} }
/* Check for channel events */ /* Check for channel events */
@ -801,13 +794,6 @@ static int guac_rdp_handle_connection(guac_client* client) {
} }
/* Handle RDP disconnect */
if (freerdp_shall_disconnect(rdp_inst)) {
guac_rdp_client_abort(client);
pthread_mutex_unlock(&(rdp_client->rdp_lock));
return 1;
}
pthread_mutex_unlock(&(rdp_client->rdp_lock)); pthread_mutex_unlock(&(rdp_client->rdp_lock));
/* Calculate time remaining in frame */ /* Calculate time remaining in frame */
@ -841,15 +827,26 @@ static int guac_rdp_handle_connection(guac_client* client) {
} }
/* If an error occurred, fail */ /* Test whether the RDP server is closing the connection */
if (wait_result < 0) pthread_mutex_lock(&(rdp_client->rdp_lock));
int connection_closing = freerdp_shall_disconnect(rdp_inst);
pthread_mutex_unlock(&(rdp_client->rdp_lock));
/* Close connection cleanly if server is disconnecting */
if (connection_closing)
guac_rdp_client_abort(client);
/* If a low-level connection error occurred, fail */
else if (wait_result < 0)
guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_UNAVAILABLE, guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_UNAVAILABLE,
"Connection closed."); "Connection closed.");
/* Flush frame */ /* Flush frame only if successful */
else {
guac_common_display_flush(rdp_client->display); guac_common_display_flush(rdp_client->display);
guac_client_end_frame(client); guac_client_end_frame(client);
guac_socket_flush(client->socket); guac_socket_flush(client->socket);
}
} }