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

GUAC-1452: Parse and handle typescript parameters within SSH and telnet.

Browse Source
This commit is contained in:
Michael Jumper 2016-01-27 12:40:35 -08:00
parent d9dacedbe0
commit 4661f432f0
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/protocols/ssh/client.c
View File

@ -224,6 +224,25 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
return -1; return -1;
} }
/* Set up typescript, if requested */
const char* typescript_path = argv[IDX_TYPESCRIPT_PATH];
if (typescript_path[0] != 0) {
/* Default to "typescript" if no name provided */
const char* typescript_name = argv[IDX_TYPESCRIPT_NAME];
if (typescript_name[0] == 0)
typescript_name = "typescript";
/* Parse path creation flag */
int create_path =
strcmp(argv[IDX_CREATE_TYPESCRIPT_PATH], "true") == 0;
/* Create typescript */
guac_terminal_create_typescript(client_data->term, typescript_path,
typescript_name, create_path);
}
/* Ensure main socket is threadsafe */ /* Ensure main socket is threadsafe */
guac_socket_require_threadsafe(socket); guac_socket_require_threadsafe(socket);

19
src/protocols/telnet/client.c
View File

@ -240,6 +240,25 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
return -1; return -1;
} }
/* Set up typescript, if requested */
const char* typescript_path = argv[IDX_TYPESCRIPT_PATH];
if (typescript_path[0] != 0) {
/* Default to "typescript" if no name provided */
const char* typescript_name = argv[IDX_TYPESCRIPT_NAME];
if (typescript_name[0] == 0)
typescript_name = "typescript";
/* Parse path creation flag */
int create_path =
strcmp(argv[IDX_CREATE_TYPESCRIPT_PATH], "true") == 0;
/* Create typescript */
guac_terminal_create_typescript(client_data->term, typescript_path,
typescript_name, create_path);
}
/* Send initial name */ /* Send initial name */
guac_protocol_send_name(socket, client_data->hostname); guac_protocol_send_name(socket, client_data->hostname);