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

More error handling, style fix.

Browse Source
This commit is contained in:
Michael Jumper 2011-03-19 16:39:18 -07:00
parent 6300c7c56a
commit 71d59845e9
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libguac/src/client.c
View File

@ -190,9 +190,14 @@ guac_client* guac_get_client(int client_fd) {
return NULL; return NULL;
} }
/* Send args */ if ( /* Send args */
guac_send_args(io, client_args); guac_send_args(io, client_args)
guac_flush(io); || guac_flush(io)
) {
guac_close(io);
guac_free_instruction_data(&instruction);
return NULL;
}
guac_free_instruction_data(&instruction); guac_free_instruction_data(&instruction);
break; break;
@ -292,8 +297,13 @@ void* __guac_client_output_thread(void* data) {
long timestamp = guac_current_timestamp(); long timestamp = guac_current_timestamp();
if (timestamp - client->last_sent_timestamp > GUAC_SYNC_FREQUENCY) { if (timestamp - client->last_sent_timestamp > GUAC_SYNC_FREQUENCY) {
client->last_sent_timestamp = timestamp; client->last_sent_timestamp = timestamp;
guac_send_sync(io, timestamp); if (
guac_flush(io); guac_send_sync(io, timestamp)
|| guac_flush(io)
) {
guac_client_stop(client);
return NULL;
}
} }
/* Handle server messages */ /* Handle server messages */
@ -320,11 +330,18 @@ void* __guac_client_output_thread(void* data) {
/* Send sync instruction */ /* Send sync instruction */
client->last_sent_timestamp = guac_current_timestamp(); client->last_sent_timestamp = guac_current_timestamp();
guac_send_sync(io, client->last_sent_timestamp); if (guac_send_sync(io, client->last_sent_timestamp)) {
guac_client_stop(client);
return NULL;
}
} }
guac_flush(io); if (guac_flush(io)) {
guac_client_stop(client);
return NULL;
}
} }
/* If sync threshold exceeded, don't spin waiting for resync */ /* If sync threshold exceeded, don't spin waiting for resync */