Repository: guacamole-server Updated Branches: refs/heads/master bb9560716 -> 768b2ba0f
GUACAMOLE-661: Mark "nest" instruction and socket as deprecated. Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/d73b86b4 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/d73b86b4 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/d73b86b4 Branch: refs/heads/master Commit: d73b86b4b7c41fc7fa16423fc340d644c729b233 Parents: bb95607 Author: Michael Jumper <[email protected]> Authored: Mon Jan 7 09:37:08 2019 -0800 Committer: Michael Jumper <[email protected]> Committed: Mon Jan 7 09:37:08 2019 -0800 ---------------------------------------------------------------------- src/libguac/guacamole/protocol.h | 7 +++++++ src/libguac/guacamole/socket.h | 7 +++++++ 2 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/d73b86b4/src/libguac/guacamole/protocol.h ---------------------------------------------------------------------- diff --git a/src/libguac/guacamole/protocol.h b/src/libguac/guacamole/protocol.h index fd824af..d1a0420 100644 --- a/src/libguac/guacamole/protocol.h +++ b/src/libguac/guacamole/protocol.h @@ -214,6 +214,13 @@ int guac_protocol_send_mouse(guac_socket* socket, int x, int y, * If an error occurs sending the instruction, a non-zero value is * returned, and guac_error is set appropriately. * + * @deprecated + * The "nest" instruction and the corresponding guac_socket + * implementation are no longer necessary, having been replaced by + * the streaming instructions ("blob", "ack", "end"). Code using nested + * sockets or the "nest" instruction should instead write to a normal + * socket directly. + * * @param socket The guac_socket connection to use. * @param index The integer index of the stram to send the protocol * data over. http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/d73b86b4/src/libguac/guacamole/socket.h ---------------------------------------------------------------------- diff --git a/src/libguac/guacamole/socket.h b/src/libguac/guacamole/socket.h index e83a4eb..2da697f 100644 --- a/src/libguac/guacamole/socket.h +++ b/src/libguac/guacamole/socket.h @@ -180,6 +180,13 @@ guac_socket* guac_socket_open(int fd); * If an error occurs while allocating the guac_socket object, NULL is returned, * and guac_error is set appropriately. * + * @deprecated + * The "nest" instruction and the corresponding guac_socket + * implementation are no longer necessary, having been replaced by + * the streaming instructions ("blob", "ack", "end"). Code using nested + * sockets or the "nest" instruction should instead write to a normal + * socket directly. + * * @param parent The guac_socket this new guac_socket should write nest * instructions to. * @param index The stream index to use for the written nest instructions.
