Markus Armbruster
ca7578f1b8
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.
63 lines
2.1 KiB
C
63 lines
2.1 KiB
C
/*
|
|
* Empire - A multi-player, client/server Internet based war game.
|
|
* Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
|
|
* Ken Stevens, Steve McClure, Markus Armbruster
|
|
*
|
|
* Empire is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* ---
|
|
*
|
|
* See files README, COPYING and CREDITS in the root of the source
|
|
* tree for related information and legal notices. It is expected
|
|
* that future projects/authors will amend these files as needed.
|
|
*
|
|
* ---
|
|
*
|
|
* empio.h: Describes io pointers used in Empire
|
|
*
|
|
* Known contributors to this file:
|
|
* Markus Armbruster, 2004-2010
|
|
*/
|
|
|
|
#ifndef EMPIO_H
|
|
#define EMPIO_H
|
|
#include <sys/time.h>
|
|
|
|
#define IO_READ 0x1
|
|
#define IO_WRITE 0x2
|
|
#define IO_EOF 0x10
|
|
#define IO_ERROR 0x40
|
|
|
|
#define IO_BUFSIZE 4096
|
|
|
|
extern struct iop *io_open(int, int, int, struct timeval);
|
|
extern void io_init(void);
|
|
extern void io_close(struct iop *);
|
|
extern int io_input(struct iop *, int);
|
|
extern int io_inputwaiting(struct iop *);
|
|
extern int io_outputwaiting(struct iop *);
|
|
extern int io_output(struct iop *, int);
|
|
extern int io_output_if_queue_long(struct iop *, int);
|
|
extern int io_peek(struct iop *, char *, int);
|
|
extern int io_read(struct iop *, char *, int);
|
|
extern int io_write(struct iop *, char *, int);
|
|
extern int io_gets(struct iop *, char *, int);
|
|
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
|