X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fnetwork.c;h=5d137f0598f3514e1c824c6e40664055cd6a6070;hp=14ea8656fbc75a882e95ae6e21f771f9379b6ae9;hb=3ae3dff29ac1a6022b1e5af414ba2c99391148c8;hpb=57562a0f29074feea1dc01ddf1b1d5e4e6d59730 diff --git a/src/network.c b/src/network.c index 14ea8656..5d137f05 100644 --- a/src/network.c +++ b/src/network.c @@ -11,11 +11,10 @@ * network.c * ***********************************************************/ -#include -#include +#ifndef MSDOS + #include #include -#include #include #include #include @@ -23,456 +22,549 @@ #include #include #include -#include #include "network.h" +#include "netserv.h" #include "game.h" #include "tape.h" #include "files.h" +#include "tools.h" +#include "buttons.h" +#include "screens.h" #include "misc.h" -int norestart = 0; -int nospeedup = 0; - -#define DEFAULTPORT 19503 - -#define PROT_VERS_1 1 -#define PROT_VERS_2 0 -#define PROT_VERS_3 1 - -#define OP_NICK 1 -#define OP_PLAY 2 -#define OP_MOVE 3 -#define OP_DRAW 4 -#define OP_LOST 5 -#define OP_GONE 6 -#define OP_CLEAR 7 -#define OP_NEW 8 -#define OP_LINES 9 -#define OP_GROW 10 -#define OP_MODE 11 -#define OP_LEVEL 12 -#define OP_BOT 13 -#define OP_KILL 14 -#define OP_PAUSE 15 -#define OP_CONT 16 -#define OP_VERSION 17 -#define OP_BADVERS 18 -#define OP_MSG 19 -#define OP_YOUARE 20 -#define OP_LINESTO 21 -#define OP_WON 22 -#define OP_ZERO 23 - -#define MAXNICKLEN 14 - -struct user +#define MAX_PLAYER_NAME_LEN 14 + +struct NetworkClientPlayerInfo { byte nr; - char name[MAXNICKLEN+2]; - struct user *next; + char name[MAX_PLAYER_NAME_LEN + 2]; + struct NetworkClientPlayerInfo *next; }; -struct user me = +static struct NetworkClientPlayerInfo first_player = { 0, - "no name", + EMPTY_PLAYER_NAME, NULL }; /* server stuff */ -#define BUFLEN 4096 - -int sfd; -unsigned char realbuf[512], readbuf[BUFLEN], writbuf[BUFLEN]; -unsigned char *buf = realbuf + 4; -int nread = 0, nwrite = 0; +static int sfd; +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; -/* like memcpy, but guaranteed to handle overlap when s <= t */ -void copydown(char *s, char *t, int n) +static void SendBufferToServer(int size) { - for (; n; n--) - *(s++) = *(t++); -} + if (!options.network) + return; -void sysmsg(char *s) -{ - printf("** %s\n", s); - fflush(stdout); -} + realbuffer[0] = realbuffer[1] = realbuffer[2] = 0; + realbuffer[3] = (byte)size; + buffer[0] = 0; -void fatal(char *s) -{ - fprintf(stderr, "%s.\n", s); - exit(1); -} + if (nwrite + 4 + size >= MAX_BUFFER_SIZE) + Error(ERR_EXIT, "internal error: network send buffer overflow"); -void *mmalloc(int n) -{ - void *r; + memcpy(writbuffer + nwrite, realbuffer, 4 + size); + nwrite += 4 + size; - r = malloc(n); - if (r == NULL) - fatal("Out of memory"); - return r; + /* directly send the buffer to the network server */ + write(sfd, writbuffer, nwrite); + nwrite = 0; } -void u_sleep(int i) +struct NetworkClientPlayerInfo *getNetworkPlayer(int player_nr) { - struct timeval tm; - tm.tv_sec = i / 1000000; - tm.tv_usec = i % 1000000; - select(0, NULL, NULL, NULL, &tm); -} + struct NetworkClientPlayerInfo *player = NULL; -void flushbuf() -{ - if (nwrite) - { - write(sfd, writbuf, nwrite); - nwrite = 0; - } -} + for (player = &first_player; player; player = player->next) + if (player->nr == player_nr) + break; -void sendbuf(int len) -{ - if (!standalone) - { - realbuf[0] = realbuf[1] = realbuf[2] = 0; - realbuf[3] = (unsigned char)len; - buf[0] = 0; - if (nwrite + 4 + len >= BUFLEN) - fatal("Internal error: send buffer overflow"); - memcpy(writbuf + nwrite, realbuf, 4 + len); - nwrite += 4 + len; - } -} + 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 && player->name && strlen(player->name)) + return(player->name); - return("no name"); + return(EMPTY_PLAYER_NAME); } -void startserver() +static void StartNetworkServer(int port) { - char *options[2]; - int n = 0; - - options[0] = options[1] = NULL; - if (norestart) - options[n++] = "-norestart"; - if (nospeedup) - options[n++] = "-nospeedup"; - switch (fork()) { case 0: - execlp( -#ifdef XTRISPATH - XTRISPATH "/rnd_server", -#else - "rnd_server", -#endif - "rnd_server", "-once", "-v", options[0], options[1], NULL); - - fprintf(stderr, "Can't start server '%s'.\n", -#ifdef XTRISPATH - XTRISPATH "/rnd_server" -#else - "rnd_server" -#endif - ); - - _exit(1); - + NetworkServer(port, options.serveronly); + + /* never reached */ + exit(0); + case -1: - fatal("fork() failed"); - + Error(ERR_WARN, + "cannot create network server process - no network playing"); + options.network = FALSE; + return; + default: + /* we are parent process -- resume normal operation */ return; } } -BOOL ConnectToServer(char *host, int port) +boolean ConnectToServer(char *hostname, int port) { - struct hostent *hp; struct sockaddr_in s; struct protoent *tcpproto; int on = 1, i; - if (host) + if (hostname) { - if ((s.sin_addr.s_addr = inet_addr(host)) == -1) + if ((s.sin_addr.s_addr = inet_addr(hostname)) == -1) { - hp = gethostbyname(host); - if (!hp) - fatal("Host not found"); - s.sin_addr = *(struct in_addr *)(hp->h_addr_list[0]); + 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"); + s.sin_addr.s_addr = inet_addr("127.0.0.1"); /* localhost */ if (port == 0) - port = DEFAULTPORT; + port = DEFAULT_SERVER_PORT; 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"); + 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) + 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++) { - if (!host) - { - printf("No rocksndiamonds server on localhost - starting up one ...\n"); - startserver(); - 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"); - } - else - fatal("Can't connect to server"); + 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; } - 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_NICK; - 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_VERSION; - buf[2] = PROT_VERS_1; - buf[3] = PROT_VERS_2; - buf[4] = PROT_VERS_3; - sendbuf(5); + buffer[1] = OP_PROTOCOL_VERSION; + buffer[2] = PROTOCOL_VERSION_1; + buffer[3] = PROTOCOL_VERSION_2; + buffer[4] = PROTOCOL_VERSION_3; + + SendBufferToServer(5); +} + +void SendToServer_NrWanted(int nr_wanted) +{ + buffer[1] = OP_NUMBER_WANTED; + buffer[2] = nr_wanted; + + SendBufferToServer(3); } void SendToServer_StartPlaying() { - buf[1] = OP_PLAY; - buf[2] = (unsigned char)(level_nr / 256); - buf[3] = (unsigned char)(level_nr % 256); - buf[4] = (unsigned char)(leveldir_nr / 256); - buf[5] = (unsigned char)(leveldir_nr % 256); - strcpy(&buf[6], leveldir[leveldir_nr].name); - sendbuf(strlen(leveldir[leveldir_nr].name)+1 + 6); + unsigned long new_random_seed = InitRND(NEW_RANDOMIZE); + + 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[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((char *)&buffer[10], leveldir[leveldir_nr].name); + + SendBufferToServer(10 + strlen(leveldir[leveldir_nr].name)+1); +} + +void SendToServer_PausePlaying() +{ + buffer[1] = OP_PAUSE_PLAYING; + + SendBufferToServer(2); +} + +void SendToServer_ContinuePlaying() +{ + buffer[1] = OP_CONTINUE_PLAYING; + + SendBufferToServer(2); +} + +void SendToServer_StopPlaying() +{ + buffer[1] = OP_STOP_PLAYING; + + SendBufferToServer(2); } void SendToServer_MovePlayer(byte player_action) { - buf[1] = OP_MOVE; - buf[2] = player_action; - sendbuf(3); + buffer[1] = OP_MOVE_FIGURE; + buffer[2] = player_action; + + SendBufferToServer(3); +} + +static void Handle_OP_BAD_PROTOCOL_VERSION() +{ + Error(ERR_WARN, "protocol version mismatch"); + Error(ERR_EXIT, "server expects %d.%d.x instead of %d.%d.%d", + buffer[2], buffer[3], + PROTOCOL_VERSION_1, PROTOCOL_VERSION_2, PROTOCOL_VERSION_3); } -void handlemessages() +static void Handle_OP_YOUR_NUMBER() { - unsigned int len; - struct user *u, *v = NULL; - static char msgbuf[300]; + 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]; - while (nread >= 4 && nread >= 4 + readbuf[3]) + printf("OP_YOUR_NUMBER: %d\n", buffer[0]); + first_player.nr = new_client_nr; + + if (old_local_player != new_local_player) { - len = readbuf[3]; - if (readbuf[0] || readbuf[1] || readbuf[2]) - fatal("Wrong server line length"); + /* copy existing player settings and change to new player */ - memcpy(buf, &readbuf[4], len); - nread -= 4 + len; - copydown(readbuf, readbuf + 4 + len, nread); + *new_local_player = *old_local_player; + old_local_player->connected = FALSE; + local_player = new_local_player; + } - switch(buf[1]) + if (first_player.nr > MAX_PLAYERS) + Error(ERR_EXIT, "sorry - no more than %d players", MAX_PLAYERS); + + Error(ERR_NETWORK_CLIENT, "you get client # %d", new_client_nr); +} + +static void Handle_OP_NUMBER_WANTED() +{ + 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", buffer[0]); + + if (new_client_nr == client_nr_wanted) /* switching succeeded */ + { + struct NetworkClientPlayerInfo *player; + + if (old_client_nr != client_nr_wanted) /* client's nr has changed */ + 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) { - case OP_YOUARE: - printf("OP_YOUARE: %d\n", buf[0]); - me.nr = buf[0]; + /* copy existing player settings and change to new player */ - TestPlayer = buf[0] - 1; + *new_player = *old_player; + old_player->connected = FALSE; + } - break; + player = getNetworkPlayer(old_client_nr); + player->nr = new_client_nr; - case OP_NEW: - printf("OP_NEW: %d\n", buf[0]); - sprintf(msgbuf, "new client %d connected", buf[0]); - sysmsg(msgbuf); + if (old_player == local_player) /* local player switched */ + local_player = new_player; + } + else if (old_client_nr == first_player.nr) /* failed -- local player? */ + { + char *color[] = { "yellow", "red", "green", "blue" }; + char request[100]; - for (u = &me; u; u = u->next) - { - if (u->nr == buf[0]) - Error(ERR_EXIT, "multiplayer server sent duplicate player id"); - else - v = u; - } + sprintf(request, "Sorry ! %s player still exists ! You are %s player !", + color[index_nr_wanted], color[new_index_nr]); + Request(request, REQ_CONFIRM); - v->next = u = mmalloc(sizeof(struct user)); - u->nr = buf[0]; - u->name[0] = '\0'; - u->next = NULL; + Error(ERR_NETWORK_CLIENT, "cannot switch -- you keep client # %d", + new_client_nr); + } +} - break; +static void Handle_OP_PLAYER_NAME(unsigned int len) +{ + 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); +} - case OP_NICK: - printf("OP_NICK: %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); - break; - - case OP_GONE: - printf("OP_GONE: %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); +static void Handle_OP_PLAYER_CONNECTED() +{ + 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); + Error(ERR_NETWORK_CLIENT, "new client %d connected", new_client_nr); + + for (player=&first_player; player; player=player->next) + { + if (player->nr == new_client_nr) + Error(ERR_EXIT, "multiplayer server sent duplicate player id"); + + last_player = player; + } + + 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 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; + char *new_leveldir_name; + + 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 = (char *)&buffer[10]; + + 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); + + 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; + 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(); +} + +static void Handle_OP_PAUSE_PLAYING() +{ + 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); +} + +static void Handle_OP_CONTINUE_PLAYING() +{ + 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); +} + +static void Handle_OP_STOP_PLAYING() +{ + printf("OP_STOP_PLAYING: %d\n", buffer[0]); + Error(ERR_NETWORK_CLIENT, "client %d stops game", buffer[0]); + + game_status = MAINMENU; + DrawMainMenu(); +} + +static void Handle_OP_MOVE_FIGURE(unsigned int len) +{ + int server_frame_counter; + int i; + + if (!network_playing) + return; + + server_frame_counter = + (buffer[2] << 24) | (buffer[3] << 16) | (buffer[4] << 8) | (buffer[5]); + + 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"); + } + + /* copy valid player actions */ + for (i=0; i= 4 && nread >= 4 + readbuffer[3]) + { + message_length = readbuffer[3]; + if (readbuffer[0] || readbuffer[1] || readbuffer[2]) + Error(ERR_EXIT, "wrong network server line length"); + memcpy(buffer, &readbuffer[4], message_length); + nread -= 4 + message_length; + memmove(readbuffer, readbuffer + 4 + message_length, nread); + + switch(buffer[1]) + { + case OP_BAD_PROTOCOL_VERSION: + Handle_OP_BAD_PROTOCOL_VERSION(); break; - case OP_BADVERS: - Error(ERR_RETURN, "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); + case OP_YOUR_NUMBER: + Handle_OP_YOUR_NUMBER(); break; - case OP_PLAY: - printf("OP_PLAY: %d\n", buf[0]); - sprintf(msgbuf, "client %d starts game [level %d from levedir %d (%s)]\n", - buf[0], - (buf[2] << 8) + buf[3], - (buf[4] << 8) + buf[5], - &buf[6]); - sysmsg(msgbuf); - - if (strcmp(leveldir[(buf[4] << 8) + buf[5]].name, &buf[6]) == 0) - { - leveldir_nr = (buf[4] << 8) + buf[5]; - - local_player->leveldir_nr = leveldir_nr; - LoadPlayerInfo(PLAYER_LEVEL); - SavePlayerInfo(PLAYER_SETUP); - - level_nr = (buf[2] << 8) + buf[3]; - - TapeErase(); - LoadLevelTape(level_nr); - - GetPlayerConfig(); - LoadLevel(level_nr); - - { - if (autorecord_on) - TapeStartRecording(); - - game_status = PLAYING; - InitGame(); - } - } - else - { - Error(ERR_RETURN, "no such level directory: '%s'", &buf[6]); - } + case OP_NUMBER_WANTED: + Handle_OP_NUMBER_WANTED(); break; - case OP_MOVE: - if (buf[2]) - { - printf("OP_MOVE: %d\n", buf[0]); - sprintf(msgbuf, "client %d moves player [0x%02x]", buf[0], buf[2]); - sysmsg(msgbuf); - } + case OP_PLAYER_NAME: + Handle_OP_PLAYER_NAME(message_length); break; - case OP_PAUSE: - printf("OP_PAUSE: %d\n", buf[0]); - sprintf(msgbuf, "client %d pauses game", buf[0]); - sysmsg(msgbuf); + case OP_PLAYER_CONNECTED: + Handle_OP_PLAYER_CONNECTED(); + break; + + case OP_PLAYER_DISCONNECTED: + Handle_OP_PLAYER_DISCONNECTED(); break; - case OP_CONT: - printf("OP_CONT: %d\n", buf[0]); - sprintf(msgbuf, "client %d continues game", buf[0]); - sysmsg(msgbuf); + case OP_START_PLAYING: + Handle_OP_START_PLAYING(); break; - case OP_WON: - printf("OP_WON: %d\n", buf[0]); - sprintf(msgbuf, "client %d wins the game", buf[0]); - sysmsg(msgbuf); + case OP_PAUSE_PLAYING: + Handle_OP_PAUSE_PLAYING(); break; - case OP_ZERO: - printf("OP_ZERO: %d\n", buf[0]); - sprintf(msgbuf, "client %d resets game counters", buf[0]); - sysmsg(msgbuf); + case OP_CONTINUE_PLAYING: + Handle_OP_CONTINUE_PLAYING(); break; - case OP_MSG: - printf("OP_MSG: %d\n", buf[0]); - sprintf(msgbuf, "client %d sends message", buf[0]); + case OP_STOP_PLAYING: + Handle_OP_STOP_PLAYING(); break; - - case OP_LOST: - printf("OP_MSG: %d\n", buf[0]); - sprintf(msgbuf, "client %d has lost", buf[0]); + + case OP_MOVE_FIGURE: + Handle_OP_MOVE_FIGURE(message_length); 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; } } @@ -486,21 +578,13 @@ void HandleNetworking() fd_set rfds; int r = 0; - if (standalone) - return; - - flushbuf(); - FD_ZERO(&rfds); FD_SET(sfd, &rfds); r = select(sfd + 1, &rfds, NULL, NULL, &tv); if (r < 0 && errno != EINTR) - { - perror("select"); - fatal("fatal: select() failed"); - } + Error(ERR_EXIT, "HandleNetworking(): select() failed"); if (r < 0) FD_ZERO(&rfds); @@ -509,14 +593,18 @@ void HandleNetworking() { int r; - r = read(sfd, readbuf + nread, BUFLEN - nread); + r = read(sfd, readbuffer + nread, MAX_BUFFER_SIZE - nread); if (r < 0) - fatal("Error reading from server"); + Error(ERR_EXIT, "error reading from network server"); + if (r == 0) - fatal("Connection to server lost"); + Error(ERR_EXIT, "connection to network server lost"); + nread += r; - handlemessages(); + HandleNetworkingMessages(); } } + +#endif /* !MSDOS */