X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fnetwork.c;h=56d6bc66226452bbdff72c886630fe425263f44b;hp=126eb52351a7c2f916323a237ef9f3129735c0b0;hb=5c6c42f1;hpb=e7f36cd97c8580345714b4a22d6b4ad291e50ed6 diff --git a/src/network.c b/src/network.c index 126eb523..56d6bc66 100644 --- a/src/network.c +++ b/src/network.c @@ -1,29 +1,24 @@ -/*********************************************************** -* 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 * -***********************************************************/ - -#include -#include -#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 #include -#include -#include -#include -#include -#include -#include -#include + +#include "main.h" + +#include "libgame/libgame.h" #include "network.h" #include "netserv.h" @@ -31,294 +26,252 @@ #include "tape.h" #include "files.h" #include "tools.h" -#include "buttons.h" #include "screens.h" -#include "misc.h" - -#define MAXNICKLEN 14 -struct user +struct NetworkClientPlayerInfo { byte nr; - char name[MAXNICKLEN+2]; - struct user *next; + char name[MAX_PLAYER_NAME_LEN + 1]; + struct NetworkClientPlayerInfo *next; }; -struct user me = +static struct NetworkClientPlayerInfo first_player = { 0, - "no name", + EMPTY_PLAYER_NAME, NULL }; -static char msgbuf[300]; - /* server stuff */ -int sfd; -unsigned char realbuf[512], readbuf[MAX_BUFFER_SIZE], writbuf[MAX_BUFFER_SIZE]; -unsigned char *buf = realbuf + 4; -int nread = 0, nwrite = 0; +static TCPsocket sfd; /* server socket */ +static SDLNet_SocketSet rfds; /* socket set */ -static void sysmsg(char *s) -{ - if (verbose) - { - printf("** %s\n", s); - fflush(stdout); - } -} +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 *mmalloc(int n) +static void SendBufferToServer(int size) { - void *r; + if (!options.network) + return; - r = malloc(n); - if (r == NULL) - fatal("Out of memory"); - return r; -} + realbuffer[0] = realbuffer[1] = realbuffer[2] = 0; + realbuffer[3] = (byte)size; + buffer[0] = 0; -static void u_sleep(int i) -{ - struct timeval tm; - tm.tv_sec = i / 1000000; - tm.tv_usec = i % 1000000; - select(0, NULL, NULL, NULL, &tm); -} + if (nwrite + 4 + size >= MAX_BUFFER_SIZE) + Error(ERR_EXIT, "internal error: network send buffer overflow"); -static void flushbuf() -{ - if (nwrite) - { - write(sfd, writbuf, nwrite); - nwrite = 0; - } + memcpy(writbuffer + nwrite, realbuffer, 4 + size); + nwrite += 4 + size; + + /* directly send the buffer to the network server */ + SDLNet_TCP_Send(sfd, writbuffer, nwrite); + nwrite = 0; } -static void sendbuf(int len) +struct NetworkClientPlayerInfo *getNetworkPlayer(int player_nr) { - if (network) - { - realbuf[0] = realbuf[1] = realbuf[2] = 0; - realbuf[3] = (unsigned char)len; - buf[0] = 0; - if (nwrite + 4 + len >= MAX_BUFFER_SIZE) - fatal("Internal error: send buffer overflow"); - memcpy(writbuf + nwrite, realbuf, 4 + len); - nwrite += 4 + len; + struct NetworkClientPlayerInfo *player = NULL; + for (player = &first_player; player; player = player->next) + if (player->nr == player_nr) + break; - flushbuf(); + if (player == NULL) /* should not happen */ + Error(ERR_EXIT, "protocol error: reference to non-existing player %d", + player_nr); - - } -} - -struct user *finduser(unsigned char c) -{ - struct user *u; - - for (u = &me; u; u = u->next) - if (u->nr == c) - return u; - - fatal("Protocol error: reference to non-existing user"); - return NULL; /* so that gcc -Wall doesn't complain */ + return player; } -char *get_user_name(unsigned char c) +char *getNetworkPlayerName(int player_nr) { - struct user *u; + struct NetworkClientPlayerInfo *player; - if (c == 0) - return("the server"); - else if (c == me.nr) + if (player_nr == 0) + return("the network game server"); + else if (player_nr == first_player.nr) return("you"); else - for (u = &me; u; u = u->next) - if (u->nr == c && u->name && strlen(u->name)) - return(u->name); + for (player = &first_player; player; player = player->next) + if (player->nr == player_nr && strlen(player->name) > 0) + return(player->name); - return("no name"); + return(EMPTY_PLAYER_NAME); } static void StartNetworkServer(int port) { - switch (fork()) - { - case 0: - NetworkServer(port, serveronly); + static int p; - /* never reached */ - exit(0); + p = port; +#if defined(TARGET_SDL2) + server_thread = SDL_CreateThread(NetworkServerThread, + "NetworkServerThread", &p); +#else + server_thread = SDL_CreateThread(NetworkServerThread, &p); +#endif + network_server = TRUE; +} - case -1: - Error(ERR_RETURN, - "cannot create network server process - no network games"); - network = FALSE; - return; +boolean ConnectToServer(char *hostname, int port) +{ + IPaddress ip; + int i; - default: - /* we are parent process -- resume normal operation */ - return; + 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); } -} -BOOL ConnectToServer(char *host, int port) -{ - struct hostent *hp; - struct sockaddr_in s; - struct protoent *tcpproto; - int on = 1, i; + sfd = SDLNet_TCP_Open(&ip); - if (host) + if (sfd) { - if ((s.sin_addr.s_addr = inet_addr(host)) == -1) - { - hp = gethostbyname(host); - if (!hp) - fatal("Host not found"); - s.sin_addr = *(struct in_addr *)(hp->h_addr_list[0]); - } + SDLNet_TCP_AddSocket(rfds, sfd); + return TRUE; } else - s.sin_addr.s_addr = inet_addr("127.0.0.1"); + { + printf("SDLNet_TCP_Open(): %s\n", SDLNet_GetError()); + } - if (port == 0) - port = DEFAULTPORT; + if (hostname) /* connect to specified server failed */ + return FALSE; - s.sin_port = htons(port); - s.sin_family = AF_INET; - sfd = socket(PF_INET, SOCK_STREAM, 0); - if (sfd < 0) - fatal("Out of file descriptors"); - if ((tcpproto = getprotobyname("tcp")) != NULL) - setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int)); + printf("No rocksndiamonds server on localhost -- starting up one ...\n"); + StartNetworkServer(port); - if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) < 0) + /* wait for server to start up and try connecting several times */ + for (i = 0; i < 6; i++) { - if (!host) + Delay(500); /* wait 500 ms == 0.5 seconds */ + + if ((sfd = SDLNet_TCP_Open(&ip))) /* connected */ { - printf("No rocksndiamonds server on localhost - starting up one ...\n"); - - StartNetworkServer(port); - - for (i=0; i<6; i++) - { - u_sleep(500000); - close(sfd); - sfd = socket(PF_INET, SOCK_STREAM, 0); - if (sfd < 0) - fatal("Out of file descriptors"); - setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int)); - if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) >= 0) - break; - } - if (i==6) - fatal("Can't connect to server"); + SDLNet_TCP_AddSocket(rfds, sfd); + return TRUE; } - else - fatal("Can't connect to server"); } - return(TRUE); + /* when reaching this point, connect to newly started server has failed */ + return FALSE; } -void SendToServer_Nickname(char *nickname) +void SendToServer_PlayerName(char *player_name) { - static char msgbuf[300]; + int len_player_name = strlen(player_name); - buf[1] = OP_NICKNAME; - memcpy(&buf[2], nickname, strlen(nickname)); - sendbuf(2 + strlen(nickname)); - sprintf(msgbuf, "you set your nick to \"%s\"", nickname); - sysmsg(msgbuf); + buffer[1] = OP_PLAYER_NAME; + memcpy(&buffer[2], player_name, len_player_name); + SendBufferToServer(2 + len_player_name); + Error(ERR_NETWORK_CLIENT, "you set your player name to \"%s\"", player_name); } void SendToServer_ProtocolVersion() { - buf[1] = OP_PROTOCOL_VERSION; - buf[2] = PROT_VERS_1; - buf[3] = PROT_VERS_2; - buf[4] = PROT_VERS_3; + buffer[1] = OP_PROTOCOL_VERSION; + buffer[2] = PROTOCOL_VERSION_1; + buffer[3] = PROTOCOL_VERSION_2; + buffer[4] = PROTOCOL_VERSION_3; - sendbuf(5); + SendBufferToServer(5); } void SendToServer_NrWanted(int nr_wanted) { - buf[1] = OP_NUMBER_WANTED; - buf[2] = nr_wanted; + buffer[1] = OP_NUMBER_WANTED; + buffer[2] = nr_wanted; - sendbuf(3); + SendBufferToServer(3); } 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 */ - buf[1] = OP_START_PLAYING; - buf[2] = (byte)(level_nr >> 8); - buf[3] = (byte)(level_nr & 0xff); - buf[4] = (byte)(leveldir_nr >> 8); - buf[5] = (byte)(leveldir_nr & 0xff); + buffer[1] = OP_START_PLAYING; + buffer[2] = (byte)(level_nr >> 8); + buffer[3] = (byte)(level_nr & 0xff); + buffer[4] = (byte)(dummy >> 8); + buffer[5] = (byte)(dummy & 0xff); - buf[6] = (unsigned char)((new_random_seed >> 24) & 0xff); - buf[7] = (unsigned char)((new_random_seed >> 16) & 0xff); - buf[8] = (unsigned char)((new_random_seed >> 8) & 0xff); - buf[9] = (unsigned char)((new_random_seed >> 0) & 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(&buf[10], leveldir[leveldir_nr].name); + strcpy((char *)&buffer[10], leveldir_current->identifier); - sendbuf(10 + strlen(leveldir[leveldir_nr].name)+1); + SendBufferToServer(10 + strlen(leveldir_current->identifier) + 1); } void SendToServer_PausePlaying() { - buf[1] = OP_PAUSE_PLAYING; + buffer[1] = OP_PAUSE_PLAYING; - sendbuf(2); + SendBufferToServer(2); } void SendToServer_ContinuePlaying() { - buf[1] = OP_CONTINUE_PLAYING; + buffer[1] = OP_CONTINUE_PLAYING; - sendbuf(2); + SendBufferToServer(2); } -void SendToServer_StopPlaying() +void SendToServer_StopPlaying(int cause_for_stopping) { - buf[1] = OP_STOP_PLAYING; + buffer[1] = OP_STOP_PLAYING; + buffer[2] = cause_for_stopping; - sendbuf(2); + SendBufferToServer(3); } void SendToServer_MovePlayer(byte player_action) { - buf[1] = OP_MOVE_FIGURE; - buf[2] = player_action; + buffer[1] = OP_MOVE_PLAYER; + buffer[2] = player_action; - sendbuf(3); + SendBufferToServer(3); } static void Handle_OP_BAD_PROTOCOL_VERSION() { - Error(ERR_RETURN, "protocol version mismatch"); + Error(ERR_WARN, "protocol version mismatch"); Error(ERR_EXIT, "server expects %d.%d.x instead of %d.%d.%d", - buf[2], buf[3], PROT_VERS_1, PROT_VERS_2, PROT_VERS_3); + buffer[2], buffer[3], + PROTOCOL_VERSION_1, PROTOCOL_VERSION_2, PROTOCOL_VERSION_3); } static void Handle_OP_YOUR_NUMBER() { - int new_client_nr = buf[2]; + int new_client_nr = buffer[2]; int new_index_nr = new_client_nr - 1; struct PlayerInfo *old_local_player = local_player; struct PlayerInfo *new_local_player = &stored_player[new_index_nr]; - printf("OP_YOUR_NUMBER: %d\n", buf[0]); - me.nr = new_client_nr; + printf("OP_YOUR_NUMBER: %d\n", buffer[0]); + first_player.nr = new_client_nr; if (old_local_player != new_local_player) { @@ -326,48 +279,37 @@ static void Handle_OP_YOUR_NUMBER() *new_local_player = *old_local_player; old_local_player->connected = FALSE; - old_local_player->local = FALSE; - local_player = new_local_player; } - TestPlayer = new_index_nr; - - if (me.nr > MAX_PLAYERS) - Error(ERR_EXIT, "sorry - no more than %d players", MAX_PLAYERS); + if (first_player.nr > MAX_PLAYERS) + Error(ERR_EXIT, "sorry, more than %d players not allowed", MAX_PLAYERS); - sprintf(msgbuf, "you get client # %d", new_client_nr); - sysmsg(msgbuf); + Error(ERR_NETWORK_CLIENT, "you get client # %d", new_client_nr); } static void Handle_OP_NUMBER_WANTED() { - int client_nr_wanted = buf[2]; - int old_client_nr = buf[0]; - int new_client_nr = buf[3]; + int client_nr_wanted = buffer[2]; + int old_client_nr = buffer[0]; + int new_client_nr = buffer[3]; int old_index_nr = old_client_nr - 1; int new_index_nr = new_client_nr - 1; int index_nr_wanted = client_nr_wanted - 1; struct PlayerInfo *old_player = &stored_player[old_index_nr]; struct PlayerInfo *new_player = &stored_player[new_index_nr]; - printf("OP_NUMBER_WANTED: %d\n", buf[0]); + printf("OP_NUMBER_WANTED: %d\n", buffer[0]); if (new_client_nr == client_nr_wanted) /* switching succeeded */ { - struct user *u; + struct NetworkClientPlayerInfo *player; if (old_client_nr != client_nr_wanted) /* client's nr has changed */ - { - sprintf(msgbuf, "client %d switches to # %d", - old_client_nr, new_client_nr); - sysmsg(msgbuf); - } - else if (old_client_nr == me.nr) /* local player keeps his nr */ - { - sprintf(msgbuf, "keeping client # %d", new_client_nr); - sysmsg(msgbuf); - } + Error(ERR_NETWORK_CLIENT, "client %d switches to # %d", + old_client_nr, new_client_nr); + else if (old_client_nr == first_player.nr) /* local player keeps his nr */ + Error(ERR_NETWORK_CLIENT, "keeping client # %d", new_client_nr); if (old_client_nr != new_client_nr) { @@ -375,156 +317,124 @@ static void Handle_OP_NUMBER_WANTED() *new_player = *old_player; old_player->connected = FALSE; - old_player->local = FALSE; } - u = finduser(old_client_nr); - u->nr = new_client_nr; + player = getNetworkPlayer(old_client_nr); + player->nr = new_client_nr; - if (old_client_nr == local_player->client_nr) /* local player switched */ + if (old_player == local_player) /* local player switched */ local_player = new_player; - - - - TestPlayer = new_index_nr; } - else if (old_client_nr == me.nr) /* failed -- local player? */ + else if (old_client_nr == first_player.nr) /* failed -- local player? */ { - char *color[] = { "yellow", "red", "green", "blue" }; + char request[100]; + + sprintf(request, "Sorry! Player %d already exists! You are player %d!", + index_nr_wanted + 1, new_index_nr + 1); - sprintf(msgbuf, "Sorry ! %s player still exists ! You are %s player !", - color[index_nr_wanted], color[new_index_nr]); - Request(msgbuf, REQ_CONFIRM); + Request(request, REQ_CONFIRM); - sprintf(msgbuf, "cannot switch -- you keep client # %d", - new_client_nr); - sysmsg(msgbuf); + Error(ERR_NETWORK_CLIENT, "cannot switch -- you keep client # %d", + new_client_nr); } } -static void Handle_OP_NICKNAME(unsigned int len) +static void Handle_OP_PLAYER_NAME(unsigned int len) { - struct user *u; - - printf("OP_NICKNAME: %d\n", buf[0]); - u = finduser(buf[0]); - buf[len] = 0; - sprintf(msgbuf, "client %d calls itself \"%s\"", buf[0], &buf[2]); - sysmsg(msgbuf); - strncpy(u->name, &buf[2], MAXNICKLEN); + struct NetworkClientPlayerInfo *player; + int player_nr = (int)buffer[0]; + + printf("OP_PLAYER_NAME: %d\n", player_nr); + player = getNetworkPlayer(player_nr); + buffer[len] = 0; + Error(ERR_NETWORK_CLIENT, "client %d calls itself \"%s\"", + buffer[0], &buffer[2]); + strncpy(player->name, (char *)&buffer[2], MAX_PLAYER_NAME_LEN); } static void Handle_OP_PLAYER_CONNECTED() { - struct user *u, *v = NULL; - int new_client_nr = buf[0]; + struct NetworkClientPlayerInfo *player, *last_player = NULL; + int new_client_nr = (int)buffer[0]; int new_index_nr = new_client_nr - 1; printf("OP_PLAYER_CONNECTED: %d\n", new_client_nr); - sprintf(msgbuf, "new client %d connected", new_client_nr); - sysmsg(msgbuf); + Error(ERR_NETWORK_CLIENT, "new client %d connected", new_client_nr); - for (u = &me; u; u = u->next) + for (player = &first_player; player; player = player->next) { - if (u->nr == new_client_nr) + if (player->nr == new_client_nr) Error(ERR_EXIT, "multiplayer server sent duplicate player id"); - else - v = u; + + last_player = player; } - v->next = u = mmalloc(sizeof(struct user)); - u->nr = new_client_nr; - u->name[0] = '\0'; - u->next = NULL; + last_player->next = player = + checked_malloc(sizeof(struct NetworkClientPlayerInfo)); + player->nr = new_client_nr; + player->name[0] = '\0'; + player->next = NULL; stored_player[new_index_nr].connected = TRUE; } static void Handle_OP_PLAYER_DISCONNECTED() { - struct user *u, *v; - - printf("OP_PLAYER_DISCONNECTED: %d\n", buf[0]); - u = finduser(buf[0]); - sprintf(msgbuf, "client %d (%s) disconnected", - buf[0], get_user_name(buf[0])); - sysmsg(msgbuf); - - for (v = &me; v; v = v->next) - if (v->next == u) - v->next = u->next; - free(u); + struct NetworkClientPlayerInfo *player, *player_disconnected; + int player_nr = (int)buffer[0]; + + printf("OP_PLAYER_DISCONNECTED: %d\n", player_nr); + player_disconnected = getNetworkPlayer(player_nr); + Error(ERR_NETWORK_CLIENT, "client %d (%s) disconnected", + player_nr, getNetworkPlayerName(buffer[0])); + + for (player = &first_player; player; player = player->next) + if (player->next == player_disconnected) + player->next = player_disconnected->next; + free(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; - - /* - if (game_status == PLAYING) - break; - */ + LevelDirTree *new_leveldir; + int new_level_nr; + unsigned int new_random_seed; + char *new_leveldir_identifier; - new_level_nr = (buf[2] << 8) + buf[3]; - new_leveldir_nr = (buf[4] << 8) + buf[5]; + new_level_nr = (buffer[2] << 8) + buffer[3]; new_random_seed = - (buf[6] << 24) | (buf[7] << 16) | (buf[8] << 8) | (buf[9]); - new_leveldir_name = &buf[10]; + (buffer[6] << 24) | (buffer[7] << 16) | (buffer[8] << 8) | (buffer[9]); + new_leveldir_identifier = (char *)&buffer[10]; - printf("OP_START_PLAYING: %d\n", buf[0]); - sprintf(msgbuf, "client %d starts game [level %d from levedir %d (%s)]\n", - buf[0], - new_level_nr, - new_leveldir_nr, - new_leveldir_name); - sysmsg(msgbuf); - - - if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0) - Error(ERR_RETURN, "no such level directory: '%s'",new_leveldir_name); + new_leveldir = getTreeInfoFromIdentifier(leveldir_first, + new_leveldir_identifier); + if (new_leveldir == NULL) + { + Error(ERR_WARN, "no such level identifier: '%s'", new_leveldir_identifier); - leveldir_nr = new_leveldir_nr; + new_leveldir = leveldir_first; + Error(ERR_WARN, "using default level set: '%s'", new_leveldir->identifier); + } - local_player->leveldir_nr = leveldir_nr; - LoadPlayerInfo(PLAYER_LEVEL); - SavePlayerInfo(PLAYER_SETUP); + printf("OP_START_PLAYING: %d\n", buffer[0]); + Error(ERR_NETWORK_CLIENT, + "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; TapeErase(); - LoadLevelTape(level_nr); - - GetPlayerConfig(); + LoadTape(level_nr); LoadLevel(level_nr); - - - if (autorecord_on) - TapeStartRecording(); - - - - if (tape.recording) - tape.random_seed = new_random_seed; - - InitRND(new_random_seed); - - - /* - printf("tape.random_seed == %d\n", tape.random_seed); - */ - - game_status = PLAYING; - InitGame(); + StartGameActions(FALSE, setup.autorecord, new_random_seed); } static void Handle_OP_PAUSE_PLAYING() { - printf("OP_PAUSE_PLAYING: %d\n", buf[0]); - sprintf(msgbuf, "client %d pauses game", buf[0]); - sysmsg(msgbuf); + printf("OP_PAUSE_PLAYING: %d\n", buffer[0]); + Error(ERR_NETWORK_CLIENT, "client %d pauses game", buffer[0]); tape.pausing = TRUE; DrawVideoDisplay(VIDEO_STATE_PAUSE_ON,0); @@ -532,9 +442,8 @@ static void Handle_OP_PAUSE_PLAYING() static void Handle_OP_CONTINUE_PLAYING() { - printf("OP_CONTINUE_PLAYING: %d\n", buf[0]); - sprintf(msgbuf, "client %d continues game", buf[0]); - sysmsg(msgbuf); + printf("OP_CONTINUE_PLAYING: %d\n", buffer[0]); + Error(ERR_NETWORK_CLIENT, "client %d continues game", buffer[0]); tape.pausing = FALSE; DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0); @@ -542,62 +451,72 @@ static void Handle_OP_CONTINUE_PLAYING() static void Handle_OP_STOP_PLAYING() { - printf("OP_STOP_PLAYING: %d\n", buf[0]); - sprintf(msgbuf, "client %d stops game", buf[0]); - sysmsg(msgbuf); + 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 frame_nr; + int server_frame_counter; int i; if (!network_playing) return; - frame_nr = - (buf[2] << 24) | (buf[3] << 16) | (buf[4] << 8) | (buf[5]); + server_frame_counter = + (buffer[2] << 24) | (buffer[3] << 16) | (buffer[4] << 8) | (buffer[5]); - if (frame_nr != FrameCounter) + 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", frame_nr); - 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 + readbuf[3]) + stop_network_game = FALSE; + + while (nread >= 4 && nread >= 4 + readbuffer[3]) { - len = readbuf[3]; - if (readbuf[0] || readbuf[1] || readbuf[2]) - fatal("Wrong server line length"); + message_length = readbuffer[3]; + if (readbuffer[0] || readbuffer[1] || readbuffer[2]) + Error(ERR_EXIT, "wrong network server line length"); - memcpy(buf, &readbuf[4], len); - nread -= 4 + len; - copydown(readbuf, readbuf + 4 + len, nread); + memcpy(buffer, &readbuffer[4], message_length); + nread -= 4 + message_length; + memmove(readbuffer, readbuffer + 4 + message_length, nread); - switch(buf[1]) + switch (buffer[1]) { case OP_BAD_PROTOCOL_VERSION: Handle_OP_BAD_PROTOCOL_VERSION(); @@ -611,8 +530,8 @@ static void handlemessages() Handle_OP_NUMBER_WANTED(); break; - case OP_NICKNAME: - Handle_OP_NICKNAME(len); + case OP_PLAYER_NAME: + Handle_OP_PLAYER_NAME(message_length); break; case OP_PLAYER_CONNECTED: @@ -639,76 +558,51 @@ static void handlemessages() Handle_OP_STOP_PLAYING(); break; - case OP_MOVE_FIGURE: - Handle_OP_MOVE_FIGURE(len); - break; - - case OP_WON: - printf("OP_WON: %d\n", buf[0]); - sprintf(msgbuf, "client %d wins the game", buf[0]); - sysmsg(msgbuf); + case OP_MOVE_PLAYER: + Handle_OP_MOVE_PLAYER(message_length); break; - case OP_ZERO: - printf("OP_ZERO: %d\n", buf[0]); - sprintf(msgbuf, "client %d resets game counters", buf[0]); - sysmsg(msgbuf); - break; - - case OP_MSG: - printf("OP_MSG: %d\n", buf[0]); - sprintf(msgbuf, "client %d sends message", buf[0]); - break; - - case OP_LOST: - printf("OP_MSG: %d\n", buf[0]); - sprintf(msgbuf, "client %d has lost", buf[0]); - break; - - case OP_LEVEL: - printf("OP_MSG: %d\n", buf[0]); - sprintf(msgbuf, "client %d sets level to %d", buf[0], buf[2]); + case OP_BROADCAST_MESSAGE: + printf("OP_BROADCAST_MESSAGE: %d\n", buffer[0]); + Error(ERR_NETWORK_CLIENT, "client %d sends message", buffer[0]); break; } } 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; - flushbuf(); - - FD_ZERO(&rfds); - FD_SET(sfd, &rfds); - - r = select(sfd + 1, &rfds, NULL, NULL, &tv); - - if (r < 0 && errno != EINTR) + do { - perror("select"); - fatal("fatal: select() failed"); - } + if ((r = SDLNet_CheckSockets(rfds, 1)) < 0) + Error(ERR_EXIT, "HandleNetworking(): SDLNet_CheckSockets() failed"); - if (r < 0) - FD_ZERO(&rfds); + if (r > 0) + { + r = SDLNet_TCP_Recv(sfd, readbuffer + nread, 1); - if (FD_ISSET(sfd, &rfds)) - { - int r; + if (r < 0) + Error(ERR_EXIT, "error reading from network server"); - r = read(sfd, readbuf + nread, MAX_BUFFER_SIZE - nread); + if (r == 0) + Error(ERR_EXIT, "connection to network server lost"); - if (r < 0) - fatal("Error reading from server"); - if (r == 0) - fatal("Connection to server lost"); - nread += r; + nread += r; - handlemessages(); + HandleNetworkingMessages(); + } } + while (r > 0); } + +#endif /* NETWORK_AVALIABLE */