X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fnetwork.c;h=2d4e0e64f542ae9de19ba38e1d6a2d47374eb531;hb=3d236f777bca55fef0f6b23122b6affd0f424249;hp=17ca60d1c637b2540a276d69b35a09d602a83242;hpb=2fe0fbc2a34fd4b50081f1829931dea3ca2c4c1c;p=rocksndiamonds.git diff --git a/src/network.c b/src/network.c index 17ca60d1..2d4e0e64 100644 --- a/src/network.c +++ b/src/network.c @@ -26,45 +26,15 @@ #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_NRWANTED 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 @@ -81,23 +51,16 @@ struct user me = NULL }; -/* server stuff */ +static char msgbuf[300]; -#define BUFLEN 4096 +/* server stuff */ int sfd; -unsigned char realbuf[512], readbuf[BUFLEN], writbuf[BUFLEN]; +unsigned char realbuf[512], readbuf[MAX_BUFFER_SIZE], writbuf[MAX_BUFFER_SIZE]; unsigned char *buf = realbuf + 4; int nread = 0, nwrite = 0; -/* like memcpy, but guaranteed to handle overlap when s <= t */ -void copydown(char *s, char *t, int n) -{ - for (; n; n--) - *(s++) = *(t++); -} - -void sysmsg(char *s) +static void sysmsg(char *s) { if (verbose) { @@ -106,13 +69,7 @@ void sysmsg(char *s) } } -void fatal(char *s) -{ - fprintf(stderr, "%s.\n", s); - exit(1); -} - -void *mmalloc(int n) +static void *mmalloc(int n) { void *r; @@ -122,7 +79,7 @@ void *mmalloc(int n) return r; } -void u_sleep(int i) +static void u_sleep(int i) { struct timeval tm; tm.tv_sec = i / 1000000; @@ -130,7 +87,7 @@ void u_sleep(int i) select(0, NULL, NULL, NULL, &tm); } -void flushbuf() +static void flushbuf() { if (nwrite) { @@ -139,17 +96,22 @@ void flushbuf() } } -void sendbuf(int len) +static 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) + if (nwrite + 4 + len >= MAX_BUFFER_SIZE) fatal("Internal error: send buffer overflow"); memcpy(writbuf + nwrite, realbuf, 4 + len); nwrite += 4 + len; + + + flushbuf(); + + } } @@ -181,42 +143,24 @@ char *get_user_name(unsigned char c) return("no name"); } -void startserver() +static void StartNetworkServer(int port) { - char *options[2]; - int n = 0; - - options[0] = options[1] = NULL; - if (verbose) - options[n++] = "-v"; - if (nospeedup) - options[n++] = "-nospeedup"; - switch (fork()) { case 0: - execlp( -#ifdef XTRISPATH - XTRISPATH "/rnd_server", -#else - "rnd_server", -#endif - "rnd_server", "-once", 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, serveronly); + + /* never reached */ + exit(0); + case -1: - fatal("fork() failed"); - + Error(ERR_RETURN, + "cannot create network server process - no network games"); + standalone = TRUE; + return; + default: + /* we are parent process -- resume normal operation */ return; } } @@ -257,7 +201,9 @@ BOOL ConnectToServer(char *host, int port) if (!host) { printf("No rocksndiamonds server on localhost - starting up one ...\n"); - startserver(); + + StartNetworkServer(port); + for (i=0; i<6; i++) { u_sleep(500000); @@ -283,7 +229,7 @@ void SendToServer_Nickname(char *nickname) { static char msgbuf[300]; - buf[1] = OP_NICK; + buf[1] = OP_NICKNAME; memcpy(&buf[2], nickname, strlen(nickname)); sendbuf(2 + strlen(nickname)); sprintf(msgbuf, "you set your nick to \"%s\"", nickname); @@ -292,273 +238,365 @@ void SendToServer_Nickname(char *nickname) void SendToServer_ProtocolVersion() { - buf[1] = OP_VERSION; + buf[1] = OP_PROTOCOL_VERSION; buf[2] = PROT_VERS_1; buf[3] = PROT_VERS_2; buf[4] = PROT_VERS_3; + sendbuf(5); } void SendToServer_NrWanted(int nr_wanted) { - buf[1] = OP_NRWANTED; + buf[1] = OP_NUMBER_WANTED; buf[2] = nr_wanted; + sendbuf(3); } void SendToServer_StartPlaying() { - buf[1] = OP_PLAY; + unsigned long new_random_seed = InitRND(NEW_RANDOMIZE); + + 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); - strcpy(&buf[6], leveldir[leveldir_nr].name); - sendbuf(strlen(leveldir[leveldir_nr].name)+1 + 6); + + 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); + + strcpy(&buf[10], leveldir[leveldir_nr].name); + + sendbuf(10 + strlen(leveldir[leveldir_nr].name)+1); +} + +void SendToServer_PausePlaying() +{ + buf[1] = OP_PAUSE_PLAYING; + + sendbuf(2); +} + +void SendToServer_ContinuePlaying() +{ + buf[1] = OP_CONTINUE_PLAYING; + + sendbuf(2); +} + +void SendToServer_StopPlaying() +{ + buf[1] = OP_STOP_PLAYING; + + sendbuf(2); } -void SendToServer_MovePlayer(byte player_action, unsigned long frame_nr) +void SendToServer_MovePlayer(byte player_action) { - buf[1] = OP_MOVE; + buf[1] = OP_MOVE_FIGURE; buf[2] = player_action; sendbuf(3); +} - /* - buf[3] = (byte)((frame_nr >> 24) & 0xff); - buf[4] = (byte)((frame_nr >> 16) & 0xff); - buf[5] = (byte)((frame_nr >> 8) & 0xff); - buf[6] = (byte)((frame_nr >> 0) & 0xff); +static void Handle_OP_BAD_PROTOCOL_VERSION() +{ + 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); +} - sendbuf(7); - */ +static void Handle_OP_YOUR_NUMBER() +{ + int new_client_nr = buf[2]; + int new_index_nr = new_client_nr - 1; - /* - printf("%d: %x, %x, %x, %x\n", frame_nr, buf[3], buf[4], buf[5], buf[6]); - */ + printf("OP_YOUR_NUMBER: %d\n", buf[0]); + me.nr = new_client_nr; + stored_player[new_index_nr] = *local_player; + local_player = &stored_player[new_index_nr]; + TestPlayer = new_index_nr; - flushbuf(); + if (me.nr > MAX_PLAYERS) + Error(ERR_EXIT, "sorry - no more than %d players", MAX_PLAYERS); + + sprintf(msgbuf, "you get client # %d", new_client_nr); + sysmsg(msgbuf); +} + +static void Handle_OP_NUMBER_WANTED() +{ + int client_nr_wanted = buf[2]; + int new_client_nr = buf[3]; + int new_index_nr = new_client_nr - 1; + + printf("OP_NUMBER_WANTED: %d\n", buf[0]); + + if (new_client_nr != client_nr_wanted) + { + char *color[] = { "yellow", "red", "green", "blue" }; + + sprintf(msgbuf, "Sorry ! You are %s player !", + color[new_index_nr]); + Request(msgbuf, REQ_CONFIRM); + + sprintf(msgbuf, "cannot switch -- you keep client # %d", + new_client_nr); + sysmsg(msgbuf); + } + else + { + if (me.nr != client_nr_wanted) + sprintf(msgbuf, "switching to client # %d", new_client_nr); + else + sprintf(msgbuf, "keeping client # %d", new_client_nr); + sysmsg(msgbuf); + me.nr = new_client_nr; + stored_player[new_index_nr] = *local_player; + local_player = &stored_player[new_index_nr]; + TestPlayer = new_index_nr; + } } -void handlemessages() +static void Handle_OP_NICKNAME(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); +} + +static void Handle_OP_PLAYER_CONNECTED() { - unsigned int len; struct user *u, *v = NULL; - static char msgbuf[300]; - while (nread >= 4 && nread >= 4 + readbuf[3]) + printf("OP_PLAYER_CONNECTED: %d\n", buf[0]); + sprintf(msgbuf, "new client %d connected", buf[0]); + sysmsg(msgbuf); + + for (u = &me; u; u = u->next) { - len = readbuf[3]; - if (readbuf[0] || readbuf[1] || readbuf[2]) - fatal("Wrong server line length"); + if (u->nr == buf[0]) + Error(ERR_EXIT, "multiplayer server sent duplicate player id"); + else + v = u; + } - memcpy(buf, &readbuf[4], len); - nread -= 4 + len; - copydown(readbuf, readbuf + 4 + len, nread); + v->next = u = mmalloc(sizeof(struct user)); + u->nr = buf[0]; + u->name[0] = '\0'; + u->next = NULL; +} - switch(buf[1]) - { - case OP_YOUARE: - { - int new_client_nr = buf[2]; - int new_index_nr = new_client_nr - 1; +static void Handle_OP_PLAYER_DISCONNECTED() +{ + struct user *u, *v; - printf("OP_YOUARE: %d\n", buf[0]); - me.nr = new_client_nr; + 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); - stored_player[new_index_nr] = *local_player; - local_player = &stored_player[new_index_nr]; + for (v = &me; v; v = v->next) + if (v->next == u) + v->next = u->next; + free(u); +} - TestPlayer = new_index_nr; +static void Handle_OP_START_PLAYING() +{ + int new_level_nr, new_leveldir_nr; + unsigned long new_random_seed; + unsigned char *new_leveldir_name; - if (me.nr > MAX_PLAYERS) - Error(ERR_EXIT, "sorry - no more than %d players", MAX_PLAYERS); + /* + if (game_status == PLAYING) + break; + */ - sprintf(msgbuf, "you get client # %d", new_client_nr); - sysmsg(msgbuf); + new_level_nr = (buf[2] << 8) + buf[3]; + new_leveldir_nr = (buf[4] << 8) + buf[5]; + new_random_seed = + (buf[6] << 24) | (buf[7] << 16) | (buf[8] << 8) | (buf[9]); + new_leveldir_name = &buf[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); - break; - } - case OP_NRWANTED: - { - int client_nr_wanted = buf[2]; - int new_client_nr = buf[3]; - int new_index_nr = new_client_nr - 1; + if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0) + Error(ERR_RETURN, "no such level directory: '%s'",new_leveldir_name); - printf("OP_NRWANTED: %d\n", buf[0]); + leveldir_nr = new_leveldir_nr; - if (new_client_nr != client_nr_wanted) - { - char *color[] = { "yellow", "red", "green", "blue" }; + local_player->leveldir_nr = leveldir_nr; + LoadPlayerInfo(PLAYER_LEVEL); + SavePlayerInfo(PLAYER_SETUP); - sprintf(msgbuf, "Sorry ! You are %s player !", - color[new_index_nr]); - Request(msgbuf, REQ_CONFIRM); + level_nr = new_level_nr; - sprintf(msgbuf, "cannot switch -- you keep client # %d", - new_client_nr); - sysmsg(msgbuf); - } - else - { - if (me.nr != client_nr_wanted) - sprintf(msgbuf, "switching to client # %d", new_client_nr); - else - sprintf(msgbuf, "keeping client # %d", new_client_nr); - sysmsg(msgbuf); + TapeErase(); + LoadLevelTape(level_nr); - me.nr = new_client_nr; + GetPlayerConfig(); + LoadLevel(level_nr); - stored_player[new_index_nr] = *local_player; - local_player = &stored_player[new_index_nr]; - TestPlayer = new_index_nr; - } - break; - } + if (autorecord_on) + TapeStartRecording(); - case OP_NEW: - printf("OP_NEW: %d\n", buf[0]); - sprintf(msgbuf, "new client %d connected", buf[0]); - sysmsg(msgbuf); - for (u = &me; u; u = u->next) - { - if (u->nr == buf[0]) - Error(ERR_EXIT, "multiplayer server sent duplicate player id"); - else - v = u; - } - v->next = u = mmalloc(sizeof(struct user)); - u->nr = buf[0]; - u->name[0] = '\0'; - u->next = NULL; + if (tape.recording) + tape.random_seed = new_random_seed; - break; + InitRND(new_random_seed); - 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); + /* + printf("tape.random_seed == %d\n", tape.random_seed); + */ - break; + game_status = PLAYING; + InitGame(); +} - 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); - break; +static void Handle_OP_PAUSE_PLAYING() +{ + printf("OP_PAUSE_PLAYING: %d\n", buf[0]); + sprintf(msgbuf, "client %d pauses game", buf[0]); + sysmsg(msgbuf); - 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); + tape.pausing = TRUE; + DrawVideoDisplay(VIDEO_STATE_PAUSE_ON,0); +} + +static void Handle_OP_CONTINUE_PLAYING() +{ + printf("OP_CONTINUE_PLAYING: %d\n", buf[0]); + sprintf(msgbuf, "client %d continues game", buf[0]); + sysmsg(msgbuf); + + tape.pausing = FALSE; + DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0); +} - if (strcmp(leveldir[(buf[4] << 8) + buf[5]].name, &buf[6]) == 0) - { - leveldir_nr = (buf[4] << 8) + buf[5]; +static void Handle_OP_STOP_PLAYING() +{ + printf("OP_STOP_PLAYING: %d\n", buf[0]); + sprintf(msgbuf, "client %d stops game", buf[0]); + sysmsg(msgbuf); +} - local_player->leveldir_nr = leveldir_nr; - LoadPlayerInfo(PLAYER_LEVEL); - SavePlayerInfo(PLAYER_SETUP); +static void Handle_OP_MOVE_FIGURE() +{ + int frame_nr; + int i; - level_nr = (buf[2] << 8) + buf[3]; + frame_nr = + (buf[2] << 24) | (buf[3] << 16) | (buf[4] << 8) | (buf[5]); - TapeErase(); - LoadLevelTape(level_nr); + if (frame_nr != 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"); + } - GetPlayerConfig(); - LoadLevel(level_nr); + for (i=0; i= 4 && nread >= 4 + readbuf[3]) + { + len = readbuf[3]; + if (readbuf[0] || readbuf[1] || readbuf[2]) + fatal("Wrong server line length"); - frame_nr = - (buf[2] << 24) | (buf[3] << 16) | (buf[4] << 8) | (buf[5]); + memcpy(buf, &readbuf[4], len); + nread -= 4 + len; + copydown(readbuf, readbuf + 4 + len, nread); - for (i=0; i