From ab12b2aa8e3134d42c5fd42432d95eeec9be2a77 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Fri, 19 Apr 2019 15:48:14 -0400 Subject: [PATCH] GUACAMOLE-422: More substantial comment for protocol version; NULL out timezone at beginning of handshake. --- src/libguac/guacamole/protocol.h | 13 ++++++++++++- src/libguac/user-handshake.c | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/libguac/guacamole/protocol.h b/src/libguac/guacamole/protocol.h index ff7746ff..0b462b4c 100644 --- a/src/libguac/guacamole/protocol.h +++ b/src/libguac/guacamole/protocol.h @@ -38,7 +38,18 @@ #include #include -/* The protocol version */ +/** + * This defines the overall protocol version that this build of libguac + * supports. The protocol version is used to provide compatibility between + * potentially different versions of Guacamole server and clients. The + * version number is a MAJOR_MINOR_PATCH version that matches the versioning + * used throughout the components of the Guacamole project. This version + * will not necessarily increment with the other components, unless additional + * functionality is introduced that affects compatibility. + * + * This version is passed by the __guac_protocol_send_args() function from the + * server to the client during the client/server handshake. + */ #define GUACAMOLE_PROTOCOL_VERSION "VERSION_1_1_0" /* CONTROL INSTRUCTIONS */ diff --git a/src/libguac/user-handshake.c b/src/libguac/user-handshake.c index ed30c63a..26b42a76 100644 --- a/src/libguac/user-handshake.c +++ b/src/libguac/user-handshake.c @@ -238,6 +238,7 @@ int guac_user_handle_connection(guac_user* user, int usec_timeout) { user->info.audio_mimetypes = NULL; user->info.image_mimetypes = NULL; user->info.video_mimetypes = NULL; + user->info.timezone = NULL; /* Send args */ if (guac_protocol_send_args(socket, client->args)