/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back! *
+* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-98 Artsoft Entertainment *
-* Holger Schemel *
-* Oststrasse 11a *
-* 33604 Bielefeld *
-* phone: ++49 +521 290471 *
-* email: aeglos@valinor.owl.de *
+* (c) 1995-2006 Artsoft Entertainment *
+* Holger Schemel *
+* Detmolder Strasse 189 *
+* 33604 Bielefeld *
+* Germany *
+* e-mail: info@artsoft.org *
*----------------------------------------------------------*
-* network.c *
+* netserv.c *
***********************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include "libgame/platform.h"
+
+#if defined(NETWORK_AVALIABLE)
+
#include <fcntl.h>
-#include <sys/types.h>
#include <sys/time.h>
#include <signal.h>
-#include <sys/socket.h>
#include <errno.h>
-#include <string.h>
+
+#if defined(TARGET_SDL)
+#include "main.h"
+#else
+#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
#include <netdb.h>
+#include <sys/select.h> /* apparently needed for OS/2 port */
+#endif
+
+#include "libgame/libgame.h"
#include "netserv.h"
-#include "misc.h"
static int clients = 0;
static int onceonly = 0;
-static int is_daemon = 0;
-struct user
+struct NetworkServerPlayerInfo
{
+#if defined(TARGET_SDL)
+ TCPsocket fd;
+#else
int fd;
- unsigned char nick[16];
+#endif
+
+ char player_name[16];
unsigned char number;
- struct user *next, *nextvictim;
+ struct NetworkServerPlayerInfo *next;
char active;
char introduced;
- unsigned char readbuf[MAX_BUFFER_SIZE];
- int nread;
- unsigned char writbuf[MAX_BUFFER_SIZE];
- int nwrite;
- char playing;
- int lines;
- unsigned int games;
- unsigned char action;
- int action_received;
+ unsigned char readbuffer[MAX_BUFFER_SIZE];
+ unsigned char writbuffer[MAX_BUFFER_SIZE];
+ int nread, nwrite;
+ byte action;
+ boolean action_received;
};
-static struct user *user0 = NULL;
+static struct NetworkServerPlayerInfo *first_player = NULL;
-#define NEXT(u) ((u)->next ? (u)->next : user0)
+#define NEXT(player) ((player)->next ? (player)->next : first_player)
+#if defined(TARGET_SDL)
+/* TODO: peer address */
+static TCPsocket lfd; /* listening socket */
+static SDLNet_SocketSet fds; /* socket set */
+#else
static struct sockaddr_in saddr;
-static int lfd;
-static unsigned char realbuf[512], *buf = realbuf + 4;
-
-static int interrupt;
+static int lfd; /* listening socket */
+static fd_set fds; /* socket set */
static int tcp = -1;
+#endif
-static unsigned long frame_counter = 0;
+static unsigned char realbuffer[512], *buffer = realbuffer + 4;
-static fd_set fds;
+static int interrupt;
-static void syserr(char *s)
-{
- if (!is_daemon)
- fprintf(stderr, "fatal: %s failed.\n", s);
- exit(1);
-}
+static unsigned int ServerFrameCounter = 0;
-static void addtobuffer(struct user *u, unsigned char *b, int len)
+static void addtobuffer(struct NetworkServerPlayerInfo *player,
+ unsigned char *b, int len)
{
- if (u->nwrite + len >= MAX_BUFFER_SIZE)
- Error(ERR_EXIT, "internal error: network send buffer overflow");
+ if (player->nwrite + len >= MAX_BUFFER_SIZE)
+ Error(ERR_EXIT_NETWORK_SERVER,
+ "internal error: network send buffer overflow");
- memcpy(u->writbuf + u->nwrite, b, len);
- u->nwrite += len;
+ memcpy(player->writbuffer + player->nwrite, b, len);
+ player->nwrite += len;
}
-static void flushuser(struct user *u)
+static void flushuser(struct NetworkServerPlayerInfo *player)
{
- if (u->nwrite)
+ if (player->nwrite)
{
- write(u->fd, u->writbuf, u->nwrite);
- u->nwrite = 0;
+#if defined(TARGET_SDL)
+ SDLNet_TCP_Send(player->fd, player->writbuffer, player->nwrite);
+#else
+ if (write(player->fd, player->writbuffer, player->nwrite) == -1)
+ Error(ERR_WARN, "write() failed; %s", strerror(errno));
+#endif
+ player->nwrite = 0;
}
}
-static void broadcast(struct user *except, int len, int activeonly)
+static void broadcast(struct NetworkServerPlayerInfo *except,
+ int len, int activeonly)
{
- struct user *u;
-
- realbuf[0] = realbuf[1] = realbuf[2] = 0;
- realbuf[3] = (unsigned char)len;
- for (u=user0; u; u=u->next)
- if (u != except && (u->active || !activeonly) && u->introduced)
- addtobuffer(u, realbuf, 4 + len);
+ struct NetworkServerPlayerInfo *player;
+
+ realbuffer[0] = realbuffer[1] = realbuffer[2] = 0;
+ realbuffer[3] = (unsigned char)len;
+ for (player = first_player; player; player = player->next)
+ if (player != except && player->introduced &&
+ (player->active || !activeonly))
+ addtobuffer(player, realbuffer, 4 + len);
}
-static void sendtoone(struct user *to, int len)
+static void sendtoone(struct NetworkServerPlayerInfo *to, int len)
{
- realbuf[0] = realbuf[1] = realbuf[2] = 0;
- realbuf[3] = (unsigned char)len;
- addtobuffer(to, realbuf, 4 + len);
+ realbuffer[0] = realbuffer[1] = realbuffer[2] = 0;
+ realbuffer[3] = (unsigned char)len;
+ addtobuffer(to, realbuffer, 4 + len);
}
-static void dropuser(struct user *u)
+static void RemovePlayer(struct NetworkServerPlayerInfo *player)
{
- struct user *v, *w;
+ struct NetworkServerPlayerInfo *v;
if (options.verbose)
- printf("RND_SERVER: dropping client %d (%s)\n", u->number, u->nick);
+ Error(ERR_NETWORK_SERVER, "dropping client %d (%s)",
+ player->number, player->player_name);
- if (u == user0)
- user0 = u->next;
+ if (player == first_player)
+ first_player = player->next;
else
{
- for (v=user0; v; v=v->next)
+ for (v = first_player; v; v = v->next)
{
- if (v->next && v->next == u)
+ if (v->next && v->next == player)
{
- v->next = u->next;
+ v->next = player->next;
break;
}
}
}
- close(u->fd);
- if (u->introduced)
- {
- buf[0] = u->number;
- buf[1] = OP_PLAYER_DISCONNECTED;
- broadcast(u, 2, 0);
- }
+#if defined(TARGET_SDL)
+ SDLNet_TCP_DelSocket(fds, player->fd);
+ SDLNet_TCP_Close(player->fd);
+#else
+ close(player->fd);
+#endif
- for (v=user0; v; v=v->next)
+ if (player->introduced)
{
- if (v->nextvictim == u)
- {
- for (w=NEXT(v); w!=v; w=NEXT(w))
- {
- if (w->active && w->playing)
- {
- v->nextvictim = w;
- break;
- }
- }
- if (v->nextvictim == u)
- v->nextvictim = NULL;
- }
+ buffer[0] = player->number;
+ buffer[1] = OP_PLAYER_DISCONNECTED;
+ broadcast(player, 2, 0);
}
- free(u);
+ free(player);
clients--;
if (onceonly && clients == 0)
{
if (options.verbose)
{
- printf("RND_SERVER: no clients left\n");
- printf("RND_SERVER: aborting\n");
+ Error(ERR_NETWORK_SERVER, "no clients left");
+ Error(ERR_NETWORK_SERVER, "aborting");
}
exit(0);
}
}
-static void new_connect(int fd)
+#if defined(TARGET_SDL)
+static void AddPlayer(TCPsocket fd)
+#else
+static void AddPlayer(int fd)
+#endif
{
- struct user *u, *v;
+ struct NetworkServerPlayerInfo *player, *v;
unsigned char nxn;
+ boolean again = TRUE;
+
+ player = checked_malloc(sizeof (struct NetworkServerPlayerInfo));
+
+ player->fd = fd;
+ player->player_name[0] = 0;
+ player->next = first_player;
+ player->active = 0;
+ player->nread = 0;
+ player->nwrite = 0;
+ player->introduced = 0;
+ player->action = 0;
+ player->action_received = FALSE;
+
+#if defined(TARGET_SDL)
+ SDLNet_TCP_AddSocket(fds, fd);
+#endif
- u = checked_malloc(sizeof (struct user));
-
- u->fd = fd;
- u->nick[0] = 0;
- u->next = user0;
- u->nextvictim = NULL;
- u->active = 0;
- u->nread = 0;
- u->nwrite = 0;
- u->playing = 0;
- u->introduced = 0;
- u->games = 0;
- u->action = 0;
- u->action_received = 0;
-
- user0 = u;
+ first_player = player;
nxn = 1;
- again:
- v = u->next;
- while(v)
+ while (again)
{
- if (v->number == nxn)
+ again = FALSE;
+ v = player->next;
+
+ while (v)
{
- nxn++;
- goto again;
+ if (v->number == nxn)
+ {
+ nxn++;
+
+ again = TRUE;
+ break;
+ }
+ v = v->next;
}
- v = v->next;
}
- u->number = nxn;
+ player->number = nxn;
+#if !defined(TARGET_SDL)
if (options.verbose)
- printf("RND_SERVER: client %d connecting from %s\n", nxn, inet_ntoa(saddr.sin_addr));
+ Error(ERR_NETWORK_SERVER, "client %d connecting from %s",
+ nxn, inet_ntoa(saddr.sin_addr));
+#endif
clients++;
- buf[0] = 0;
- buf[1] = OP_YOUR_NUMBER;
- buf[2] = u->number;
- sendtoone(u, 3);
+ buffer[0] = 0;
+ buffer[1] = OP_YOUR_NUMBER;
+ buffer[2] = player->number;
+ sendtoone(player, 3);
}
-static void Handle_OP_PROTOCOL_VERSION(struct user *u, unsigned int len)
+static void Handle_OP_PROTOCOL_VERSION(struct NetworkServerPlayerInfo *player,
+ unsigned int len)
{
- if (len != 5 || buf[2] != PROTOCOL_VERSION_1 || buf[3] != PROTOCOL_VERSION_2)
+ if (len != 5 ||
+ buffer[2] != PROTOCOL_VERSION_1 ||
+ buffer[3] != PROTOCOL_VERSION_2)
{
if (options.verbose)
- printf("RND_SERVER: client %d (%s) has wrong protocol version %d.%d.%d\n", u->number, u->nick, buf[2], buf[3], buf[4]);
-
- buf[0] = 0;
- buf[1] = OP_BADVERS;
- buf[2] = PROTOCOL_VERSION_1;
- buf[3] = PROTOCOL_VERSION_2;
- buf[4] = PROTOCOL_VERSION_3;
- sendtoone(u, 5);
- flushuser(u);
-
- dropuser(u);
+ Error(ERR_NETWORK_SERVER,
+ "client %d (%s) has wrong protocol version %d.%d.%d",
+ player->number, player->player_name, buffer[2], buffer[3], buffer[4]);
+
+ buffer[0] = 0;
+ buffer[1] = OP_BAD_PROTOCOL_VERSION;
+ buffer[2] = PROTOCOL_VERSION_1;
+ buffer[3] = PROTOCOL_VERSION_2;
+ buffer[4] = PROTOCOL_VERSION_3;
+ sendtoone(player, 5);
+ flushuser(player);
+
+ RemovePlayer(player);
interrupt = 1;
}
else
{
if (options.verbose)
- printf("RND_SERVER: client %d (%s) uses protocol version %d.%d.%d\n", u->number, u->nick, buf[2], buf[3], buf[4]);
+ Error(ERR_NETWORK_SERVER,
+ "client %d (%s) uses protocol version %d.%d.%d",
+ player->number, player->player_name, buffer[2], buffer[3], buffer[4]);
}
}
-static void Handle_OP_NUMBER_WANTED(struct user *u)
+static void Handle_OP_NUMBER_WANTED(struct NetworkServerPlayerInfo *player)
{
- struct user *v;
- int client_nr = u->number;
- int nr_wanted = buf[2];
+ struct NetworkServerPlayerInfo *v;
+ int client_nr = player->number;
+ int nr_wanted = buffer[2];
int nr_is_free = 1;
if (options.verbose)
- printf("RND_SERVER: client %d (%s) wants to switch to # %d\n",
- u->number, u->nick, nr_wanted);
+ Error(ERR_NETWORK_SERVER, "client %d (%s) wants to switch to # %d",
+ player->number, player->player_name, nr_wanted);
- for (v=user0; v; v=v->next)
+ for (v = first_player; v; v = v->next)
{
if (v->number == nr_wanted)
{
if (options.verbose)
{
if (nr_is_free)
- printf("RND_SERVER: client %d (%s) switches to # %d\n",
- u->number, u->nick, nr_wanted);
- else if (u->number == nr_wanted)
- printf("RND_SERVER: client %d (%s) still has # %d\n",
- u->number, u->nick, nr_wanted);
+ Error(ERR_NETWORK_SERVER, "client %d (%s) switches to # %d",
+ player->number, player->player_name, nr_wanted);
+ else if (player->number == nr_wanted)
+ Error(ERR_NETWORK_SERVER, "client %d (%s) already has # %d",
+ player->number, player->player_name, nr_wanted);
else
- printf("RND_SERVER: client %d (%s) cannot switch (client %d still exists)\n",
- u->number, u->nick, nr_wanted);
+ Error(ERR_NETWORK_SERVER,
+ "client %d (%s) cannot switch (client %d already exists)",
+ player->number, player->player_name, nr_wanted);
}
if (nr_is_free)
- u->number = nr_wanted;
+ player->number = nr_wanted;
- buf[0] = client_nr;
- buf[1] = OP_NUMBER_WANTED;
- buf[2] = nr_wanted;
- buf[3] = u->number;
+ buffer[0] = client_nr;
+ buffer[1] = OP_NUMBER_WANTED;
+ buffer[2] = nr_wanted;
+ buffer[3] = player->number;
/*
- sendtoone(u, 4);
+ sendtoone(player, 4);
*/
broadcast(NULL, 4, 0);
}
-static void Handle_OP_NICKNAME(struct user *u, unsigned int len)
+static void Handle_OP_PLAYER_NAME(struct NetworkServerPlayerInfo *player,
+ unsigned int len)
{
- struct user *v;
+ struct NetworkServerPlayerInfo *v;
int i;
if (len>16)
len=16;
- memcpy(u->nick, &buf[2], len-2);
- u->nick[len-2] = 0;
- for (i=0; i<len-2; i++)
+ memcpy(player->player_name, &buffer[2], len-2);
+ player->player_name[len-2] = 0;
+ for (i = 0; i < len - 2; i++)
{
- if (u->nick[i] < ' ' ||
- (u->nick[i] > 0x7e && u->nick[i] <= 0xa0))
+ if (player->player_name[i] < ' ' ||
+ ((unsigned char)(player->player_name[i]) > 0x7e &&
+ (unsigned char)(player->player_name[i]) <= 0xa0))
{
- u->nick[i] = 0;
+ player->player_name[i] = 0;
break;
}
}
- if (!u->introduced)
+ if (!player->introduced)
{
- buf[0] = u->number;
- buf[1] = OP_PLAYER_CONNECTED;
- broadcast(u, 2, 0);
+ buffer[0] = player->number;
+ buffer[1] = OP_PLAYER_CONNECTED;
+ broadcast(player, 2, 0);
}
if (options.verbose)
- printf("RND_SERVER: client %d calls itself \"%s\"\n", u->number, u->nick);
- buf[1] = OP_NICKNAME;
- broadcast(u, len, 0);
+ Error(ERR_NETWORK_SERVER, "client %d calls itself \"%s\"",
+ player->number, player->player_name);
+ buffer[1] = OP_PLAYER_NAME;
+ broadcast(player, len, 0);
- if (!u->introduced)
+ if (!player->introduced)
{
- for (v=user0; v; v=v->next)
+ for (v = first_player; v; v = v->next)
{
- if (v != u && v->introduced)
+ if (v != player && v->introduced)
{
- buf[0] = v->number;
- buf[1] = OP_PLAYER_CONNECTED;
- buf[2] = (v->games >> 8);
- buf[3] = (v->games & 0xff);
- sendtoone(u, 4);
- buf[1] = OP_NICKNAME;
- memcpy(&buf[2], v->nick, 14);
- sendtoone(u, 2+strlen(v->nick));
+ buffer[0] = v->number;
+ buffer[1] = OP_PLAYER_CONNECTED;
+ sendtoone(player, 2);
+ buffer[1] = OP_PLAYER_NAME;
+ memcpy(&buffer[2], v->player_name, 14);
+ sendtoone(player, 2+strlen(v->player_name));
}
}
}
- u->introduced = 1;
+ player->introduced = 1;
}
-static void Handle_OP_START_PLAYING(struct user *u)
+static void Handle_OP_START_PLAYING(struct NetworkServerPlayerInfo *player)
{
- struct user *v, *w;
+ struct NetworkServerPlayerInfo *v, *w;
if (options.verbose)
- printf("RND_SERVER: client %d (%s) starts game [level %d from levedir %d (%s)]\n",
- u->number, u->nick,
- (buf[2] << 8) + buf[3],
- (buf[4] << 8) + buf[5],
- &buf[6]);
-
- for (w=user0; w; w=w->next)
- {
+ Error(ERR_NETWORK_SERVER,
+ "client %d (%s) starts game [level %d from leveldir %d (%s)]",
+ player->number, player->player_name,
+ (buffer[2] << 8) + buffer[3],
+ (buffer[4] << 8) + buffer[5],
+ &buffer[10]);
+
+ for (w = first_player; w; w = w->next)
if (w->introduced)
- {
w->active = 1;
- w->playing = 1;
- w->lines = 0;
- w->nextvictim = NULL;
- for (v=NEXT(w); v!=w; v=NEXT(v))
- {
- if (v->introduced)
- {
- w->nextvictim = v;
- break;
- }
- }
- }
- }
/* reset frame counter */
- frame_counter = 0;
+ ServerFrameCounter = 0;
+
+ Error(ERR_NETWORK_SERVER, "resetting ServerFrameCounter to 0");
/* reset player actions */
- for (v=user0; v; v=v->next)
+ for (v = first_player; v; v = v->next)
{
v->action = 0;
- v->action_received = 0;
+ v->action_received = FALSE;
}
- broadcast(NULL, 10 + strlen(&buf[10])+1, 0);
+ broadcast(NULL, 10 + strlen((char *)&buffer[10])+1, 0);
}
-static void Handle_OP_PAUSE_PLAYING(struct user *u)
+static void Handle_OP_PAUSE_PLAYING(struct NetworkServerPlayerInfo *player)
{
if (options.verbose)
- printf("RND_SERVER: client %d (%s) pauses game\n", u->number, u->nick);
+ Error(ERR_NETWORK_SERVER, "client %d (%s) pauses game",
+ player->number, player->player_name);
broadcast(NULL, 2, 0);
}
-static void Handle_OP_CONTINUE_PLAYING(struct user *u)
+static void Handle_OP_CONTINUE_PLAYING(struct NetworkServerPlayerInfo *player)
{
if (options.verbose)
- printf("RND_SERVER: client %d (%s) continues game\n", u->number, u->nick);
+ Error(ERR_NETWORK_SERVER, "client %d (%s) continues game",
+ player->number, player->player_name);
broadcast(NULL, 2, 0);
}
-static void Handle_OP_STOP_PLAYING(struct user *u)
+static void Handle_OP_STOP_PLAYING(struct NetworkServerPlayerInfo *player)
{
+ int cause_for_stopping = buffer[2];
+
if (options.verbose)
- printf("RND_SERVER: client %d (%s) stops game\n", u->number, u->nick);
- broadcast(NULL, 2, 0);
+ Error(ERR_NETWORK_SERVER, "client %d (%s) stops game [%d]",
+ player->number, player->player_name, cause_for_stopping);
+ broadcast(NULL, 3, 0);
}
-static void Handle_OP_MOVE_FIGURE(struct user *u)
+static void Handle_OP_MOVE_PLAYER(struct NetworkServerPlayerInfo *player)
{
- struct user *v;
+ struct NetworkServerPlayerInfo *v;
int last_client_nr = 0;
int i;
/* store player action */
- for (v=user0; v; v=v->next)
+ for (v = first_player; v; v = v->next)
{
- if (v->number == u->number)
+ if (v->number == player->number)
{
- v->action = buf[2];
- v->action_received = 1;
+ v->action = buffer[2];
+ v->action_received = TRUE;
}
}
/* check if server received action from each player */
- for (v=user0; v; v=v->next)
+ for (v = first_player; v; v = v->next)
{
if (!v->action_received)
return;
}
/* initialize all player actions to zero */
- for (i=0; i<last_client_nr; i++)
- buf[6 + i] = 0;
+ for (i = 0; i < last_client_nr; i++)
+ buffer[6 + i] = 0;
/* broadcast actions of all players to all players */
- for (v=user0; v; v=v->next)
+ for (v = first_player; v; v = v->next)
{
- buf[6 + v->number-1] = v->action;
+ buffer[6 + v->number-1] = v->action;
v->action = 0;
- v->action_received = 0;
+ v->action_received = FALSE;
}
- buf[2] = (unsigned char)((frame_counter >> 24) & 0xff);
- buf[3] = (unsigned char)((frame_counter >> 16) & 0xff);
- buf[4] = (unsigned char)((frame_counter >> 8) & 0xff);
- buf[5] = (unsigned char)((frame_counter >> 0) & 0xff);
+ buffer[2] = (unsigned char)((ServerFrameCounter >> 24) & 0xff);
+ buffer[3] = (unsigned char)((ServerFrameCounter >> 16) & 0xff);
+ buffer[4] = (unsigned char)((ServerFrameCounter >> 8) & 0xff);
+ buffer[5] = (unsigned char)((ServerFrameCounter >> 0) & 0xff);
broadcast(NULL, 6 + last_client_nr, 0);
- frame_counter++;
+#if 0
+ Error(ERR_NETWORK_SERVER, "sending ServerFrameCounter value %d",
+ ServerFrameCounter);
+#endif
- /*
- if (verbose)
- printf("RND_SERVER: frame %d: client %d (%s) moves player [0x%02x]\n",
- frame_counter,
- u->number, u->nick, buf[2]);
- */
+ ServerFrameCounter++;
+}
+
+#if defined(TARGET_SDL)
+/* the following is not used for a standalone server;
+ the pointer points to an integer containing the port-number */
+int NetworkServerThread(void *ptr)
+{
+ NetworkServer(*((int *) ptr), 0);
+
+ /* should never be reached */
+ return 0;
}
+#endif
void NetworkServer(int port, int serveronly)
{
- int i, sl, on;
- struct user *u;
- int mfd;
+ int sl;
+ struct NetworkServerPlayerInfo *player;
int r;
unsigned int len;
+#if defined(TARGET_SDL)
+ IPaddress ip;
+#else
+ int i, on;
+ int is_daemon = 0;
struct protoent *tcpproto;
struct timeval tv;
- int is_daemon = 0;
+ int mfd;
+#endif
-#ifndef NeXT
+#if defined(PLATFORM_UNIX) && !defined(PLATFORM_NEXT)
struct sigaction sact;
#endif
if (port == 0)
- port = DEFAULTPORT;
+ port = DEFAULT_SERVER_PORT;
if (!serveronly)
onceonly = 1;
+#if !defined(TARGET_SDL)
if ((tcpproto = getprotobyname("tcp")) != NULL)
tcp = tcpproto->p_proto;
+#endif
-#ifdef NeXT
+#if defined(PLATFORM_UNIX)
+#if defined(PLATFORM_NEXT)
signal(SIGPIPE, SIG_IGN);
#else
sact.sa_handler = SIG_IGN;
sact.sa_flags = 0;
sigaction(SIGPIPE, &sact, NULL);
#endif
+#endif
+
+#if defined(TARGET_SDL)
+
+ /* assume that SDL is already initialized */
+#if 0
+ if (SDLNet_Init() == -1)
+ Error(ERR_EXIT_NETWORK_SERVER, "SDLNet_Init() failed");
+ atexit(SDLNet_Quit);
+#endif
+
+ if (SDLNet_ResolveHost(&ip, NULL, port) == -1)
+ Error(ERR_EXIT_NETWORK_SERVER, "SDLNet_ResolveHost() failed");
+ lfd = SDLNet_TCP_Open(&ip);
+ if (!lfd)
+ Error(ERR_EXIT_NETWORK_SERVER, "SDLNet_TCP_Open() failed");
+
+ fds = SDLNet_AllocSocketSet(MAX_PLAYERS+1);
+ SDLNet_TCP_AddSocket(fds, lfd);
+
+#else
+
+ if ((lfd = socket(PF_INET, SOCK_STREAM, 0)) < 0)
+ Error(ERR_EXIT_NETWORK_SERVER, "socket() failed");
- lfd = socket(PF_INET, SOCK_STREAM, 0);
saddr.sin_family = AF_INET;
saddr.sin_addr.s_addr = htonl(INADDR_ANY);
saddr.sin_port = htons(port);
- if (lfd < 0)
- syserr("socket");
on = 1;
setsockopt(lfd, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(int));
if (bind(lfd, (struct sockaddr *)&saddr, sizeof(saddr)) < 0)
- syserr("bind");
+ Error(ERR_EXIT_NETWORK_SERVER, "bind() failed");
listen(lfd, 5);
+#endif
+#if !defined(TARGET_SDL)
if (is_daemon)
{
/* become a daemon, breaking all ties with the controlling terminal */
- options.verbose = 0;
- for (i=0; i<255; i++)
+ options.verbose = FALSE;
+ for (i = 0; i < 255; i++)
{
if (i != lfd)
close(i);
setsid();
if (fork())
exit(0);
- chdir("/");
+ if (chdir("/") == -1)
+ Error(ERR_WARN, "chdir() failed; %s", strerror(errno));
/* open a fake stdin, stdout, stderr, just in case */
open("/dev/null", O_RDONLY);
open("/dev/null", O_WRONLY);
open("/dev/null", O_WRONLY);
}
+#endif
if (options.verbose)
{
- printf("rocksndiamonds network server: started up, listening on port %d\n",
- port);
- printf("rocksndiamonds network server: using protocol version %d.%d.%d\n",
- PROTOCOL_VERSION_1, PROTOCOL_VERSION_2, PROTOCOL_VERSION_3);
+ Error(ERR_NETWORK_SERVER, "started up, listening on port %d", port);
+ Error(ERR_NETWORK_SERVER, "using protocol version %d.%d.%d",
+ PROTOCOL_VERSION_1, PROTOCOL_VERSION_2, PROTOCOL_VERSION_3);
}
- while(1)
+ while (1)
{
interrupt = 0;
- for (u=user0; u; u=u->next)
- flushuser(u);
+ for (player = first_player; player; player = player->next)
+ flushuser(player);
+
+#if defined(TARGET_SDL)
+ if ((sl = SDLNet_CheckSockets(fds, 500000)) < 1)
+ {
+ Error(ERR_NETWORK_SERVER, SDLNet_GetError());
+ perror("SDLNet_CheckSockets");
+ }
+
+#else
FD_ZERO(&fds);
mfd = lfd;
- u = user0;
- while (u)
+ player = first_player;
+ while (player)
{
- FD_SET(u->fd, &fds);
- if (u->fd > mfd)
- mfd = u->fd;
- u = u->next;
+ FD_SET(player->fd, &fds);
+ if (player->fd > mfd)
+ mfd = player->fd;
+ player = player->next;
}
FD_SET(lfd, &fds);
tv.tv_sec = 0;
if ((sl = select(mfd + 1, &fds, NULL, NULL, &tv)) < 0)
{
if (errno != EINTR)
- syserr("select");
+ Error(ERR_EXIT_NETWORK_SERVER, "select() failed");
else
continue;
}
+#endif
if (sl < 0)
continue;
if (sl == 0)
continue;
+ /* accept incoming connections */
+#if defined(TARGET_SDL)
+ if (SDLNet_SocketReady(lfd))
+ {
+ TCPsocket newsock;
+
+ newsock = SDLNet_TCP_Accept(lfd);
+
+ if (newsock)
+ AddPlayer(newsock);
+ }
+
+#else
+
if (FD_ISSET(lfd, &fds))
{
- int newfd, slen;
+ int newfd;
+ socklen_t slen;
slen = sizeof(saddr);
newfd = accept(lfd, (struct sockaddr *)&saddr, &slen);
if (newfd < 0)
{
if (errno != EINTR)
- syserr("accept");
+ Error(ERR_EXIT_NETWORK_SERVER, "accept() failed");
}
else
{
on = 1;
setsockopt(newfd, tcp, TCP_NODELAY, (char *)&on, sizeof(int));
}
- new_connect(newfd);
+ AddPlayer(newfd);
}
continue;
}
+#endif
- u = user0;
+ player = first_player;
do
{
- if (FD_ISSET(u->fd, &fds))
+#if defined(TARGET_SDL)
+ if (SDLNet_SocketReady(player->fd))
+#else
+ if (FD_ISSET(player->fd, &fds))
+#endif
{
- r = read(u->fd, u->readbuf + u->nread, MAX_BUFFER_SIZE - u->nread);
+#if defined(TARGET_SDL)
+ /* read only 1 byte, because SDLNet blocks when we want more than is
+ in the buffer */
+ r = SDLNet_TCP_Recv(player->fd, player->readbuffer + player->nread, 1);
+#else
+ r = read(player->fd, player->readbuffer + player->nread,
+ MAX_BUFFER_SIZE - player->nread);
+#endif
+
if (r <= 0)
{
if (options.verbose)
- printf("RND_SERVER: EOF from client %d (%s)\n", u->number, u->nick);
- dropuser(u);
+ Error(ERR_NETWORK_SERVER, "EOF from client %d (%s)",
+ player->number, player->player_name);
+ RemovePlayer(player);
interrupt = 1;
break;
}
- u->nread += r;
- while (u->nread >= 4 && u->nread >= 4 + u->readbuf[3])
+ player->nread += r;
+ while (player->nread >= 4 && player->nread >= 4 + player->readbuffer[3])
{
- len = u->readbuf[3];
- if (u->readbuf[0] || u->readbuf[1] || u->readbuf[2])
+ len = player->readbuffer[3];
+ if (player->readbuffer[0] || player->readbuffer[1] || player->readbuffer[2])
{
if (options.verbose)
- printf("RND_SERVER: crap from client %d (%s)\n", u->number, u->nick);
- write(u->fd, "\033]50;kanji24\007\033#8\033(0", 19);
- dropuser(u);
+ Error(ERR_NETWORK_SERVER, "crap from client %d (%s)",
+ player->number, player->player_name);
+ RemovePlayer(player);
interrupt = 1;
break;
}
- memcpy(buf, &u->readbuf[4], len);
- u->nread -= 4 + len;
- memmove(u->readbuf, u->readbuf + 4 + len, u->nread);
+ memcpy(buffer, &player->readbuffer[4], len);
+ player->nread -= 4 + len;
+ memmove(player->readbuffer, player->readbuffer + 4 + len, player->nread);
- buf[0] = u->number;
- if (!u->introduced && buf[1] != OP_NICKNAME)
+ buffer[0] = player->number;
+ if (!player->introduced && buffer[1] != OP_PLAYER_NAME)
{
if (options.verbose)
- printf("RND_SERVER: !(client %d)->introduced && buf[1]==%d (expected OP_NICKNAME)\n", buf[0], buf[1]);
+ Error(ERR_NETWORK_SERVER, "!(client %d)->introduced && buffer[1]==%d (expected OP_PLAYER_NAME)", buffer[0], buffer[1]);
- dropuser(u);
+ RemovePlayer(player);
interrupt = 1;
break;
}
- switch(buf[1])
+ switch (buffer[1])
{
- case OP_NICKNAME:
- Handle_OP_NICKNAME(u, len);
+ case OP_PLAYER_NAME:
+ Handle_OP_PLAYER_NAME(player, len);
break;
case OP_PROTOCOL_VERSION:
- Handle_OP_PROTOCOL_VERSION(u, len);
+ Handle_OP_PROTOCOL_VERSION(player, len);
break;
case OP_NUMBER_WANTED:
- Handle_OP_NUMBER_WANTED(u);
+ Handle_OP_NUMBER_WANTED(player);
break;
case OP_START_PLAYING:
- Handle_OP_START_PLAYING(u);
+ Handle_OP_START_PLAYING(player);
break;
case OP_PAUSE_PLAYING:
- Handle_OP_PAUSE_PLAYING(u);
+ Handle_OP_PAUSE_PLAYING(player);
break;
case OP_CONTINUE_PLAYING:
- Handle_OP_CONTINUE_PLAYING(u);
+ Handle_OP_CONTINUE_PLAYING(player);
break;
case OP_STOP_PLAYING:
- Handle_OP_STOP_PLAYING(u);
+ Handle_OP_STOP_PLAYING(player);
break;
- case OP_MOVE_FIGURE:
- Handle_OP_MOVE_FIGURE(u);
+ case OP_MOVE_PLAYER:
+ Handle_OP_MOVE_PLAYER(player);
break;
- case OP_MSG:
- buf[len] = '\0';
+ case OP_BROADCAST_MESSAGE:
+ buffer[len] = '\0';
if (options.verbose)
- printf("RND_SERVER: client %d (%s) sends message: %s\n", u->number, u->nick, &buf[2]);
- broadcast(u, len, 0);
+ Error(ERR_NETWORK_SERVER, "client %d (%s) sends message: %s",
+ player->number, player->player_name, &buffer[2]);
+ broadcast(player, len, 0);
break;
default:
if (options.verbose)
- printf("RND_SERVER: opcode %d from client %d (%s) not understood\n", buf[0], u->number, u->nick);
+ Error(ERR_NETWORK_SERVER,
+ "unknown opcode %d from client %d (%s)",
+ buffer[0], player->number, player->player_name);
}
}
}
- if (u && !interrupt)
- u = u->next;
+ if (player && !interrupt)
+ player = player->next;
}
- while (u && !interrupt);
+ while (player && !interrupt);
}
}
+
+#endif /* NETWORK_AVALIABLE */