X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fnetwork.c;h=890f405f91662423040114fc731f1db90c322af7;hb=40a487dcc5d3028343ff9123a72b8b3839a42861;hp=82f406d61382f39df2fa06fc15870d5497a5e989;hpb=3836649c663e70e503686c52c67f71d21c00bb84;p=rocksndiamonds.git diff --git a/src/network.c b/src/network.c index 82f406d6..890f405f 100644 --- a/src/network.c +++ b/src/network.c @@ -62,23 +62,13 @@ int nread = 0, nwrite = 0; static void sysmsg(char *s) { - if (verbose) + if (options.verbose) { printf("** %s\n", s); fflush(stdout); } } -static void *mmalloc(int n) -{ - void *r; - - r = malloc(n); - if (r == NULL) - fatal("Out of memory"); - return r; -} - static void u_sleep(int i) { struct timeval tm; @@ -98,13 +88,13 @@ static void flushbuf() static void sendbuf(int len) { - if (network) + 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; @@ -123,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 */ } @@ -148,15 +139,15 @@ 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"); - network = FALSE; + options.network = FALSE; return; default: @@ -165,7 +156,7 @@ static void StartNetworkServer(int port) } } -BOOL ConnectToServer(char *host, int port) +boolean ConnectToServer(char *host, int port) { struct hostent *hp; struct sockaddr_in s; @@ -178,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]); } } @@ -190,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)); @@ -208,18 +202,22 @@ BOOL ConnectToServer(char *host, int port) { 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); @@ -305,7 +303,7 @@ void SendToServer_MovePlayer(byte player_action) 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); } @@ -314,12 +312,21 @@ 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; - stored_player[new_index_nr] = *local_player; - local_player = &stored_player[new_index_nr]; + if (old_local_player != new_local_player) + { + /* copy existing player settings and change to new player */ + + *new_local_player = *old_local_player; + old_local_player->connected = FALSE; + + local_player = new_local_player; + } TestPlayer = new_index_nr; @@ -333,38 +340,61 @@ static void Handle_OP_YOUR_NUMBER() 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) + if (new_client_nr == client_nr_wanted) /* switching succeeded */ + { + struct user *u; + + 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); + } + + if (old_client_nr != new_client_nr) + { + /* copy existing player settings and change to new player */ + + *new_player = *old_player; + old_player->connected = FALSE; + } + + u = finduser(old_client_nr); + u->nr = new_client_nr; + + 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? */ { char *color[] = { "yellow", "red", "green", "blue" }; - sprintf(msgbuf, "Sorry ! You are %s player !", - color[new_index_nr]); + sprintf(msgbuf, "Sorry ! %s player still exists ! You are %s player !", + color[index_nr_wanted], 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; - } } static void Handle_OP_NICKNAME(unsigned int len) @@ -382,23 +412,27 @@ static void Handle_OP_NICKNAME(unsigned int len) 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; - printf("OP_PLAYER_CONNECTED: %d\n", buf[0]); - sprintf(msgbuf, "new client %d connected", buf[0]); + printf("OP_PLAYER_CONNECTED: %d\n", new_client_nr); + sprintf(msgbuf, "new client %d connected", new_client_nr); sysmsg(msgbuf); for (u = &me; u; u = u->next) { - if (u->nr == buf[0]) + if (u->nr == new_client_nr) Error(ERR_EXIT, "multiplayer server sent duplicate player id"); else v = u; } - v->next = u = mmalloc(sizeof(struct user)); - u->nr = buf[0]; + v->next = u = checked_malloc(sizeof(struct user)); + u->nr = new_client_nr; u->name[0] = '\0'; u->next = NULL; + + stored_player[new_index_nr].connected = TRUE; } static void Handle_OP_PLAYER_DISCONNECTED() @@ -444,25 +478,39 @@ static void Handle_OP_START_PLAYING() if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0) - Error(ERR_RETURN, "no such level directory: '%s'",new_leveldir_name); + Error(ERR_WARN, "no such level directory: '%s'",new_leveldir_name); leveldir_nr = new_leveldir_nr; + /* local_player->leveldir_nr = leveldir_nr; + */ + + + /* + SaveLevelSetup(); + */ + + /* LoadPlayerInfo(PLAYER_LEVEL); SavePlayerInfo(PLAYER_SETUP); + */ + level_nr = new_level_nr; TapeErase(); - LoadLevelTape(level_nr); + LoadTape(level_nr); + /* GetPlayerConfig(); + */ + LoadLevel(level_nr); - if (autorecord_on) + if (setup.autorecord) TapeStartRecording(); @@ -511,7 +559,7 @@ static void Handle_OP_STOP_PLAYING() DrawMainMenu(); } -static void Handle_OP_MOVE_FIGURE() +static void Handle_OP_MOVE_FIGURE(unsigned int len) { int frame_nr; int i; @@ -530,11 +578,10 @@ static void Handle_OP_MOVE_FIGURE() Error(ERR_EXIT, "this should not happen -- please debug"); } + /* copy valid player actions */ for (i=0; i