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

GUAC-556: Use guac_client_abort() for RDP errors.

Browse Source
This commit is contained in:
Michael Jumper 2014-03-22 14:42:22 -07:00
parent 6e6af91cfa
commit 22b2618562
2 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/protocols/rdp/client.c
View File

@ -318,10 +318,7 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
/* Init channels (pre-connect) */ /* Init channels (pre-connect) */
if (freerdp_channels_pre_connect(channels, instance)) { if (freerdp_channels_pre_connect(channels, instance)) {
guac_protocol_send_error(client->socket, guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR, "Error initializing RDP client channel manager");
"Error initializing RDP client channel manager",
GUAC_PROTOCOL_STATUS_SERVER_ERROR);
guac_socket_flush(client->socket);
return FALSE; return FALSE;
} }
@ -337,10 +334,7 @@ BOOL rdp_freerdp_post_connect(freerdp* instance) {
/* Init channels (post-connect) */ /* Init channels (post-connect) */
if (freerdp_channels_post_connect(channels, instance)) { if (freerdp_channels_post_connect(channels, instance)) {
guac_protocol_send_error(client->socket, guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR, "Error initializing RDP client channel manager");
"Error initializing RDP client channel manager",
GUAC_PROTOCOL_STATUS_SERVER_ERROR);
guac_socket_flush(client->socket);
return FALSE; return FALSE;
} }
@ -441,15 +435,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
/* Validate number of arguments received */ /* Validate number of arguments received */
if (argc != RDP_ARGS_COUNT) { if (argc != RDP_ARGS_COUNT) {
guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR, "Wrong argument count received.");
guac_protocol_send_error(client->socket,
"Wrong argument count received.",
GUAC_PROTOCOL_STATUS_CLIENT_BAD_REQUEST);
guac_socket_flush(client->socket);
guac_error = GUAC_STATUS_BAD_ARGUMENT;
guac_error_message = "Wrong argument count received";
return 1; return 1;
} }
@ -673,15 +659,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
/* Connect to RDP server */ /* Connect to RDP server */
if (!freerdp_connect(rdp_inst)) { if (!freerdp_connect(rdp_inst)) {
guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR, "Error connecting to RDP server");
guac_protocol_send_error(client->socket,
"Error connecting to RDP server",
GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR);
guac_socket_flush(client->socket);
guac_error = GUAC_STATUS_BAD_STATE;
guac_error_message = "Error connecting to RDP server";
return 1; return 1;
} }

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

@ -262,9 +262,7 @@ int rdp_guac_client_handle_messages(guac_client* client) {
/* If an error occurred, fail */ /* If an error occurred, fail */
if (wait_result < 0) { if (wait_result < 0) {
guac_protocol_send_error(client->socket, "Connection closed.", guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR, "Connection closed.");
GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR);
guac_socket_flush(client->socket);
return 1; return 1;
} }