X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fnetserv.c;h=6555e0497922502843b7ef909c34cfc69be28bf1;hp=121377e29c7f359c3508775f0efb2f3d90035712;hb=27ffbe2b057d39a86c905d95acea54056690bb20;hpb=e5367ee42312c8835125438511d8479aa2daa094 diff --git a/src/netserv.c b/src/netserv.c index 121377e2..6555e049 100644 --- a/src/netserv.c +++ b/src/netserv.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * -*----------------------------------------------------------* -* (c) 1995-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* netserv.c * -***********************************************************/ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// netserv.c +// ============================================================================ #include "libgame/platform.h" @@ -20,16 +18,7 @@ #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" @@ -40,12 +29,7 @@ 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; @@ -62,16 +46,9 @@ 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; /* listening socket */ -static fd_set fds; /* socket set */ -static int tcp = -1; -#endif static unsigned char realbuffer[512], *buffer = realbuffer + 4; @@ -94,12 +71,8 @@ static void flushuser(struct NetworkServerPlayerInfo *player) { if (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; } } @@ -146,12 +119,8 @@ 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) { @@ -174,11 +143,7 @@ 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; @@ -196,9 +161,7 @@ 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; @@ -223,11 +186,6 @@ static void AddPlayer(int fd) } 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; @@ -472,15 +430,9 @@ 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) @@ -490,7 +442,6 @@ int NetworkServerThread(void *ptr) /* should never be reached */ return 0; } -#endif void NetworkServer(int port, int serveronly) { @@ -498,15 +449,7 @@ void NetworkServer(int port, int serveronly) 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 mfd; -#endif #if defined(PLATFORM_UNIX) && !defined(PLATFORM_NEXT) struct sigaction sact; @@ -518,11 +461,6 @@ void NetworkServer(int port, int serveronly) if (!serveronly) onceonly = 1; -#if !defined(TARGET_SDL) - if ((tcpproto = getprotobyname("tcp")) != NULL) - tcp = tcpproto->p_proto; -#endif - #if defined(PLATFORM_UNIX) #if defined(PLATFORM_NEXT) signal(SIGPIPE, SIG_IGN); @@ -534,15 +472,6 @@ void NetworkServer(int port, int serveronly) #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"); @@ -553,50 +482,6 @@ void NetworkServer(int port, int serveronly) 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"); - - saddr.sin_family = AF_INET; - saddr.sin_addr.s_addr = htonl(INADDR_ANY); - saddr.sin_port = htons(port); - - on = 1; - - setsockopt(lfd, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(int)); - if (bind(lfd, (struct sockaddr *)&saddr, sizeof(saddr)) < 0) - 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 = FALSE; - for (i = 0; i < 255; i++) - { - if (i != lfd) - close(i); - } - - if (fork()) - exit(0); - setsid(); - if (fork()) - exit(0); - 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) { Error(ERR_NETWORK_SERVER, "started up, listening on port %d", port); @@ -611,7 +496,6 @@ 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_CheckSockets failed: %s", @@ -619,30 +503,6 @@ void NetworkServer(int port, int serveronly) perror("SDLNet_CheckSockets"); } -#else - - FD_ZERO(&fds); - mfd = lfd; - player = first_player; - while (player) - { - FD_SET(player->fd, &fds); - if (player->fd > mfd) - mfd = player->fd; - player = player->next; - } - FD_SET(lfd, &fds); - tv.tv_sec = 0; - tv.tv_usec = 500000; - if ((sl = select(mfd + 1, &fds, NULL, NULL, &tv)) < 0) - { - if (errno != EINTR) - Error(ERR_EXIT_NETWORK_SERVER, "select() failed"); - else - continue; - } -#endif - if (sl < 0) continue; @@ -650,7 +510,6 @@ void NetworkServer(int port, int serveronly) continue; /* accept incoming connections */ -#if defined(TARGET_SDL) if (SDLNet_SocketReady(lfd)) { TCPsocket newsock; @@ -661,51 +520,15 @@ void NetworkServer(int port, int serveronly) AddPlayer(newsock); } -#else - - if (FD_ISSET(lfd, &fds)) - { - int newfd; - socklen_t slen; - - slen = sizeof(saddr); - newfd = accept(lfd, (struct sockaddr *)&saddr, &slen); - if (newfd < 0) - { - if (errno != EINTR) - Error(ERR_EXIT_NETWORK_SERVER, "accept() failed"); - } - else - { - if (tcp != -1) - { - on = 1; - setsockopt(newfd, tcp, TCP_NODELAY, (char *)&on, sizeof(int)); - } - AddPlayer(newfd); - } - continue; - } -#endif - player = first_player; do { -#if defined(TARGET_SDL) if (SDLNet_SocketReady(player->fd)) -#else - if (FD_ISSET(player->fd, &fds)) -#endif { -#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) {