empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't log out player when update aborts a command

Browse source 
recvclient() confused command abortion with an idle timeout.  Broken
in commit 08b94556, v4.3.20.
This commit is contained in:
Markus Armbruster 2009-02-25 22:52:39 +01:00
parent 12b432163c
commit 3e4894c7f5
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/lib/player/recvclient.c
View file

@ -29,7 +29,7 @@
* *
* Known contributors to this file: * Known contributors to this file:
* Dave Pare, 1986 * Dave Pare, 1986
* Markus Armbruster, 2006-2008 * Markus Armbruster, 2006-2009
* Ron Koenderink, 2009 * Ron Koenderink, 2009
*/ */
@ -59,7 +59,7 @@
int int
recvclient(char *cmd, int size) recvclient(char *cmd, int size)
{ {
int count; int count, res;
count = -1; count = -1;
while (!player->aborted) { while (!player->aborted) {
@ -85,11 +85,15 @@ recvclient(char *cmd, int size)
if (player->aborted) if (player->aborted)
break; break;
if (io_input(player->iop, IO_WAIT) <= 0) { res = io_input(player->iop, IO_WAIT);
if (!io_error(player->iop) && !io_eof(player->iop)) { if (res > 0)
;
else if (res < 0)
player->aborted = player->eof = 1;
else if (io_eof(player->iop))
player->aborted = player->eof = 1;
else if (!player->aborted) {
pr_flash(player, "idle connection terminated\n"); pr_flash(player, "idle connection terminated\n");
player->state = PS_SHUTDOWN;
}
player->aborted = player->eof = 1; player->aborted = player->eof = 1;
} }
} }