GUACAMOLE-269: Name functions per Guacamole standards.
This commit is contained in:
parent
9bd28321e5
commit
c286668b79
@ -193,7 +193,7 @@ void* ssh_client_thread(void* data) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize a ttymode array */
|
/* Initialize a ttymode array */
|
||||||
guac_ssh_ttymodes ssh_ttymodes = init_ttymodes();
|
guac_ssh_ttymodes ssh_ttymodes = guac_ssh_ttymodes_init();
|
||||||
|
|
||||||
/* Set up screen recording, if requested */
|
/* Set up screen recording, if requested */
|
||||||
if (settings->recording_path != NULL) {
|
if (settings->recording_path != NULL) {
|
||||||
@ -213,7 +213,7 @@ void* ssh_client_thread(void* data) {
|
|||||||
settings->color_scheme, settings->backspace);
|
settings->color_scheme, settings->backspace);
|
||||||
|
|
||||||
/* Add the backspace key to the ttymode array */
|
/* Add the backspace key to the ttymode array */
|
||||||
add_ttymode(&ssh_ttymodes, GUAC_SSH_TTY_OP_VERASE, settings->backspace);
|
guac_ssh_ttymodes_add(&ssh_ttymodes, GUAC_SSH_TTY_OP_VERASE, settings->backspace);
|
||||||
|
|
||||||
/* Fail if terminal init failed */
|
/* Fail if terminal init failed */
|
||||||
if (ssh_client->term == NULL) {
|
if (ssh_client->term == NULL) {
|
||||||
@ -304,8 +304,9 @@ void* ssh_client_thread(void* data) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Request PTY */
|
/* Request PTY */
|
||||||
if (libssh2_channel_request_pty_ex(ssh_client->term_channel, "linux", sizeof("linux")-1, ttymodes_to_array(&ssh_ttymodes),
|
if (libssh2_channel_request_pty_ex(ssh_client->term_channel, "linux", sizeof("linux")-1,
|
||||||
sizeof_ttymodes(&ssh_ttymodes), ssh_client->term->term_width, ssh_client->term->term_height, 0, 0)) {
|
guac_ssh_ttymodes_to_array(&ssh_ttymodes), guac_ssh_ttymodes_size(&ssh_ttymodes),
|
||||||
|
ssh_client->term->term_width, ssh_client->term->term_height, 0, 0)) {
|
||||||
guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR, "Unable to allocate PTY.");
|
guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR, "Unable to allocate PTY.");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
guac_ssh_ttymodes init_ttymodes() {
|
guac_ssh_ttymodes guac_ssh_ttymodes_init() {
|
||||||
/* Simple allocation for a placeholder */
|
/* Simple allocation for a placeholder */
|
||||||
guac_ssh_ttymode* ttymode_array = malloc(1);
|
guac_ssh_ttymode* ttymode_array = malloc(1);
|
||||||
|
|
||||||
@ -36,7 +36,7 @@ guac_ssh_ttymodes init_ttymodes() {
|
|||||||
return empty_modes;
|
return empty_modes;
|
||||||
}
|
}
|
||||||
|
|
||||||
void add_ttymode(guac_ssh_ttymodes *tty_modes, char opcode, uint32_t value) {
|
void guac_ssh_ttymodes_add(guac_ssh_ttymodes *tty_modes, char opcode, uint32_t value) {
|
||||||
tty_modes->num_opcodes++;
|
tty_modes->num_opcodes++;
|
||||||
tty_modes->ttymode_array = realloc(tty_modes->ttymode_array, sizeof(guac_ssh_ttymode) * tty_modes->num_opcodes);
|
tty_modes->ttymode_array = realloc(tty_modes->ttymode_array, sizeof(guac_ssh_ttymode) * tty_modes->num_opcodes);
|
||||||
tty_modes->ttymode_array[tty_modes->num_opcodes - 1].opcode = opcode;
|
tty_modes->ttymode_array[tty_modes->num_opcodes - 1].opcode = opcode;
|
||||||
@ -44,14 +44,14 @@ void add_ttymode(guac_ssh_ttymodes *tty_modes, char opcode, uint32_t value) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int sizeof_ttymodes(guac_ssh_ttymodes *tty_modes) {
|
int guac_ssh_ttymodes_size(guac_ssh_ttymodes *tty_modes) {
|
||||||
/* Each opcode pair is 5 bytes (1 opcode, 4 value)
|
/* Each opcode pair is 5 bytes (1 opcode, 4 value)
|
||||||
Add one for the ending opcode */
|
Add one for the ending opcode */
|
||||||
|
|
||||||
return (tty_modes->num_opcodes * 5) + 1;
|
return (tty_modes->num_opcodes * 5) + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
char* ttymodes_to_array(guac_ssh_ttymodes *tty_modes) {
|
char* guac_ssh_ttymodes_to_array(guac_ssh_ttymodes *tty_modes) {
|
||||||
/* Total data size should be number of tracked opcodes
|
/* Total data size should be number of tracked opcodes
|
||||||
plus one final byte for the TTY_OP_END code. */
|
plus one final byte for the TTY_OP_END code. */
|
||||||
int data_size = (tty_modes->num_opcodes * 5) + 1;
|
int data_size = (tty_modes->num_opcodes * 5) + 1;
|
||||||
|
@ -62,7 +62,7 @@ typedef struct guac_ssh_ttymodes {
|
|||||||
* with a null array of guac_ssh_ttymode and opcodes
|
* with a null array of guac_ssh_ttymode and opcodes
|
||||||
* set to zero.
|
* set to zero.
|
||||||
*/
|
*/
|
||||||
guac_ssh_ttymodes init_ttymodes();
|
guac_ssh_ttymodes guac_ssh_ttymodes_init();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add an item to the opcode array. This resizes the
|
* Add an item to the opcode array. This resizes the
|
||||||
@ -70,19 +70,19 @@ guac_ssh_ttymodes init_ttymodes();
|
|||||||
* the specified opcode and value pair to the data
|
* the specified opcode and value pair to the data
|
||||||
* structure.
|
* structure.
|
||||||
*/
|
*/
|
||||||
void add_ttymode(guac_ssh_ttymodes *tty_modes, char opcode, uint32_t value);
|
void guac_ssh_ttymodes_add(guac_ssh_ttymodes *tty_modes, char opcode, uint32_t value);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieve the size, in bytes, of the ttymode_array
|
* Retrieve the size, in bytes, of the ttymode_array
|
||||||
* in the given guac_ssh_ttymodes data structure.
|
* in the given guac_ssh_ttymodes data structure.
|
||||||
*/
|
*/
|
||||||
int sizeof_ttymodes(guac_ssh_ttymodes *tty_modes);
|
int guac_ssh_ttymodes_size(guac_ssh_ttymodes *tty_modes);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert the ttymodes data structure into a char
|
* Convert the ttymodes data structure into a char
|
||||||
* pointer array suitable for passing into the
|
* pointer array suitable for passing into the
|
||||||
* libssh2_channel_request_pty_ex() function.
|
* libssh2_channel_request_pty_ex() function.
|
||||||
*/
|
*/
|
||||||
char* ttymodes_to_array(guac_ssh_ttymodes *tty_modes);
|
char* guac_ssh_ttymodes_to_array(guac_ssh_ttymodes *tty_modes);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user