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

Merge pull request #84 from glyptodon/image-handshake

Browse Source 
GUAC-1305: Add image mimetypes to Guacamole protocol handshake.
This commit is contained in:
James Muehlner 2015-09-20 17:37:30 -07:00
commit fdc40a9315
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/guacd/daemon.c
View File

@ -91,6 +91,7 @@ static void guacd_handle_connection(guacd_client_map* map, guac_socket* socket)
guac_instruction* size; guac_instruction* size;
guac_instruction* audio; guac_instruction* audio;
guac_instruction* video; guac_instruction* video;
guac_instruction* image;
guac_instruction* connect; guac_instruction* connect;
int init_result; int init_result;
@ -205,6 +206,20 @@ static void guacd_handle_connection(guacd_client_map* map, guac_socket* socket)
return; return;
} }
/* Get supported image formats */
image = guac_instruction_expect(
socket, GUACD_USEC_TIMEOUT, "image");
if (image == NULL) {
/* Log error */
guacd_log_handshake_failure();
guacd_log_guac_error(GUAC_LOG_DEBUG, "Error reading \"image\"");
/* Free resources */
guac_socket_free(socket);
return;
}
/* Get args from connect instruction */ /* Get args from connect instruction */
connect = guac_instruction_expect( connect = guac_instruction_expect(
socket, GUACD_USEC_TIMEOUT, "connect"); socket, GUACD_USEC_TIMEOUT, "connect");
@ -257,6 +272,12 @@ static void guacd_handle_connection(guacd_client_map* map, 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;
/* Store image mimetypes */
client->info.image_mimetypes = malloc(sizeof(char*) * (image->argc+1));
memcpy(client->info.image_mimetypes, image->argv,
sizeof(char*) * image->argc);
client->info.image_mimetypes[image->argc] = NULL;
/* Store client */ /* Store client */
if (guacd_client_map_add(map, client)) if (guacd_client_map_add(map, client))
guacd_log(GUAC_LOG_ERROR, "Unable to add client. Internal client storage has failed"); guacd_log(GUAC_LOG_ERROR, "Unable to add client. Internal client storage has failed");
@ -300,10 +321,12 @@ static void guacd_handle_connection(guacd_client_map* map, guac_socket* socket)
/* Free mimetype lists */ /* Free mimetype lists */
free(client->info.audio_mimetypes); free(client->info.audio_mimetypes);
free(client->info.video_mimetypes); free(client->info.video_mimetypes);
free(client->info.image_mimetypes);
/* Free remaining instructions */ /* Free remaining instructions */
guac_instruction_free(audio); guac_instruction_free(audio);
guac_instruction_free(video); guac_instruction_free(video);
guac_instruction_free(image);
guac_instruction_free(size); guac_instruction_free(size);
/* Clean up */ /* Clean up */

7
src/libguac/guacamole/client.h
View File

@ -73,6 +73,13 @@ struct guac_client_info {
*/ */
const char** video_mimetypes; const char** video_mimetypes;
/**
* NULL-terminated array of client-supported image mimetypes. Though all
* supported image mimetypes will be listed here, it can be safely assumed
* that all clients will support at least "image/png" and "image/jpeg".
*/
const char** image_mimetypes;
/** /**
* The DPI of the physical remote display if configured for the optimal * The DPI of the physical remote display if configured for the optimal
* width/height combination described here. This need not be honored by * width/height combination described here. This need not be honored by