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

GUAC-744: Send ready instruction BEFORE guac_client_init. Sending after is just crazy.

Browse Source
This commit is contained in:
Michael Jumper 2014-06-26 15:32:35 -07:00
parent 86a59c43b3
commit 40124c11a6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/guacd/daemon.c
View File

@ -216,6 +216,10 @@ void guacd_handle_connection(guac_socket* socket) {
sizeof(char*) * video->argc); sizeof(char*) * video->argc);
client->info.video_mimetypes[video->argc] = NULL; client->info.video_mimetypes[video->argc] = NULL;
/* Send connection ID */
guacd_log_info("Connection ID is \"%s\"", client->connection_id);
guac_protocol_send_ready(socket, client->connection_id);
/* Init client */ /* Init client */
init_result = guac_client_plugin_init_client(plugin, init_result = guac_client_plugin_init_client(plugin,
client, connect->argc, connect->argv); client, connect->argc, connect->argv);
@ -236,10 +240,6 @@ void guacd_handle_connection(guac_socket* socket) {
return; return;
} }
/* Send connection ID */
guacd_log_info("Connection ID is \"%s\"", client->connection_id);
guac_protocol_send_ready(socket, client->connection_id);
/* Start client threads */ /* Start client threads */
guacd_log_info("Starting client"); guacd_log_info("Starting client");
if (guacd_client_start(client)) if (guacd_client_start(client))