GUACAMOLE-208: Report network failures to connect with UPSTREAM_NOT_FOUND.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/4f4643dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/4f4643dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/4f4643dd Branch: refs/heads/master Commit: 4f4643dd2fe8b1dbc0db3268ac7716d71c021bbc Parents: a78d52e Author: Michael Jumper <mjum...@apache.org> Authored: Wed Feb 15 21:37:59 2017 -0800 Committer: Michael Jumper <mjum...@apache.org> Committed: Wed Feb 15 21:40:00 2017 -0800 ---------------------------------------------------------------------- src/common-ssh/guac_ssh.c | 2 +- src/protocols/telnet/telnet.c | 3 ++- src/protocols/vnc/vnc.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4f4643dd/src/common-ssh/guac_ssh.c ---------------------------------------------------------------------- diff --git a/src/common-ssh/guac_ssh.c b/src/common-ssh/guac_ssh.c index 488eea2..97d3bbc 100644 --- a/src/common-ssh/guac_ssh.c +++ b/src/common-ssh/guac_ssh.c @@ -483,7 +483,7 @@ guac_common_ssh_session* guac_common_ssh_create_session(guac_client* client, /* If unable to connect to anything, fail */ if (current_address == NULL) { - guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR, + guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_NOT_FOUND, "Unable to connect to any addresses."); close(fd); return NULL; http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4f4643dd/src/protocols/telnet/telnet.c ---------------------------------------------------------------------- diff --git a/src/protocols/telnet/telnet.c b/src/protocols/telnet/telnet.c index b80c959..56661a4 100644 --- a/src/protocols/telnet/telnet.c +++ b/src/protocols/telnet/telnet.c @@ -352,7 +352,8 @@ static telnet_t* __guac_telnet_create_session(guac_client* client) { /* If unable to connect to anything, fail */ if (current_address == NULL) { - guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR, "Unable to connect to any addresses."); + guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_NOT_FOUND, + "Unable to connect to any addresses."); return NULL; } http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4f4643dd/src/protocols/vnc/vnc.c ---------------------------------------------------------------------- diff --git a/src/protocols/vnc/vnc.c b/src/protocols/vnc/vnc.c index 9b0bd76..611c84f 100644 --- a/src/protocols/vnc/vnc.c +++ b/src/protocols/vnc/vnc.c @@ -202,7 +202,8 @@ void* guac_vnc_client_thread(void* data) { /* If the final connect attempt fails, return error */ if (!rfb_client) { - guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR, "Unable to connect to VNC server."); + guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_NOT_FOUND, + "Unable to connect to VNC server."); return NULL; }
