Fix idle timeout during execute
Timeout during execute gets handled just like an EOF cookie: end the
batch file, resume reading normal commands. That's wrong, we need to
close the connection.
A real EOF is recorded in the player's connection's EOF indicator.
Let's use that for all "connection needs to be closed" conditions, so
they all work the same. Create io_set_eof() to provide access.
Make recvclient() set the player connection's EOF indicator on
timeout. This makes the timeout "stick". Record receipt of an EOF
cookie in new struct player member got_ctld. Also abort the command,
as before. This leaves further interpretation of the EOF cookie to
the command loops.
Make player_main() set the player connection's EOF indicator on
got_ctld. Player connection gets closed on on EOF cookie, as before.
Change execute() to break the batch command loop when got_ctld is set,
then reset it. Ends the batch file on EOF cookie, as before.
Change status() back to checking EOF and error indicators (partial
revert of commit 9c5854c8
, v4.3.16), and drop struct player member
eof.
This commit is contained in:
parent
d78d9cac1d
commit
ca7578f1b8
5 changed files with 38 additions and 20 deletions
|
@ -57,6 +57,7 @@ extern int io_puts(struct iop *, char *);
|
|||
extern int io_shutdown(struct iop *, int);
|
||||
extern int io_error(struct iop *);
|
||||
extern int io_eof(struct iop *);
|
||||
extern void io_set_eof(struct iop *);
|
||||
extern int io_fileno(struct iop *);
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue