safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Detect closed connections.

Browse Source
This commit is contained in:
Michael Jumper
2010-09-07 23:32:38 -07:00
parent 8f4d722a9c
commit 5bcea85d81
5 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
guacamole/proxy/protocol.c
View File

@@ -289,6 +289,7 @@ int __guac_fill_instructionbuf(GUACIO* io) {
}
/* Returns new instruction if one exists, or NULL if no more instructions. */
guac_instruction* guac_read_instruction(GUACIO* io) {
guac_instruction* parsed_instruction;
@@ -355,18 +356,13 @@ guac_instruction* guac_read_instruction(GUACIO* io) {
}
/* No instruction yet? Get more data ... */
retval = guac_select(io, 1000);
while ((retval = guac_select(io, 2500000)) == 0);
if (retval < 0)
return NULL;
/* Break if descriptor doesn't have enough data */
if (retval == 0)
return NULL; /* SOFT FAIL: No instruction ... yet, but is still in buffer */
return NULL; /* If error, no more instructions */
retval = __guac_fill_instructionbuf(io);
if (retval < 0 && errno != EAGAIN && errno != EWOULDBLOCK)
return NULL;
if (retval <= 0)
return NULL; /* If error, or no more data, no instructions remain */
}
}