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

GUACAMOLE-422: Update to remove first argument

Browse Source
This commit is contained in:
Nick Couchman 2019-04-13 21:30:57 -04:00
parent 379fce2d77
commit 340aef5362
6 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libguac/user-handshake.c
View File

@ -234,7 +234,7 @@ int guac_user_handle_connection(guac_user* user, int usec_timeout) {
guac_socket* socket = user->socket;
guac_client* client = user->client;
/* Send args */
if (guac_protocol_send_args(socket, client->args)
|| guac_socket_flush(socket)) {
@ -286,9 +286,10 @@ int guac_user_handle_connection(guac_user* user, int usec_timeout) {
/* Acknowledge connection availability */
guac_protocol_send_ready(socket, client->connection_id);
guac_socket_flush(socket);
/* Attempt join */
if (guac_client_add_user(client, user, parser->argc, parser->argv))
/* Check return value from join attempt */
if (guac_client_add_user(client, user, (parser->argc - 1),
parser->argv + 1))
guac_client_log(client, GUAC_LOG_ERROR, "User \"%s\" could NOT "
"join connection \"%s\"", user->user_id, client->connection_id);

5
src/protocols/kubernetes/settings.c
View File

@ -54,11 +54,6 @@ const char* GUAC_KUBERNETES_CLIENT_ARGS[] = {
};
enum KUBERNETES_ARGS_IDX {
/**
* The protocol version provided to the client.
*/
IDX_PROTOCOL_VERSION,
/**
* The hostname to connect to. Required.

5
src/protocols/rdp/rdp_settings.c
View File

@ -123,11 +123,6 @@ const char* GUAC_RDP_CLIENT_ARGS[] = {
};
enum RDP_ARGS_IDX {
/**
* The protocol version sent to the client.
*/
IDX_PROTOCOL_VERSION,
/**
* The hostname to connect to.

5
src/protocols/ssh/settings.c
View File

@ -66,11 +66,6 @@ const char* GUAC_SSH_CLIENT_ARGS[] = {
};
enum SSH_ARGS_IDX {
/**
* The protocol version
*/
IDX_PROTOCOL_VERSION,
/**
* The hostname to connect to. Required.

5
src/protocols/telnet/settings.c
View File

@ -59,11 +59,6 @@ const char* GUAC_TELNET_CLIENT_ARGS[] = {
};
enum TELNET_ARGS_IDX {
/**
* The protocol version provided by the client.
*/
IDX_PROTOCOL_VERSION,
/**
* The hostname to connect to. Required.

5
src/protocols/vnc/settings.c
View File

@ -82,11 +82,6 @@ const char* GUAC_VNC_CLIENT_ARGS[] = {
};
enum VNC_ARGS_IDX {
/**
* The protocol version provided to the client.
*/
IDX_PROTOCOL_VERSION,
/**
* The hostname of the VNC server (or repeater) to connect to.