X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fnetwork.c;h=890f405f91662423040114fc731f1db90c322af7;hb=ab0879a8bcb3e816912bc89b8e21c22cc2a4c0c2;hp=bb4ea67e6237ceaeed0ef3eb1322b4b4b45386d9;hpb=1cacebfb41c20889c904155001a5b88ace962348;p=rocksndiamonds.git diff --git a/src/network.c b/src/network.c index bb4ea67e..890f405f 100644 --- a/src/network.c +++ b/src/network.c @@ -31,6 +31,8 @@ #include "tape.h" #include "files.h" #include "tools.h" +#include "buttons.h" +#include "screens.h" #include "misc.h" #define MAXNICKLEN 14 @@ -49,6 +51,8 @@ struct user me = NULL }; +static char msgbuf[300]; + /* server stuff */ int sfd; @@ -56,26 +60,16 @@ unsigned char realbuf[512], readbuf[MAX_BUFFER_SIZE], writbuf[MAX_BUFFER_SIZE]; unsigned char *buf = realbuf + 4; int nread = 0, nwrite = 0; -void sysmsg(char *s) +static void sysmsg(char *s) { - if (verbose) + if (options.verbose) { printf("** %s\n", s); fflush(stdout); } } -void *mmalloc(int n) -{ - void *r; - - r = malloc(n); - if (r == NULL) - fatal("Out of memory"); - return r; -} - -void u_sleep(int i) +static void u_sleep(int i) { struct timeval tm; tm.tv_sec = i / 1000000; @@ -83,7 +77,7 @@ void u_sleep(int i) select(0, NULL, NULL, NULL, &tm); } -void flushbuf() +static void flushbuf() { if (nwrite) { @@ -92,15 +86,15 @@ void flushbuf() } } -void sendbuf(int len) +static void sendbuf(int len) { - if (!standalone) + if (options.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"); + Error(ERR_EXIT, "internal error: network send buffer overflow"); memcpy(writbuf + nwrite, realbuf, 4 + len); nwrite += 4 + len; @@ -119,7 +113,8 @@ struct user *finduser(unsigned char c) if (u->nr == c) return u; - fatal("Protocol error: reference to non-existing user"); + Error(ERR_EXIT, "protocol error: reference to non-existing user %d", c); + return NULL; /* so that gcc -Wall doesn't complain */ } @@ -139,20 +134,20 @@ char *get_user_name(unsigned char c) return("no name"); } -void InitNetworkServer(int port) +static void StartNetworkServer(int port) { switch (fork()) { case 0: - NetworkServer(port, !serveronly); + NetworkServer(port, options.serveronly); /* never reached */ exit(0); case -1: - Error(ERR_RETURN, + Error(ERR_WARN, "cannot create network server process - no network games"); - standalone = TRUE; + options.network = FALSE; return; default: @@ -161,7 +156,7 @@ void InitNetworkServer(int port) } } -BOOL ConnectToServer(char *host, int port) +boolean ConnectToServer(char *host, int port) { struct hostent *hp; struct sockaddr_in s; @@ -174,7 +169,8 @@ BOOL ConnectToServer(char *host, int port) { hp = gethostbyname(host); if (!hp) - fatal("Host not found"); + Error(ERR_EXIT, "cannot locate host '%s'", host); + s.sin_addr = *(struct in_addr *)(hp->h_addr_list[0]); } } @@ -186,9 +182,11 @@ BOOL ConnectToServer(char *host, int 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)); @@ -198,24 +196,28 @@ BOOL ConnectToServer(char *host, int port) { printf("No rocksndiamonds server on localhost - starting up one ...\n"); - InitNetworkServer(port); + 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)); + 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) break; } if (i==6) - fatal("Can't connect to server"); + Error(ERR_EXIT, "cannot connect to server"); } else - fatal("Can't connect to server"); + Error(ERR_EXIT, "cannot connect to server"); } return(TRUE); @@ -270,6 +272,27 @@ void SendToServer_StartPlaying() 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) { buf[1] = OP_MOVE_FIGURE; @@ -278,239 +301,355 @@ void SendToServer_MovePlayer(byte player_action) sendbuf(3); } -void handlemessages() +static void Handle_OP_BAD_PROTOCOL_VERSION() { - unsigned int len; - struct user *u, *v = NULL; - static char msgbuf[300]; + 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); +} - while (nread >= 4 && nread >= 4 + readbuf[3]) +static void Handle_OP_YOUR_NUMBER() +{ + int new_client_nr = buf[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; + + 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; - switch(buf[1]) + 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); + + sprintf(msgbuf, "you get client # %d", new_client_nr); + sysmsg(msgbuf); +} + +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 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]); + + if (new_client_nr == client_nr_wanted) /* switching succeeded */ + { + struct user *u; + + if (old_client_nr != client_nr_wanted) /* client's nr has changed */ { - case OP_YOUR_NUMBER: - { - int new_client_nr = buf[2]; - int new_index_nr = new_client_nr - 1; + 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); + } - printf("OP_YOUR_NUMBER: %d\n", buf[0]); - me.nr = new_client_nr; + if (old_client_nr != new_client_nr) + { + /* copy existing player settings and change to new player */ - stored_player[new_index_nr] = *local_player; - local_player = &stored_player[new_index_nr]; + *new_player = *old_player; + old_player->connected = FALSE; + } - TestPlayer = new_index_nr; + u = finduser(old_client_nr); + u->nr = new_client_nr; - if (me.nr > MAX_PLAYERS) - Error(ERR_EXIT, "sorry - no more than %d players", MAX_PLAYERS); + if (old_player == local_player) /* local player switched */ + local_player = new_player; - sprintf(msgbuf, "you get client # %d", new_client_nr); - sysmsg(msgbuf); - break; - } + TestPlayer = new_index_nr; + } + else if (old_client_nr == me.nr) /* failed -- local player? */ + { + char *color[] = { "yellow", "red", "green", "blue" }; - case OP_NUMBER_WANTED: - { - int client_nr_wanted = buf[2]; - int new_client_nr = buf[3]; - int new_index_nr = new_client_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); - printf("OP_NUMBER_WANTED: %d\n", buf[0]); + sprintf(msgbuf, "cannot switch -- you keep client # %d", + new_client_nr); + sysmsg(msgbuf); + } +} - if (new_client_nr != client_nr_wanted) - { - char *color[] = { "yellow", "red", "green", "blue" }; +static void Handle_OP_NICKNAME(unsigned int len) +{ + struct user *u; - sprintf(msgbuf, "Sorry ! You are %s player !", - color[new_index_nr]); - Request(msgbuf, REQ_CONFIRM); + 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); +} - 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); +static void Handle_OP_PLAYER_CONNECTED() +{ + struct user *u, *v = NULL; + int new_client_nr = buf[0]; + int new_index_nr = new_client_nr - 1; - me.nr = new_client_nr; + printf("OP_PLAYER_CONNECTED: %d\n", new_client_nr); + sprintf(msgbuf, "new client %d connected", new_client_nr); + sysmsg(msgbuf); - stored_player[new_index_nr] = *local_player; - local_player = &stored_player[new_index_nr]; + for (u = &me; u; u = u->next) + { + if (u->nr == new_client_nr) + Error(ERR_EXIT, "multiplayer server sent duplicate player id"); + else + v = u; + } - TestPlayer = new_index_nr; - } + v->next = u = checked_malloc(sizeof(struct user)); + u->nr = new_client_nr; + u->name[0] = '\0'; + u->next = NULL; - break; - } + stored_player[new_index_nr].connected = TRUE; +} - case OP_PLAYER_CONNECTED: - printf("OP_PLAYER_CONNECTED: %d\n", buf[0]); - sprintf(msgbuf, "new client %d connected", buf[0]); - sysmsg(msgbuf); +static void Handle_OP_PLAYER_DISCONNECTED() +{ + struct user *u, *v; - for (u = &me; u; u = u->next) - { - if (u->nr == buf[0]) - Error(ERR_EXIT, "multiplayer server sent duplicate player id"); - else - v = u; - } + 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); - v->next = u = mmalloc(sizeof(struct user)); - u->nr = buf[0]; - u->name[0] = '\0'; - u->next = NULL; + for (v = &me; v; v = v->next) + if (v->next == u) + v->next = u->next; + free(u); +} - break; +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; + */ + + 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); - 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]); - 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); + if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0) + Error(ERR_WARN, "no such level directory: '%s'",new_leveldir_name); - break; + leveldir_nr = new_leveldir_nr; - 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; + /* + local_player->leveldir_nr = leveldir_nr; + */ - 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], - new_level_nr, - new_leveldir_nr, - new_leveldir_name); - sysmsg(msgbuf); + /* + SaveLevelSetup(); + */ + + /* + LoadPlayerInfo(PLAYER_LEVEL); + SavePlayerInfo(PLAYER_SETUP); + */ + + + level_nr = new_level_nr; + + TapeErase(); + LoadTape(level_nr); + + /* + GetPlayerConfig(); + */ + + LoadLevel(level_nr); + + + + if (setup.autorecord) + TapeStartRecording(); + + + + if (tape.recording) + tape.random_seed = new_random_seed; + InitRND(new_random_seed); - if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0) - Error(ERR_RETURN, "no such level directory: '%s'",new_leveldir_name); - leveldir_nr = new_leveldir_nr; + /* + printf("tape.random_seed == %d\n", tape.random_seed); + */ - local_player->leveldir_nr = leveldir_nr; - LoadPlayerInfo(PLAYER_LEVEL); - SavePlayerInfo(PLAYER_SETUP); + game_status = PLAYING; + InitGame(); +} + +static void Handle_OP_PAUSE_PLAYING() +{ + printf("OP_PAUSE_PLAYING: %d\n", buf[0]); + sprintf(msgbuf, "client %d pauses game", buf[0]); + 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); +} - level_nr = new_level_nr; +static void Handle_OP_STOP_PLAYING() +{ + printf("OP_STOP_PLAYING: %d\n", buf[0]); + sprintf(msgbuf, "client %d stops game", buf[0]); + sysmsg(msgbuf); - TapeErase(); - LoadLevelTape(level_nr); + game_status = MAINMENU; + DrawMainMenu(); +} - GetPlayerConfig(); - LoadLevel(level_nr); +static void Handle_OP_MOVE_FIGURE(unsigned int len) +{ + int frame_nr; + int i; - /* - if (autorecord_on) - TapeStartRecording(); - */ + if (!network_playing) + return; - if (tape.recording) - tape.random_seed = new_random_seed; + frame_nr = + (buf[2] << 24) | (buf[3] << 16) | (buf[4] << 8) | (buf[5]); - InitRND(new_random_seed); + 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"); + } + + /* copy valid player actions */ + for (i=0; i= 4 && nread >= 4 + readbuf[3]) + { + len = readbuf[3]; + if (readbuf[0] || readbuf[1] || readbuf[2]) + Error(ERR_EXIT, "wrong network server line length"); + + memcpy(buf, &readbuf[4], len); + nread -= 4 + len; + memmove(readbuf, readbuf + 4 + len, nread); + + switch(buf[1]) + { + case OP_BAD_PROTOCOL_VERSION: + Handle_OP_BAD_PROTOCOL_VERSION(); break; - } - case OP_MOVE_FIGURE: - { - int frame_nr; - int i; - - 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