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

Add macros for constants, clean up validation.

Browse Source
This commit is contained in:
Michael Jumper 2012-10-02 14:09:57 -07:00
parent 99ec71dcde
commit 3fd9323a94
2 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
protocols/rdp/include/client.h
View File

@ -50,6 +50,21 @@
*/ */
#define RDP_DEFAULT_PORT 3389 #define RDP_DEFAULT_PORT 3389
/**
* Default screen width, in pixels.
*/
#define RDP_DEFAULT_WIDTH 1024
/**
* Default screen height, in pixels.
*/
#define RDP_DEFAULT_HEIGHT 768
/**
* Default color depth, in bits.
*/
#define RDP_DEFAULT_DEPTH 16
/** /**
* Client data that will remain accessible through the guac_client. * Client data that will remain accessible through the guac_client.
* This should generally include data commonly used by Guacamole handlers. * This should generally include data commonly used by Guacamole handlers.

36
protocols/rdp/src/client.c
View File

@ -322,18 +322,30 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE; settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
/* Session width */ /* Session width */
settings->width = 1024; settings->width = RDP_DEFAULT_WIDTH;
if (argv[IDX_WIDTH][0] != '\0') if (argv[IDX_WIDTH][0] != '\0')
settings->width = atoi(argv[IDX_WIDTH]); settings->width = atoi(argv[IDX_WIDTH]);
if (settings->width == 0)
settings->width = 1024; /* Use default width if given width is invalid. */
if (settings->width == 0) {
settings->width = RDP_DEFAULT_WIDTH;
guac_client_log_error(client,
"Invalid width: \"%s\". Using default of %i.",
argv[IDX_WIDTH], settings->width);
}
/* Session height */ /* Session height */
settings->height = 768; settings->height = RDP_DEFAULT_HEIGHT;
if (argv[IDX_HEIGHT][0] != '\0') if (argv[IDX_HEIGHT][0] != '\0')
settings->height = atoi(argv[IDX_HEIGHT]); settings->height = atoi(argv[IDX_HEIGHT]);
if (settings->height == 0)
settings->height = 768; /* Use default height if given height is invalid. */
if (settings->height == 0) {
settings->height = RDP_DEFAULT_HEIGHT;
guac_client_log_error(client,
"Invalid height: \"%s\". Using default of %i.",
argv[IDX_WIDTH], settings->height);
}
/* Set hostname */ /* Set hostname */
settings->hostname = strdup(hostname); settings->hostname = strdup(hostname);
@ -359,11 +371,17 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
settings->shell = strdup(argv[IDX_INITIAL_PROGRAM]); settings->shell = strdup(argv[IDX_INITIAL_PROGRAM]);
/* Session color depth */ /* Session color depth */
settings->color_depth = 16; settings->color_depth = RDP_DEFAULT_DEPTH;
if (argv[IDX_COLOR_DEPTH][0] != '\0') if (argv[IDX_COLOR_DEPTH][0] != '\0')
settings->color_depth = atoi(argv[IDX_COLOR_DEPTH]); settings->color_depth = atoi(argv[IDX_COLOR_DEPTH]);
if (settings->color_depth == 0)
settings->color_depth = 16; /* Use default depth if given depth is invalid. */
if (settings->color_depth == 0) {
settings->color_depth = RDP_DEFAULT_DEPTH;
guac_client_log_error(client,
"Invalid color-depth: \"%s\". Using default of %i.",
argv[IDX_WIDTH], settings->color_depth);
}
/* Order support */ /* Order support */
bitmap_cache = settings->bitmap_cache; bitmap_cache = settings->bitmap_cache;