08b9455682
Remove the KillIdle thread. Add timeout to struct iop, initialized in io_open(). Obey it in io_input() by passing it to empth_select(). If empth_select() times out, report that back through io_input() to recvclient() and player_login(). If player_login() receives a timeout indication, print a message and terminate the session. If recvclient() receives a timeout indication, flash a message to the player and initiate a shut down the player's session. Create WIN32 sys/time.h to define struct timeval. This creates some conflicts with WIN32 windows.h definitions. Including windows.h in show.c and info.c creates conflicts, so remove that. Modify service.c to include sys/socket.h instead of windows.h to remove the conflict with sys/time.h.
69 lines
2.2 KiB
C
69 lines
2.2 KiB
C
/*
|
|
* Empire - A multi-player, client/server Internet based war game.
|
|
* Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
|
|
* Ken Stevens, Steve McClure
|
|
*
|
|
* This program 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 2 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, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
* ---
|
|
*
|
|
* 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:
|
|
*
|
|
*/
|
|
|
|
#ifndef EMPIO_H
|
|
#define EMPIO_H
|
|
#include <sys/time.h>
|
|
|
|
#define IO_READ 0x1
|
|
#define IO_WRITE 0x2
|
|
#define IO_NEWSOCK 0x4
|
|
#define IO_NBLOCK 0x8
|
|
#define IO_EOF 0x10
|
|
#define IO_ERROR 0x40
|
|
|
|
#define IO_BUFSIZE 4096
|
|
|
|
#define IO_NOWAIT 0
|
|
#define IO_WAIT 1
|
|
|
|
extern struct iop *io_open(int, int, int, struct timeval);
|
|
extern void io_init(void);
|
|
extern int io_noblocking(struct iop *, int);
|
|
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_peek(struct iop *, char *, int);
|
|
extern int io_read(struct iop *, char *, int);
|
|
extern int io_write(struct iop *, char *, int, int);
|
|
extern int io_output_all(struct iop *);
|
|
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 int io_fileno(struct iop *);
|
|
|
|
#endif
|