/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * 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.
*
* ---
*
* reading or writing when appropriate.
*/
+#include <config.h>
+
#include <errno.h>
#include <sys/types.h>
#if !defined(_WIN32)
#include <stdlib.h> /* malloc calloc free */
#if defined(_WIN32)
-#include <winsock.h>
+#define WIN32
+#include <winsock2.h>
+#undef NS_ALL
#endif
#include "misc.h"
#include "queue.h"
#include "ioqueue.h"
-#include "io_mask.h"
#include "empio.h"
#include "gen.h" /* getfdtablesize */
+#include "server.h"
#include "empthread.h"
-extern struct player *player; /* XXX */
-
-static struct io_mask *iom;
-static int fdmax; /* largest file descriptor seen */
-static fd_set newoutput;
-
struct iop {
int fd;
struct ioqueue *input;
int flags;
s_char *assoc;
int bufsize;
- int (*notify) ();
+ int (*notify)(void);
};
void
io_init(void)
{
- iom = iom_create(IO_READ | IO_WRITE);
- fdmax = 0;
- FD_ZERO(&newoutput);
}
struct iop *
-io_open(int fd, int flags, int bufsize, int (*notify) (void),
+io_open(int fd, int flags, int bufsize, int (*notify)(void),
s_char *assoc)
{
struct iop *iop;
flags = flags & (IO_READ | IO_WRITE | IO_NBLOCK | IO_NEWSOCK);
if ((flags & (IO_READ | IO_WRITE)) == 0)
return NULL;
- iop = (struct iop *)malloc(sizeof(struct iop));
+ iop = malloc(sizeof(struct iop));
if (!iop)
return NULL;
iop->fd = fd;
if ((flags & IO_WRITE) && (flags & IO_NEWSOCK) == 0)
iop->output = ioq_create(bufsize);
if (flags & IO_NBLOCK)
- io_noblocking(iop, 1);
+ io_noblocking(iop, 1); /* FIXME check success */
iop->flags = flags;
iop->assoc = assoc;
iop->notify = notify;
- iom_set(iom, flags, fd);
- if (fd > fdmax) fdmax = fd;
return iop;
}
ioq_destroy(iop->input);
if (iop->output != 0)
ioq_destroy(iop->output);
- iom_clear(iom, iop->flags, iop->fd);
- FD_CLR(iop->fd, &newoutput);
#if !defined(_WIN32)
(void)close(iop->fd);
#else
closesocket(iop->fd);
#endif
- free((s_char *)iop);
+ free(iop);
}
int
cc = read(iop->fd, buf, sizeof(buf));
if (cc < 0) {
/* would block, so nothing to read. */
- if (errno == EWOULDBLOCK)
+ if (errno == EAGAIN || errno == EWOULDBLOCK)
return 0;
/* Some form of file error occurred... */
iop->flags |= IO_ERROR;
- iom_clear(iom, IO_READ, iop->fd);
return -1;
}
#else
/* Some form of file error occurred... */
iop->flags |= IO_ERROR;
- iom_clear(iom, IO_READ, iop->fd);
return -1;
}
#endif
if (!io_outputwaiting(iop))
return 0;
- /* bit clear */
- FD_CLR(iop->fd, &newoutput);
-
/* If the iop is not write enabled. */
if ((iop->flags & IO_WRITE) == 0)
return -1;
if (iop->flags & IO_ERROR)
return -1;
- /* This is the same test as io_outputwaiting.... */
- if (ioq_qsize(iop->output) == 0)
- return 0;
-
#if !defined(_WIN32)
/* make the iov point to the data in the queue. */
/* I.E., each of the elements in the queue. */
#endif
if (n <= 0) {
- /* If we got no elements, we have no output.... */
- iom_clear(iom, IO_WRITE, iop->fd);
return 0;
}
/* if it failed.... */
if (cc < 0) {
/* Hmm, it would block. file is opened noblock, soooooo.. */
- if (errno == EWOULDBLOCK) {
+ if (errno == EAGAIN || errno == EWOULDBLOCK) {
/* If there are remaining bytes, set the IO as remaining.. */
remain = ioq_qsize(iop->output);
- if (remain > 0)
- iom_set(iom, IO_WRITE, iop->fd);
return remain;
}
iop->flags |= IO_ERROR;
- iom_clear(iom, IO_WRITE, iop->fd);
return -1;
}
#else
if (err == WSAEWOULDBLOCK) {
/* If there are remaining bytes, set the IO as remaining.. */
remain = ioq_qsize(iop->output);
- if (remain > 0)
- iom_set(iom, IO_WRITE, iop->fd);
return remain;
}
iop->flags |= IO_ERROR;
- iom_clear(iom, IO_WRITE, iop->fd);
return -1;
}
#endif
-
/* If no bytes were written, something happened.. Like an EOF. */
-#ifndef hpux
if (cc == 0) {
iop->flags |= IO_EOF;
return 0;
}
-#else
- if (cc == 0) {
- remain = ioq_qsize(iop->output);
- if (remain > 0)
- iom_set(iom, IO_WRITE, iop->fd);
- return remain;
- }
-#endif /* hpux */
/* Remove the number of written bytes from the queue. */
ioq_dequeue(iop->output, cc);
- /* If the queue has stuff remaining, set it still needing output. */
- remain = ioq_qsize(iop->output);
- if (remain == 0) {
- iom_clear(iom, IO_WRITE, iop->fd);
- } else {
- iom_set(iom, IO_WRITE, iop->fd);
- }
return cc;
}
if ((iop->flags & IO_WRITE) == 0)
return -1;
ioq_append(iop->output, buf, nbytes);
- FD_SET(iop->fd, &newoutput);
len = ioq_qsize(iop->output);
if (len > iop->bufsize) {
if (doWait) {
} else {
/* only try a write every BUFSIZE characters */
if (((len - nbytes) % iop->bufsize) < (len % iop->bufsize))
- io_output(iop, 0);
+ io_output(iop, IO_NOWAIT);
}
}
return nbytes;
{
int n;
- while ((n = io_output(iop, IO_NOWAIT)) > 0) {
+ /*
+ * Mustn't block a player thread while update is pending, or else
+ * a malicous player could delay the update indefinitely
+ */
+ while (((n = io_output(iop, IO_NOWAIT)) > 0) && !update_pending) {
empth_select(iop->fd, EMPTH_FD_WRITE);
}
return n;
{
if ((iop->flags & IO_WRITE) == 0)
return -1;
- FD_SET(iop->fd, &newoutput);
return ioq_puts(iop->output, buf);
}
if (flags < 0)
return -1;
if (value == 0)
- flags &= ~FNDELAY;
+ flags &= ~O_NONBLOCK;
else
- flags |= FNDELAY;
+ flags |= O_NONBLOCK;
if (fcntl(iop->fd, F_SETFL, flags) < 0)
return -1;
#else
return 0;
}
-int
-io_conn(struct iop *iop)
-{
- return (iop->flags & IO_CONN);
-}
-
int
io_error(struct iop *iop)
{
- return (iop->flags & IO_ERROR);
+ return iop->flags & IO_ERROR;
}
int
io_eof(struct iop *iop)
{
- return (iop->flags & IO_EOF);
+ return iop->flags & IO_EOF;
}
int
projects / empserver / blobdiff