X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fnetserv.c;h=b895a30318a93172e3d0284e7d27a4bf492e7702;hb=c91aa2b237bef6003ead8dfc98cdcab89f97c654;hp=71834c3b1f17dbc8be3a778149e0db9ea569570e;hpb=74c0f7de91268e40d15948f473eac51a9760b9c0;p=rocksndiamonds.git diff --git a/src/netserv.c b/src/netserv.c index 71834c3b..b895a303 100644 --- a/src/netserv.c +++ b/src/netserv.c @@ -1,29 +1,35 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * * Germany * * e-mail: info@artsoft.org * *----------------------------------------------------------* -* network.c * +* netserv.c * ***********************************************************/ #include "libgame/platform.h" -#if defined(PLATFORM_UNIX) +#if defined(NETWORK_AVALIABLE) #include #include #include -#include #include + +#if defined(TARGET_SDL) +#include "main.h" +#else +#include #include #include #include #include +#include /* apparently needed for OS/2 port */ +#endif #include "libgame/libgame.h" @@ -34,7 +40,12 @@ static int onceonly = 0; struct NetworkServerPlayerInfo { +#if defined(TARGET_SDL) + TCPsocket fd; +#else int fd; +#endif + char player_name[16]; unsigned char number; struct NetworkServerPlayerInfo *next; @@ -51,16 +62,22 @@ static struct NetworkServerPlayerInfo *first_player = NULL; #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 int lfd; /* listening socket */ +static fd_set fds; /* socket set */ +static int tcp = -1; +#endif + static unsigned char realbuffer[512], *buffer = realbuffer + 4; static int interrupt; -static int tcp = -1; - -static unsigned long ServerFrameCounter = 0; -static fd_set fds; +static unsigned int ServerFrameCounter = 0; static void addtobuffer(struct NetworkServerPlayerInfo *player, unsigned char *b, int len) @@ -77,7 +94,12 @@ static void flushuser(struct NetworkServerPlayerInfo *player) { if (player->nwrite) { - write(player->fd, player->writbuffer, player->nwrite); +#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; } } @@ -123,7 +145,13 @@ static void RemovePlayer(struct NetworkServerPlayerInfo *player) } } } + +#if defined(TARGET_SDL) + SDLNet_TCP_DelSocket(fds, player->fd); + SDLNet_TCP_Close(player->fd); +#else close(player->fd); +#endif if (player->introduced) { @@ -146,7 +174,11 @@ static void RemovePlayer(struct NetworkServerPlayerInfo *player) } } +#if defined(TARGET_SDL) +static void AddPlayer(TCPsocket fd) +#else static void AddPlayer(int fd) +#endif { struct NetworkServerPlayerInfo *player, *v; unsigned char nxn; @@ -164,11 +196,14 @@ static void AddPlayer(int fd) player->action = 0; player->action_received = FALSE; +#if defined(TARGET_SDL) + SDLNet_TCP_AddSocket(fds, fd); +#endif + first_player = player; nxn = 1; -#if 1 while (again) { again = FALSE; @@ -186,24 +221,13 @@ static void AddPlayer(int fd) v = v->next; } } -#else - again: - v = player->next; - while (v) - { - if (v->number == nxn) - { - nxn++; - goto again; - } - v = v->next; - } -#endif player->number = nxn; +#if !defined(TARGET_SDL) if (options.verbose) Error(ERR_NETWORK_SERVER, "client %d connecting from %s", nxn, inet_ntoa(saddr.sin_addr)); +#endif clients++; buffer[0] = 0; @@ -270,11 +294,11 @@ static void Handle_OP_NUMBER_WANTED(struct NetworkServerPlayerInfo *player) 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) still has # %d", + Error(ERR_NETWORK_SERVER, "client %d (%s) already has # %d", player->number, player->player_name, nr_wanted); else Error(ERR_NETWORK_SERVER, - "client %d (%s) cannot switch (client %d still exists)", + "client %d (%s) cannot switch (client %d already exists)", player->number, player->player_name, nr_wanted); } @@ -352,11 +376,11 @@ static void Handle_OP_START_PLAYING(struct NetworkServerPlayerInfo *player) if (options.verbose) Error(ERR_NETWORK_SERVER, - "client %d (%s) starts game [level %d from levedir %d (%s)]", + "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[6]); + &buffer[10]); for (w = first_player; w; w = w->next) if (w->introduced) @@ -365,6 +389,8 @@ static void Handle_OP_START_PLAYING(struct NetworkServerPlayerInfo *player) /* reset frame counter */ ServerFrameCounter = 0; + Error(ERR_NETWORK_SERVER, "resetting ServerFrameCounter to 0"); + /* reset player actions */ for (v = first_player; v; v = v->next) { @@ -393,10 +419,12 @@ static void Handle_OP_CONTINUE_PLAYING(struct NetworkServerPlayerInfo *player) static void Handle_OP_STOP_PLAYING(struct NetworkServerPlayerInfo *player) { + int cause_for_stopping = buffer[2]; + if (options.verbose) - Error(ERR_NETWORK_SERVER, "client %d (%s) stops game", - player->number, player->player_name); - 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_PLAYER(struct NetworkServerPlayerInfo *player) @@ -444,21 +472,43 @@ static void Handle_OP_MOVE_PLAYER(struct NetworkServerPlayerInfo *player) broadcast(NULL, 6 + last_client_nr, 0); +#if 0 + Error(ERR_NETWORK_SERVER, "sending ServerFrameCounter value %d", + ServerFrameCounter); +#endif + 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; + int sl; struct NetworkServerPlayerInfo *player; - int mfd; 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 @@ -468,10 +518,13 @@ void NetworkServer(int port, int serveronly) 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; @@ -479,7 +532,28 @@ void NetworkServer(int port, int serveronly) 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"); @@ -495,7 +569,9 @@ void NetworkServer(int port, int serveronly) 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 */ @@ -511,13 +587,15 @@ void NetworkServer(int port, int serveronly) 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) { @@ -533,6 +611,15 @@ void NetworkServer(int port, int serveronly) 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; player = first_player; @@ -553,6 +640,7 @@ void NetworkServer(int port, int serveronly) else continue; } +#endif if (sl < 0) continue; @@ -560,9 +648,24 @@ void NetworkServer(int port, int serveronly) 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); @@ -582,14 +685,27 @@ void NetworkServer(int port, int serveronly) } continue; } +#endif player = first_player; do { +#if defined(TARGET_SDL) + if (SDLNet_SocketReady(player->fd)) +#else if (FD_ISSET(player->fd, &fds)) +#endif { - r = read(player->fd, player->readbuffer + player->nread, MAX_BUFFER_SIZE - player->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) @@ -627,7 +743,7 @@ void NetworkServer(int port, int serveronly) break; } - switch(buffer[1]) + switch (buffer[1]) { case OP_PLAYER_NAME: Handle_OP_PLAYER_NAME(player, len); @@ -685,4 +801,4 @@ void NetworkServer(int port, int serveronly) } } -#endif /* PLATFORM_UNIX */ +#endif /* NETWORK_AVALIABLE */