X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fnetwork.c;h=56d6bc66226452bbdff72c886630fe425263f44b;hp=822b7ee02bdf8f85e14942463ba8540ccb1e4200;hb=5c6c42f1;hpb=2ae6ae8ed951e87fcba7c363705cd6ddea8de91c diff --git a/src/network.c b/src/network.c index 822b7ee0..56d6bc66 100644 --- a/src/network.c +++ b/src/network.c @@ -1,32 +1,24 @@ -/*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * -*----------------------------------------------------------* -* (c) 1995-2000 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/libgame.h" +#include "libgame/platform.h" -#if defined(PLATFORM_UNIX) +#if defined(NETWORK_AVALIABLE) #include #include -#include -#include -#include -#include -#include -#include - -#if 0 + +#include "main.h" + #include "libgame/libgame.h" -#endif #include "network.h" #include "netserv.h" @@ -52,11 +44,14 @@ static struct NetworkClientPlayerInfo first_player = /* server stuff */ -static int sfd; +static TCPsocket sfd; /* server socket */ +static SDLNet_SocketSet rfds; /* socket set */ + 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) { @@ -74,7 +69,7 @@ static void SendBufferToServer(int size) nwrite += 4 + size; /* directly send the buffer to the network server */ - write(sfd, writbuffer, nwrite); + SDLNet_TCP_Send(sfd, writbuffer, nwrite); nwrite = 0; } @@ -102,8 +97,8 @@ char *getNetworkPlayerName(int player_nr) else if (player_nr == first_player.nr) return("you"); else - for (player=&first_player; player; player=player->next) - if (player->nr == player_nr && player->name && strlen(player->name)) + for (player = &first_player; player; player = player->next) + if (player->nr == player_nr && strlen(player->name) > 0) return(player->name); return(EMPTY_PLAYER_NAME); @@ -111,83 +106,68 @@ char *getNetworkPlayerName(int player_nr) static void StartNetworkServer(int port) { - 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; - } + 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; } 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 */ + IPaddress ip; + int i; if (port == 0) port = DEFAULT_SERVER_PORT; - s.sin_port = htons(port); - s.sin_family = AF_INET; + rfds = SDLNet_AllocSocketSet(1); - sfd = socket(PF_INET, SOCK_STREAM, 0); - if (sfd < 0) - Error(ERR_EXIT, "out of file descriptors"); + 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); + } - if ((tcpproto = getprotobyname("tcp")) != NULL) - setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int)); + sfd = SDLNet_TCP_Open(&ip); - if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) == 0) /* connected */ + 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 */ + 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); - - 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)); + Delay(500); /* wait 500 ms == 0.5 seconds */ - if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) >= 0) /* connected */ + 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 */ @@ -224,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 */ @@ -240,9 +220,9 @@ void SendToServer_StartPlaying() buffer[8] = (unsigned char)((new_random_seed >> 8) & 0xff); buffer[9] = (unsigned char)((new_random_seed >> 0) & 0xff); - strcpy((char *)&buffer[10], leveldir_current->filename); + strcpy((char *)&buffer[10], leveldir_current->identifier); - SendBufferToServer(10 + strlen(leveldir_current->filename) + 1); + SendBufferToServer(10 + strlen(leveldir_current->identifier) + 1); } void SendToServer_PausePlaying() @@ -259,16 +239,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); @@ -302,7 +283,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); } @@ -346,11 +327,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", @@ -380,7 +361,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"); @@ -407,7 +388,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); @@ -415,31 +396,30 @@ static void Handle_OP_PLAYER_DISCONNECTED() static void Handle_OP_START_PLAYING() { - struct LevelDirInfo *new_leveldir; + LevelDirTree *new_leveldir; int new_level_nr; - int dummy; /* !!! HAS NO MEANING ANYMORE !!! */ - unsigned long new_random_seed; - char *new_leveldir_filename; + unsigned int new_random_seed; + char *new_leveldir_identifier; new_level_nr = (buffer[2] << 8) + buffer[3]; - dummy = (buffer[4] << 8) + buffer[5]; new_random_seed = (buffer[6] << 24) | (buffer[7] << 16) | (buffer[8] << 8) | (buffer[9]); - new_leveldir_filename = (char *)&buffer[10]; + new_leveldir_identifier = (char *)&buffer[10]; - new_leveldir = getLevelDirInfoFromFilename(new_leveldir_filename); + new_leveldir = getTreeInfoFromIdentifier(leveldir_first, + new_leveldir_identifier); if (new_leveldir == NULL) { - Error(ERR_WARN, "no such level directory: '%s'", new_leveldir_filename); + Error(ERR_WARN, "no such level identifier: '%s'", new_leveldir_identifier); new_leveldir = leveldir_first; - Error(ERR_WARN, "using default level directory: '%s'", new_leveldir->name); + 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 leveldir '%s']\n", - buffer[0], new_level_nr, new_leveldir->name); + "client %d starts game [level %d from level identifier '%s']\n", + buffer[0], new_level_nr, new_leveldir->identifier); leveldir_current = new_leveldir; level_nr = new_level_nr; @@ -448,16 +428,7 @@ static void Handle_OP_START_PLAYING() 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() @@ -480,14 +451,25 @@ 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); + } + + SetGameStatus(GAME_MODE_MAIN); - game_status = MAINMENU; 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; @@ -500,14 +482,18 @@ static void Handle_OP_MOVE_FIGURE(unsigned int len) 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]; @@ -528,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(); @@ -570,8 +558,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: @@ -582,41 +570,39 @@ 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() { - static struct timeval tv = { 0, 0 }; - fd_set rfds; int r = 0; - 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); - - if (FD_ISSET(sfd, &rfds)) + do { - int r; + if ((r = SDLNet_CheckSockets(rfds, 1)) < 0) + Error(ERR_EXIT, "HandleNetworking(): SDLNet_CheckSockets() failed"); - r = read(sfd, readbuffer + nread, MAX_BUFFER_SIZE - nread); + if (r > 0) + { + r = SDLNet_TCP_Recv(sfd, readbuffer + nread, 1); - if (r < 0) - Error(ERR_EXIT, "error reading from network server"); + if (r < 0) + Error(ERR_EXIT, "error reading from network server"); - if (r == 0) - Error(ERR_EXIT, "connection to network server lost"); + if (r == 0) + Error(ERR_EXIT, "connection to network server lost"); - nread += r; + nread += r; - HandleNetworkingMessages(); + HandleNetworkingMessages(); + } } + while (r > 0); } -#endif /* PLATFORM_UNIX */ +#endif /* NETWORK_AVALIABLE */