X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fnetwork.c;h=56d6bc66226452bbdff72c886630fe425263f44b;hp=6f1855c17a0594998db4dac2964a0fc58afb4c58;hb=5c6c42f1;hpb=90c3a49422dd88de77ffc7b8dd1d4f1d73d0d9a3 diff --git a/src/network.c b/src/network.c index 6f1855c1..56d6bc66 100644 --- a/src/network.c +++ b/src/network.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * -*----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* network.c * -***********************************************************/ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// network.c +// ============================================================================ #include "libgame/platform.h" @@ -18,16 +16,7 @@ #include #include -#if defined(TARGET_SDL) #include "main.h" -#else -#include -#include -#include -#include -#include -#include -#endif #include "libgame/libgame.h" @@ -55,12 +44,8 @@ static struct NetworkClientPlayerInfo first_player = /* server stuff */ -#if defined(TARGET_SDL) static TCPsocket sfd; /* server socket */ static SDLNet_SocketSet rfds; /* socket set */ -#else -static int sfd; /* server socket */ -#endif static byte realbuffer[512]; static byte readbuffer[MAX_BUFFER_SIZE], writbuffer[MAX_BUFFER_SIZE]; @@ -84,11 +69,7 @@ static void SendBufferToServer(int size) nwrite += 4 + size; /* directly send the buffer to the network server */ -#if defined(TARGET_SDL) SDLNet_TCP_Send(sfd, writbuffer, nwrite); -#else - write(sfd, writbuffer, nwrite); -#endif nwrite = 0; } @@ -117,7 +98,7 @@ char *getNetworkPlayerName(int player_nr) return("you"); else for (player = &first_player; player; player = player->next) - if (player->nr == player_nr && player->name && strlen(player->name)) + if (player->nr == player_nr && strlen(player->name) > 0) return(player->name); return(EMPTY_PLAYER_NAME); @@ -125,37 +106,18 @@ char *getNetworkPlayerName(int player_nr) static void StartNetworkServer(int port) { -#if defined(TARGET_SDL) static int p; p = port; - server_thread = SDL_CreateThread(NetworkServerThread, &p); - network_server = TRUE; - +#if defined(TARGET_SDL2) + server_thread = SDL_CreateThread(NetworkServerThread, + "NetworkServerThread", &p); #else - - switch (fork()) - { - case 0: - NetworkServer(port, options.serveronly); - - /* never reached */ - exit(0); - - case -1: - Error(ERR_WARN, - "cannot create network server process - no network playing"); - options.network = FALSE; - return; - - default: - /* we are parent process -- resume normal operation */ - return; - } + server_thread = SDL_CreateThread(NetworkServerThread, &p); #endif + network_server = TRUE; } -#if defined(TARGET_SDL) boolean ConnectToServer(char *hostname, int port) { IPaddress ip; @@ -212,72 +174,6 @@ boolean ConnectToServer(char *hostname, int port) return FALSE; } -#else - -boolean ConnectToServer(char *hostname, int port) -{ - struct sockaddr_in s; - struct protoent *tcpproto; - int on = 1, i; - - if (hostname) - { - if ((s.sin_addr.s_addr = inet_addr(hostname)) == -1) - { - struct hostent *host; - - if ((host = gethostbyname(hostname)) == NULL) - Error(ERR_EXIT, "cannot locate host '%s'", hostname); - - s.sin_addr = *(struct in_addr *)(host->h_addr_list[0]); - } - } - else - s.sin_addr.s_addr = inet_addr("127.0.0.1"); /* localhost */ - - if (port == 0) - port = DEFAULT_SERVER_PORT; - - s.sin_port = htons(port); - s.sin_family = AF_INET; - - sfd = socket(PF_INET, SOCK_STREAM, 0); - if (sfd < 0) - Error(ERR_EXIT, "out of file descriptors"); - - if ((tcpproto = getprotobyname("tcp")) != NULL) - setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int)); - - if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) == 0) /* connected */ - return TRUE; - - if (hostname) /* connect to specified server failed */ - return FALSE; - - printf("No rocksndiamonds server on localhost -- starting up one ...\n"); - StartNetworkServer(port); - - /* wait for server to start up and try connecting several times */ - for (i = 0; i < 6; i++) - { - Delay(500); /* wait 500 ms == 0.5 seconds */ - close(sfd); - - sfd = socket(PF_INET, SOCK_STREAM, 0); - if (sfd < 0) - Error(ERR_EXIT, "out of file descriptors"); - - setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int)); - - if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) >= 0) /* connected */ - return TRUE; - } - - /* when reaching this point, connect to newly started server has failed */ - return FALSE; -} -#endif /* defined(TARGET_SDL) */ - void SendToServer_PlayerName(char *player_name) { int len_player_name = strlen(player_name); @@ -308,7 +204,7 @@ void SendToServer_NrWanted(int nr_wanted) void SendToServer_StartPlaying() { - unsigned long new_random_seed = InitRND(NEW_RANDOMIZE); + unsigned int new_random_seed = InitRND(level.random_seed); int dummy = 0; /* !!! HAS NO MEANING ANYMORE !!! */ /* the name of the level must be enough */ @@ -433,7 +329,7 @@ static void Handle_OP_NUMBER_WANTED() { char request[100]; - sprintf(request, "Sorry ! Player %d already exists ! You are player %d !", + sprintf(request, "Sorry! Player %d already exists! You are player %d!", index_nr_wanted + 1, new_index_nr + 1); Request(request, REQ_CONFIRM); @@ -502,12 +398,10 @@ static void Handle_OP_START_PLAYING() { LevelDirTree *new_leveldir; int new_level_nr; - int dummy; - unsigned long new_random_seed; + unsigned int new_random_seed; char *new_leveldir_identifier; new_level_nr = (buffer[2] << 8) + buffer[3]; - dummy = (buffer[4] << 8) + buffer[5]; /* (obsolete) */ new_random_seed = (buffer[6] << 24) | (buffer[7] << 16) | (buffer[8] << 8) | (buffer[9]); new_leveldir_identifier = (char *)&buffer[10]; @@ -567,10 +461,11 @@ static void Handle_OP_STOP_PLAYING() else if (buffer[2] == NETWORK_STOP_BY_ERROR) Request("Network game stopped due to internal error!", REQ_CONFIRM); else - Request("Network game stopped !", REQ_CONFIRM); + Request("Network game stopped!", REQ_CONFIRM); } - game_status = GAME_MODE_MAIN; + SetGameStatus(GAME_MODE_MAIN); + DrawMainMenu(); } @@ -585,17 +480,12 @@ static void Handle_OP_MOVE_PLAYER(unsigned int len) server_frame_counter = (buffer[2] << 24) | (buffer[3] << 16) | (buffer[4] << 8) | (buffer[5]); -#if 0 - Error(ERR_NETWORK_CLIENT, "receiving server frame counter value %d [%d]", - server_frame_counter, FrameCounter); -#endif - if (server_frame_counter != FrameCounter) { - Error(ERR_RETURN, "client and servers frame counters out of sync"); - Error(ERR_RETURN, "frame counter of client is %d", FrameCounter); - Error(ERR_RETURN, "frame counter of server is %d", server_frame_counter); - Error(ERR_RETURN, "this should not happen -- please debug"); + Error(ERR_INFO, "client and servers frame counters out of sync"); + Error(ERR_INFO, "frame counter of client is %d", FrameCounter); + Error(ERR_INFO, "frame counter of server is %d", server_frame_counter); + Error(ERR_INFO, "this should not happen -- please debug"); stop_network_game = TRUE; @@ -626,7 +516,7 @@ static void HandleNetworkingMessages() nread -= 4 + message_length; memmove(readbuffer, readbuffer + 4 + message_length, nread); - switch(buffer[1]) + switch (buffer[1]) { case OP_BAD_PROTOCOL_VERSION: Handle_OP_BAD_PROTOCOL_VERSION(); @@ -690,43 +580,16 @@ static void HandleNetworkingMessages() void HandleNetworking() { -#if !defined(TARGET_SDL) - static struct timeval tv = { 0, 0 }; - fd_set rfds; -#endif int r = 0; do { -#if defined(TARGET_SDL) if ((r = SDLNet_CheckSockets(rfds, 1)) < 0) Error(ERR_EXIT, "HandleNetworking(): SDLNet_CheckSockets() failed"); -#else - - FD_ZERO(&rfds); - FD_SET(sfd, &rfds); - - r = select(sfd + 1, &rfds, NULL, NULL, &tv); - - if (r < 0 && errno != EINTR) - Error(ERR_EXIT, "HandleNetworking(): select() failed"); - - if (r < 0) - FD_ZERO(&rfds); -#endif - -#if defined(TARGET_SDL) if (r > 0) -#else - if (FD_ISSET(sfd, &rfds)) -#endif { -#if defined(TARGET_SDL) r = SDLNet_TCP_Recv(sfd, readbuffer + nread, 1); -#else - r = read(sfd, readbuffer + nread, MAX_BUFFER_SIZE - nread); -#endif if (r < 0) Error(ERR_EXIT, "error reading from network server"); @@ -742,4 +605,4 @@ void HandleNetworking() while (r > 0); } -#endif /* PLATFORM_UNIX */ +#endif /* NETWORK_AVALIABLE */