X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fnetwork.c;h=bb4ea67e6237ceaeed0ef3eb1322b4b4b45386d9;hb=1cacebfb41c20889c904155001a5b88ace962348;hp=17ca60d1c637b2540a276d69b35a09d602a83242;hpb=2fe0fbc2a34fd4b50081f1829931dea3ca2c4c1c;p=rocksndiamonds.git diff --git a/src/network.c b/src/network.c index 17ca60d1..bb4ea67e 100644 --- a/src/network.c +++ b/src/network.c @@ -26,45 +26,13 @@ #include #include "network.h" +#include "netserv.h" #include "game.h" #include "tape.h" #include "files.h" #include "tools.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 @@ -83,20 +51,11 @@ struct user me = /* server stuff */ -#define BUFLEN 4096 - 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) { if (verbose) @@ -106,12 +65,6 @@ void sysmsg(char *s) } } -void fatal(char *s) -{ - fprintf(stderr, "%s.\n", s); - exit(1); -} - void *mmalloc(int n) { void *r; @@ -146,10 +99,15 @@ void sendbuf(int len) 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 +139,24 @@ char *get_user_name(unsigned char c) return("no name"); } -void startserver() +void InitNetworkServer(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 +197,9 @@ BOOL ConnectToServer(char *host, int port) if (!host) { printf("No rocksndiamonds server on localhost - starting up one ...\n"); - startserver(); + + InitNetworkServer(port); + for (i=0; i<6; i++) { u_sleep(500000); @@ -283,7 +225,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,57 +234,48 @@ 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_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); - - sendbuf(7); - */ - - /* - printf("%d: %x, %x, %x, %x\n", frame_nr, buf[3], buf[4], buf[5], buf[6]); - */ - - - - flushbuf(); - - - } void handlemessages() @@ -363,12 +296,12 @@ void handlemessages() switch(buf[1]) { - case OP_YOUARE: + case OP_YOUR_NUMBER: { int new_client_nr = buf[2]; int new_index_nr = new_client_nr - 1; - printf("OP_YOUARE: %d\n", buf[0]); + printf("OP_YOUR_NUMBER: %d\n", buf[0]); me.nr = new_client_nr; stored_player[new_index_nr] = *local_player; @@ -385,13 +318,13 @@ void handlemessages() break; } - case OP_NRWANTED: + case 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_NRWANTED: %d\n", buf[0]); + printf("OP_NUMBER_WANTED: %d\n", buf[0]); if (new_client_nr != client_nr_wanted) { @@ -424,8 +357,8 @@ void handlemessages() break; } - case OP_NEW: - printf("OP_NEW: %d\n", buf[0]); + case OP_PLAYER_CONNECTED: + printf("OP_PLAYER_CONNECTED: %d\n", buf[0]); sprintf(msgbuf, "new client %d connected", buf[0]); sysmsg(msgbuf); @@ -444,8 +377,8 @@ void handlemessages() break; - case OP_NICK: - printf("OP_NICK: %d\n", buf[0]); + case OP_NICKNAME: + 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]); @@ -467,52 +400,77 @@ void handlemessages() break; - case OP_BADVERS: + case 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); break; - case OP_PLAY: - printf("OP_PLAY: %d\n", buf[0]); + case 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; + */ + + 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], - (buf[2] << 8) + buf[3], - (buf[4] << 8) + buf[5], - &buf[6]); + new_level_nr, + new_leveldir_nr, + new_leveldir_name); 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); + if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0) + Error(ERR_RETURN, "no such level directory: '%s'",new_leveldir_name); - level_nr = (buf[2] << 8) + buf[3]; + leveldir_nr = new_leveldir_nr; - TapeErase(); - LoadLevelTape(level_nr); + local_player->leveldir_nr = leveldir_nr; + LoadPlayerInfo(PLAYER_LEVEL); + SavePlayerInfo(PLAYER_SETUP); - GetPlayerConfig(); - LoadLevel(level_nr); + level_nr = new_level_nr; - { - if (autorecord_on) - TapeStartRecording(); + TapeErase(); + LoadLevelTape(level_nr); + + GetPlayerConfig(); + 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(); - game_status = PLAYING; - InitGame(); - } - } - else - { - Error(ERR_RETURN, "no such level directory: '%s'", &buf[6]); - } break; + } - case OP_MOVE: + case OP_MOVE_FIGURE: { int frame_nr; int i; @@ -520,27 +478,21 @@ void handlemessages() frame_nr = (buf[2] << 24) | (buf[3] << 16) | (buf[4] << 8) | (buf[5]); + 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"); + } + for (i=0; i