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

Actually handle audio/video part of preamble.

Browse Source
This commit is contained in:
Michael Jumper 2012-10-30 16:16:59 -07:00
parent 0ffeb7b819
commit ab2c10ef51
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
guacd/src/daemon.c
View File

@ -200,6 +200,18 @@ void guacd_handle_connection(int fd) {
client->info.optimal_width = atoi(size->argv[0]); client->info.optimal_width = atoi(size->argv[0]);
client->info.optimal_height = atoi(size->argv[1]); client->info.optimal_height = atoi(size->argv[1]);
/* Store audio mimetypes */
client->info.audio_mimetypes = malloc(sizeof(char*) * (audio->argc+1));
memcpy(client->info.audio_mimetypes, audio->argv,
sizeof(char*) * audio->argc);
client->info.audio_mimetypes[audio->argc] = NULL;
/* Store video mimetypes */
client->info.video_mimetypes = malloc(sizeof(char*) * (video->argc+1));
memcpy(client->info.video_mimetypes, video->argv,
sizeof(char*) * video->argc);
client->info.video_mimetypes[video->argc] = NULL;
/* 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);
@ -227,6 +239,10 @@ void guacd_handle_connection(int fd) {
else else
guacd_log_info("Client finished normally"); guacd_log_info("Client finished normally");
/* Free mimetype lists */
free(client->info.audio_mimetypes);
free(client->info.video_mimetypes);
/* Clean up */ /* Clean up */
guac_client_free(client); guac_client_free(client);
if (guac_client_plugin_close(plugin)) if (guac_client_plugin_close(plugin))