X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fnetwork.c;h=8d853201f85e15cbb22028880e196d4f36bc6807;hp=bd408a1ec6b647be1d79afc9247345e83243df03;hb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;hpb=0a87fde47bcff35f196024766f8d0d00319a28d1 diff --git a/src/network.c b/src/network.c index bd408a1e..8d853201 100644 --- a/src/network.c +++ b/src/network.c @@ -1,27 +1,33 @@ -/*********************************************************** -* 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 * -*----------------------------------------------------------* -* network.c * -***********************************************************/ - -#ifndef MSDOS - -#include +// ============================================================================ +// 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" + +#if defined(NETWORK_AVALIABLE) + #include #include + +#if defined(TARGET_SDL) +#include "main.h" +#else #include #include #include #include #include #include +#endif + +#include "libgame/libgame.h" #include "network.h" #include "netserv.h" @@ -29,16 +35,12 @@ #include "tape.h" #include "files.h" #include "tools.h" -#include "buttons.h" #include "screens.h" -#include "misc.h" - -#define MAX_PLAYER_NAME_LEN 14 struct NetworkClientPlayerInfo { byte nr; - char name[MAX_PLAYER_NAME_LEN + 2]; + char name[MAX_PLAYER_NAME_LEN + 1]; struct NetworkClientPlayerInfo *next; }; @@ -51,11 +53,18 @@ static struct NetworkClientPlayerInfo first_player = /* server stuff */ -static int sfd; +#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]; static byte *buffer = realbuffer + 4; static int nread = 0, nwrite = 0; +static boolean stop_network_game = FALSE; static void SendBufferToServer(int size) { @@ -73,7 +82,12 @@ static void SendBufferToServer(int size) nwrite += 4 + size; /* directly send the buffer to the network server */ - write(sfd, writbuffer, nwrite); +#if defined(TARGET_SDL) + SDLNet_TCP_Send(sfd, writbuffer, nwrite); +#else + if (write(sfd, writbuffer, nwrite) == -1) + Error(ERR_WARN, "write() failed; %s", strerror(errno)); +#endif nwrite = 0; } @@ -101,7 +115,7 @@ char *getNetworkPlayerName(int player_nr) else if (player_nr == first_player.nr) return("you"); else - for (player=&first_player; player; player=player->next) + for (player = &first_player; player; player = player->next) if (player->nr == player_nr && player->name && strlen(player->name)) return(player->name); @@ -110,6 +124,20 @@ char *getNetworkPlayerName(int player_nr) static void StartNetworkServer(int port) { +#if defined(TARGET_SDL) + static int p; + + p = port; +#if defined(TARGET_SDL2) + server_thread = SDL_CreateThread(NetworkServerThread, + "NetworkServerThread", &p); +#else + server_thread = SDL_CreateThread(NetworkServerThread, &p); +#endif + network_server = TRUE; + +#else + switch (fork()) { case 0: @@ -128,8 +156,68 @@ static void StartNetworkServer(int port) /* we are parent process -- resume normal operation */ return; } +#endif +} + +#if defined(TARGET_SDL) +boolean ConnectToServer(char *hostname, int port) +{ + IPaddress ip; + int i; + + if (port == 0) + port = DEFAULT_SERVER_PORT; + + rfds = SDLNet_AllocSocketSet(1); + + if (hostname) + { + SDLNet_ResolveHost(&ip, hostname, port); + if (ip.host == INADDR_NONE) + Error(ERR_EXIT, "cannot locate host '%s'", hostname); + } + else + { + SDLNet_Write32(0x7f000001, &ip.host); /* 127.0.0.1 */ + SDLNet_Write16(port, &ip.port); + } + + sfd = SDLNet_TCP_Open(&ip); + + if (sfd) + { + SDLNet_TCP_AddSocket(rfds, sfd); + return TRUE; + } + else + { + printf("SDLNet_TCP_Open(): %s\n", SDLNet_GetError()); + } + + 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 */ + + if ((sfd = SDLNet_TCP_Open(&ip))) /* connected */ + { + SDLNet_TCP_AddSocket(rfds, sfd); + return TRUE; + } + } + + /* when reaching this point, connect to newly started server has failed */ + return FALSE; } +#else + boolean ConnectToServer(char *hostname, int port) { struct sockaddr_in s; @@ -170,11 +258,11 @@ boolean ConnectToServer(char *hostname, int port) if (hostname) /* connect to specified server failed */ return FALSE; - printf("No rocksndiamonds server on localhost - starting up one ...\n"); + 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++) + for (i = 0; i < 6; i++) { Delay(500); /* wait 500 ms == 0.5 seconds */ close(sfd); @@ -192,6 +280,7 @@ boolean ConnectToServer(char *hostname, int port) /* when reaching this point, connect to newly started server has failed */ return FALSE; } +#endif /* defined(TARGET_SDL) */ void SendToServer_PlayerName(char *player_name) { @@ -223,22 +312,25 @@ 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 */ buffer[1] = OP_START_PLAYING; buffer[2] = (byte)(level_nr >> 8); buffer[3] = (byte)(level_nr & 0xff); - buffer[4] = (byte)(leveldir_nr >> 8); - buffer[5] = (byte)(leveldir_nr & 0xff); + buffer[4] = (byte)(dummy >> 8); + buffer[5] = (byte)(dummy & 0xff); buffer[6] = (unsigned char)((new_random_seed >> 24) & 0xff); buffer[7] = (unsigned char)((new_random_seed >> 16) & 0xff); buffer[8] = (unsigned char)((new_random_seed >> 8) & 0xff); buffer[9] = (unsigned char)((new_random_seed >> 0) & 0xff); - strcpy(&buffer[10], leveldir[leveldir_nr].name); + strcpy((char *)&buffer[10], leveldir_current->identifier); - SendBufferToServer(10 + strlen(leveldir[leveldir_nr].name)+1); + SendBufferToServer(10 + strlen(leveldir_current->identifier) + 1); } void SendToServer_PausePlaying() @@ -255,16 +347,17 @@ void SendToServer_ContinuePlaying() SendBufferToServer(2); } -void SendToServer_StopPlaying() +void SendToServer_StopPlaying(int cause_for_stopping) { buffer[1] = OP_STOP_PLAYING; + buffer[2] = cause_for_stopping; - SendBufferToServer(2); + SendBufferToServer(3); } void SendToServer_MovePlayer(byte player_action) { - buffer[1] = OP_MOVE_FIGURE; + buffer[1] = OP_MOVE_PLAYER; buffer[2] = player_action; SendBufferToServer(3); @@ -298,7 +391,7 @@ static void Handle_OP_YOUR_NUMBER() } if (first_player.nr > MAX_PLAYERS) - Error(ERR_EXIT, "sorry - no more than %d players", MAX_PLAYERS); + Error(ERR_EXIT, "sorry, more than %d players not allowed", MAX_PLAYERS); Error(ERR_NETWORK_CLIENT, "you get client # %d", new_client_nr); } @@ -342,11 +435,11 @@ static void Handle_OP_NUMBER_WANTED() } else if (old_client_nr == first_player.nr) /* failed -- local player? */ { - char *color[] = { "yellow", "red", "green", "blue" }; char request[100]; - sprintf(request, "Sorry ! %s player still exists ! You are %s player !", - color[index_nr_wanted], color[new_index_nr]); + sprintf(request, "Sorry! Player %d already exists! You are player %d!", + index_nr_wanted + 1, new_index_nr + 1); + Request(request, REQ_CONFIRM); Error(ERR_NETWORK_CLIENT, "cannot switch -- you keep client # %d", @@ -364,7 +457,7 @@ static void Handle_OP_PLAYER_NAME(unsigned int len) buffer[len] = 0; Error(ERR_NETWORK_CLIENT, "client %d calls itself \"%s\"", buffer[0], &buffer[2]); - strncpy(player->name, &buffer[2], MAX_PLAYER_NAME_LEN); + strncpy(player->name, (char *)&buffer[2], MAX_PLAYER_NAME_LEN); } static void Handle_OP_PLAYER_CONNECTED() @@ -376,7 +469,7 @@ static void Handle_OP_PLAYER_CONNECTED() printf("OP_PLAYER_CONNECTED: %d\n", new_client_nr); Error(ERR_NETWORK_CLIENT, "new client %d connected", new_client_nr); - for (player=&first_player; player; player=player->next) + for (player = &first_player; player; player = player->next) { if (player->nr == new_client_nr) Error(ERR_EXIT, "multiplayer server sent duplicate player id"); @@ -403,7 +496,7 @@ static void Handle_OP_PLAYER_DISCONNECTED() Error(ERR_NETWORK_CLIENT, "client %d (%s) disconnected", player_nr, getNetworkPlayerName(buffer[0])); - for (player=&first_player; player; player=player->next) + for (player = &first_player; player; player = player->next) if (player->next == player_disconnected) player->next = player_disconnected->next; free(player_disconnected); @@ -411,41 +504,39 @@ static void Handle_OP_PLAYER_DISCONNECTED() static void Handle_OP_START_PLAYING() { - int new_level_nr, new_leveldir_nr; - unsigned long new_random_seed; - unsigned char *new_leveldir_name; + LevelDirTree *new_leveldir; + int new_level_nr; + unsigned int new_random_seed; + char *new_leveldir_identifier; new_level_nr = (buffer[2] << 8) + buffer[3]; - new_leveldir_nr = (buffer[4] << 8) + buffer[5]; new_random_seed = (buffer[6] << 24) | (buffer[7] << 16) | (buffer[8] << 8) | (buffer[9]); - new_leveldir_name = &buffer[10]; + new_leveldir_identifier = (char *)&buffer[10]; + + new_leveldir = getTreeInfoFromIdentifier(leveldir_first, + new_leveldir_identifier); + if (new_leveldir == NULL) + { + Error(ERR_WARN, "no such level identifier: '%s'", new_leveldir_identifier); + + new_leveldir = leveldir_first; + Error(ERR_WARN, "using default level set: '%s'", new_leveldir->identifier); + } printf("OP_START_PLAYING: %d\n", buffer[0]); Error(ERR_NETWORK_CLIENT, - "client %d starts game [level %d from levedir %d (%s)]\n", - buffer[0], new_level_nr, new_leveldir_nr, new_leveldir_name); + "client %d starts game [level %d from level identifier '%s']\n", + buffer[0], new_level_nr, new_leveldir->identifier); - if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0) - Error(ERR_WARN, "no such level directory: '%s'",new_leveldir_name); - - leveldir_nr = new_leveldir_nr; + leveldir_current = new_leveldir; level_nr = new_level_nr; TapeErase(); LoadTape(level_nr); LoadLevel(level_nr); - if (setup.autorecord) - TapeStartRecording(); - - if (tape.recording) - tape.random_seed = new_random_seed; - - InitRND(new_random_seed); - - game_status = PLAYING; - InitGame(); + StartGameActions(FALSE, setup.autorecord, new_random_seed); } static void Handle_OP_PAUSE_PLAYING() @@ -468,14 +559,24 @@ static void Handle_OP_CONTINUE_PLAYING() static void Handle_OP_STOP_PLAYING() { - printf("OP_STOP_PLAYING: %d\n", buffer[0]); - Error(ERR_NETWORK_CLIENT, "client %d stops game", buffer[0]); + printf("OP_STOP_PLAYING: %d [%d]\n", buffer[0], buffer[2]); + Error(ERR_NETWORK_CLIENT, "client %d stops game [%d]", buffer[0], buffer[2]); + + if (game_status == GAME_MODE_PLAYING) + { + if (buffer[2] == NETWORK_STOP_BY_PLAYER) + Request("Network game stopped by player!", REQ_CONFIRM); + 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); + } - game_status = MAINMENU; + game_status = GAME_MODE_MAIN; DrawMainMenu(); } -static void Handle_OP_MOVE_FIGURE(unsigned int len) +static void Handle_OP_MOVE_PLAYER(unsigned int len) { int server_frame_counter; int i; @@ -486,16 +587,25 @@ static void Handle_OP_MOVE_FIGURE(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_EXIT, "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; + + return; } /* copy valid player actions */ - for (i=0; i= 4 && nread >= 4 + readbuffer[3]) { message_length = readbuffer[3]; @@ -516,7 +628,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(); @@ -558,8 +670,8 @@ static void HandleNetworkingMessages() Handle_OP_STOP_PLAYING(); break; - case OP_MOVE_FIGURE: - Handle_OP_MOVE_FIGURE(message_length); + case OP_MOVE_PLAYER: + Handle_OP_MOVE_PLAYER(message_length); break; case OP_BROADCAST_MESSAGE: @@ -570,41 +682,66 @@ static void HandleNetworkingMessages() } fflush(stdout); + + /* in case of internal error, stop network game */ + if (stop_network_game) + SendToServer_StopPlaying(NETWORK_STOP_BY_ERROR); } +/* TODO */ + void HandleNetworking() { +#if !defined(TARGET_SDL) static struct timeval tv = { 0, 0 }; fd_set rfds; +#endif int r = 0; - FD_ZERO(&rfds); - FD_SET(sfd, &rfds); - - r = select(sfd + 1, &rfds, NULL, NULL, &tv); + do + { +#if defined(TARGET_SDL) + if ((r = SDLNet_CheckSockets(rfds, 1)) < 0) + Error(ERR_EXIT, "HandleNetworking(): SDLNet_CheckSockets() failed"); - if (r < 0 && errno != EINTR) - Error(ERR_EXIT, "HandleNetworking(): select() failed"); +#else - if (r < 0) FD_ZERO(&rfds); + FD_SET(sfd, &rfds); - if (FD_ISSET(sfd, &rfds)) - { - int r; + r = select(sfd + 1, &rfds, NULL, NULL, &tv); - r = read(sfd, readbuffer + nread, MAX_BUFFER_SIZE - nread); + if (r < 0 && errno != EINTR) + Error(ERR_EXIT, "HandleNetworking(): select() failed"); if (r < 0) - Error(ERR_EXIT, "error reading from network server"); + 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, "connection to network server lost"); + if (r < 0) + Error(ERR_EXIT, "error reading from network server"); - nread += r; + if (r == 0) + Error(ERR_EXIT, "connection to network server lost"); - HandleNetworkingMessages(); + nread += r; + + HandleNetworkingMessages(); + } } + while (r > 0); } -#endif /* !MSDOS */ +#endif /* PLATFORM_UNIX */