Markus Armbruster
ed1cbc97e6
Idle timeout used to expire max_idle minutes after the last
player->curup update. When we got rid of the idle thread in commit
08b94556 (v4.3.20), this got changed to "wait no more than max_idle
minutes for input". Time spent computing and time spent blocked on
output no longer counts. In particular, a connection can block
indefinitely on output since then. Let's fix that.
Start with basing the input timeout on player->curup again. The
missing output timeout will be added shortly.
Aside: since status() updates player->curup, the idle timer gets reset
when the update aborts a command. Left for another day.
64 lines
2.2 KiB
C
64 lines
2.2 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-2012
|
|
*/
|
|
|
|
#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);
|
|
extern void io_init(void);
|
|
extern void io_close(struct iop *, struct timeval *);
|
|
extern void io_timeout(struct timeval *, time_t);
|
|
extern int io_input(struct iop *, struct timeval *);
|
|
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
|