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

Renamed io to socket (in vars)

Browse Source
This commit is contained in:
Michael Jumper 2011-11-25 16:35:50 -08:00
parent c5ec3a71a3
commit d8697631d0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
guacd/src/client.c
View File

@ -64,7 +64,7 @@ void guac_client_stop(guac_client* client) {
void* __guac_client_output_thread(void* data) { void* __guac_client_output_thread(void* data) {
guac_client* client = (guac_client*) data; guac_client* client = (guac_client*) data;
guac_socket* io = client->io; guac_socket* socket = client->socket;
guac_timestamp last_ping_timestamp = guac_protocol_get_timestamp(); guac_timestamp last_ping_timestamp = guac_protocol_get_timestamp();
@ -79,14 +79,14 @@ void* __guac_client_output_thread(void* data) {
last_ping_timestamp = timestamp; last_ping_timestamp = timestamp;
/* Send sync */ /* Send sync */
if (guac_protocol_send_sync(io, client->last_sent_timestamp)) { if (guac_protocol_send_sync(socket, client->last_sent_timestamp)) {
guac_client_log_error(client, "Error sending \"sync\" instruction: %s", guac_status_string(guac_error)); guac_client_log_error(client, "Error sending \"sync\" instruction: %s", guac_status_string(guac_error));
guac_client_stop(client); guac_client_stop(client);
return NULL; return NULL;
} }
/* Flush */ /* Flush */
if (guac_socket_flush(io)) { if (guac_socket_flush(socket)) {
guac_client_log_error(client, "Error flushing output: %s", guac_status_string(guac_error)); guac_client_log_error(client, "Error flushing output: %s", guac_status_string(guac_error));
guac_client_stop(client); guac_client_stop(client);
return NULL; return NULL;
@ -113,13 +113,13 @@ void* __guac_client_output_thread(void* data) {
/* Send sync instruction */ /* Send sync instruction */
client->last_sent_timestamp = guac_protocol_get_timestamp(); client->last_sent_timestamp = guac_protocol_get_timestamp();
if (guac_protocol_send_sync(io, client->last_sent_timestamp)) { if (guac_protocol_send_sync(socket, client->last_sent_timestamp)) {
guac_client_log_error(client, "Error sending \"sync\" instruction: %s", guac_status_string(guac_error)); guac_client_log_error(client, "Error sending \"sync\" instruction: %s", guac_status_string(guac_error));
guac_client_stop(client); guac_client_stop(client);
return NULL; return NULL;
} }
if (guac_socket_flush(io)) { if (guac_socket_flush(socket)) {
guac_client_log_error(client, "Error flushing output: %s", guac_status_string(guac_error)); guac_client_log_error(client, "Error flushing output: %s", guac_status_string(guac_error));
guac_client_stop(client); guac_client_stop(client);
return NULL; return NULL;
@ -147,14 +147,14 @@ void* __guac_client_output_thread(void* data) {
void* __guac_client_input_thread(void* data) { void* __guac_client_input_thread(void* data) {
guac_client* client = (guac_client*) data; guac_client* client = (guac_client*) data;
guac_socket* io = client->io; guac_socket* socket = client->socket;
/* Guacamole client input loop */ /* Guacamole client input loop */
while (client->state == RUNNING) { while (client->state == RUNNING) {
/* Read instruction */ /* Read instruction */
guac_instruction* instruction = guac_instruction* instruction =
guac_protocol_read_instruction(io, GUAC_USEC_TIMEOUT); guac_protocol_read_instruction(socket, GUAC_USEC_TIMEOUT);
/* Stop on error */ /* Stop on error */
if (instruction == NULL) { if (instruction == NULL) {