Migration to new guac_read_instruction(), remove use of guac_free_instruction_data().
This commit is contained in:
parent
0db81b73ac
commit
66a0ff52ee
@ -74,9 +74,6 @@ void* __guac_client_output_thread(void* data) {
|
|||||||
/* Handle server messages */
|
/* Handle server messages */
|
||||||
if (client->handle_messages) {
|
if (client->handle_messages) {
|
||||||
|
|
||||||
/* Get previous GUACIO state */
|
|
||||||
int last_total_written = io->total_written;
|
|
||||||
|
|
||||||
/* Only handle messages if synced within threshold */
|
/* Only handle messages if synced within threshold */
|
||||||
if (client->last_sent_timestamp - client->last_received_timestamp
|
if (client->last_sent_timestamp - client->last_received_timestamp
|
||||||
< GUAC_SYNC_THRESHOLD) {
|
< GUAC_SYNC_THRESHOLD) {
|
||||||
@ -88,9 +85,6 @@ void* __guac_client_output_thread(void* data) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If data was written during message handling */
|
|
||||||
if (io->total_written != last_total_written) {
|
|
||||||
|
|
||||||
/* Sleep as necessary */
|
/* Sleep as necessary */
|
||||||
guac_sleep(GUAC_SERVER_MESSAGE_HANDLE_FREQUENCY);
|
guac_sleep(GUAC_SERVER_MESSAGE_HANDLE_FREQUENCY);
|
||||||
|
|
||||||
@ -101,8 +95,6 @@ void* __guac_client_output_thread(void* data) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if (guac_flush(io)) {
|
if (guac_flush(io)) {
|
||||||
guac_client_stop(client);
|
guac_client_stop(client);
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -132,24 +124,32 @@ void* __guac_client_input_thread(void* data) {
|
|||||||
guac_client* client = (guac_client*) data;
|
guac_client* client = (guac_client*) data;
|
||||||
GUACIO* io = client->io;
|
GUACIO* io = client->io;
|
||||||
|
|
||||||
guac_instruction instruction;
|
|
||||||
|
|
||||||
/* Guacamole client input loop */
|
/* Guacamole client input loop */
|
||||||
while (client->state == RUNNING && guac_read_instruction(io, GUAC_USEC_TIMEOUT, &instruction) > 0) {
|
while (client->state == RUNNING) {
|
||||||
|
|
||||||
|
/* Read instruction */
|
||||||
|
guac_instruction* instruction =
|
||||||
|
guac_read_instruction(io, GUAC_USEC_TIMEOUT);
|
||||||
|
|
||||||
|
/* Stop on error */
|
||||||
|
if (instruction == NULL) {
|
||||||
|
guac_client_stop(client);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
/* Call handler, stop on error */
|
/* Call handler, stop on error */
|
||||||
if (guac_client_handle_instruction(client, &instruction) < 0) {
|
if (guac_client_handle_instruction(client, instruction) < 0) {
|
||||||
guac_free_instruction_data(&instruction);
|
guac_free_instruction(instruction);
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Free allocate instruction data */
|
|
||||||
guac_free_instruction_data(&instruction);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
guac_client_stop(client);
|
guac_client_stop(client);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Free allocated instruction */
|
||||||
|
guac_free_instruction(instruction);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user