Repository: incubator-guacamole-server Updated Branches: refs/heads/master cd8646b38 -> 077cc84d2
GUACAMOLE-208: Add protocol status codes representing upstream network errors and session behavior. 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/0210b7dc Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/0210b7dc Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/0210b7dc Branch: refs/heads/master Commit: 0210b7dc6b1dd76179833aad965c48008b4791fd Parents: 4da4ce7 Author: Michael Jumper <[email protected]> Authored: Sat Feb 11 10:55:45 2017 -0800 Committer: Michael Jumper <[email protected]> Committed: Wed Feb 15 21:23:07 2017 -0800 ---------------------------------------------------------------------- src/libguac/guacamole/protocol-types.h | 41 ++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/0210b7dc/src/libguac/guacamole/protocol-types.h ---------------------------------------------------------------------- diff --git a/src/libguac/guacamole/protocol-types.h b/src/libguac/guacamole/protocol-types.h index ea76910..b85d36e 100644 --- a/src/libguac/guacamole/protocol-types.h +++ b/src/libguac/guacamole/protocol-types.h @@ -35,8 +35,8 @@ * * 0x0000 - 0x00FF: Successful operations. * 0x0100 - 0x01FF: Operations that failed due to implementation status. - * 0x0200 - 0x02FF: Operations that failed due to environmental. - * 0x0300 - 0x03FF: Operations that failed due to user action. + * 0x0200 - 0x02FF: Operations that failed due to remote state/environment. + * 0x0300 - 0x03FF: Operations that failed due to user/client action. * * There is a general correspondence of these status codes with HTTP response * codes. @@ -67,25 +67,25 @@ typedef enum guac_protocol_status { * The operation could not be performed because the upstream server * is not responding. */ - GUAC_PROTOCOL_STATUS_UPSTREAM_TIMEOUT = 0x202, + GUAC_PROTOCOL_STATUS_UPSTREAM_TIMEOUT = 0x0202, /** * The operation was unsuccessful due to an error or otherwise * unexpected condition of the upstream server. */ - GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR = 0x203, + GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR = 0x0203, /** * The operation could not be performed as the requested resource * does not exist. */ - GUAC_PROTOCOL_STATUS_RESOURCE_NOT_FOUND = 0x204, + GUAC_PROTOCOL_STATUS_RESOURCE_NOT_FOUND = 0x0204, /** * The operation could not be performed as the requested resource is * already in use. */ - GUAC_PROTOCOL_STATUS_RESOURCE_CONFLICT = 0x205, + GUAC_PROTOCOL_STATUS_RESOURCE_CONFLICT = 0x0205, /** * The operation could not be performed as the requested resource is now @@ -94,6 +94,35 @@ typedef enum guac_protocol_status { GUAC_PROTOCOL_STATUS_RESOURCE_CLOSED = 0x0206, /** + * The operation could not be performed because the upstream server does + * not appear to exist. + */ + GUAC_PROTOCOL_STATUS_UPSTREAM_NOT_FOUND = 0x0207, + + /** + * The operation could not be performed because the upstream server is not + * available to service the request. + */ + GUAC_PROTOCOL_STATUS_UPSTREAM_UNAVAILABLE = 0x0208, + + /** + * The session within the upstream server has ended because it conflicted + * with another session. + */ + GUAC_PROTOCOL_STATUS_SESSION_CONFLICT = 0x0209, + + /** + * The session within the upstream server has ended because it appeared to + * be inactive. + */ + GUAC_PROTOCOL_STATUS_SESSION_TIMEOUT = 0x020A, + + /** + * The session within the upstream server has been forcibly terminated. + */ + GUAC_PROTOCOL_STATUS_SESSION_CLOSED = 0x020B, + + /** * The operation could not be performed because bad parameters were * given. */
