* network.c *
***********************************************************/
-#include <stdio.h>
-#include <stdlib.h>
+#ifndef MSDOS
+
#include <unistd.h>
#include <signal.h>
-#include <sys/types.h>
#include <sys/time.h>
#include <sys/wait.h>
#include <sys/socket.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
#include <netdb.h>
-#include <errno.h>
#include "network.h"
#include "netserv.h"
#include "screens.h"
#include "misc.h"
-#define MAXNICKLEN 14
+#define MAX_PLAYER_NAME_LEN 14
-struct user
+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
};
-static char msgbuf[300];
-
/* server stuff */
-int sfd;
-unsigned char realbuf[512], readbuf[MAX_BUFFER_SIZE], writbuf[MAX_BUFFER_SIZE];
-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;
-static void sysmsg(char *s)
+static void SendBufferToServer(int size)
{
- if (verbose)
- {
- printf("** %s\n", s);
- fflush(stdout);
- }
-}
+ if (!options.network)
+ return;
-static void *mmalloc(int n)
-{
- void *r;
+ realbuffer[0] = realbuffer[1] = realbuffer[2] = 0;
+ realbuffer[3] = (byte)size;
+ buffer[0] = 0;
- r = malloc(n);
- if (r == NULL)
- fatal("Out of memory");
- return r;
-}
+ if (nwrite + 4 + size >= MAX_BUFFER_SIZE)
+ Error(ERR_EXIT, "internal error: network send buffer overflow");
-static void u_sleep(int i)
-{
- struct timeval tm;
- tm.tv_sec = i / 1000000;
- tm.tv_usec = i % 1000000;
- select(0, NULL, NULL, NULL, &tm);
-}
+ memcpy(writbuffer + nwrite, realbuffer, 4 + size);
+ nwrite += 4 + size;
-static void flushbuf()
-{
- if (nwrite)
- {
- write(sfd, writbuf, nwrite);
- nwrite = 0;
- }
+ /* directly send the buffer to the network server */
+ write(sfd, writbuffer, nwrite);
+ nwrite = 0;
}
-static void sendbuf(int len)
+struct NetworkClientPlayerInfo *getNetworkPlayer(int player_nr)
{
- if (!standalone)
- {
- 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");
- memcpy(writbuf + nwrite, realbuf, 4 + len);
- nwrite += 4 + len;
-
-
- flushbuf();
+ struct NetworkClientPlayerInfo *player = NULL;
+ for (player = &first_player; player; player = player->next)
+ if (player->nr == player_nr)
+ break;
- }
-}
+ 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);
}
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,
- "cannot create network server process - no network games");
- standalone = TRUE;
+ Error(ERR_WARN,
+ "cannot create network server process - no network playing");
+ options.network = FALSE;
return;
default:
}
}
-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");
-
- 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));
- 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_NICKNAME;
- 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_PROTOCOL_VERSION;
- buf[2] = PROT_VERS_1;
- buf[3] = PROT_VERS_2;
- buf[4] = PROT_VERS_3;
+ buffer[1] = OP_PROTOCOL_VERSION;
+ buffer[2] = PROTOCOL_VERSION_1;
+ buffer[3] = PROTOCOL_VERSION_2;
+ buffer[4] = PROTOCOL_VERSION_3;
- sendbuf(5);
+ SendBufferToServer(5);
}
void SendToServer_NrWanted(int nr_wanted)
{
- buf[1] = OP_NUMBER_WANTED;
- buf[2] = nr_wanted;
+ buffer[1] = OP_NUMBER_WANTED;
+ buffer[2] = nr_wanted;
- sendbuf(3);
+ SendBufferToServer(3);
}
void SendToServer_StartPlaying()
{
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);
+ 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);
- 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);
+ 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(&buf[10], leveldir[leveldir_nr].name);
+ strcpy((char *)&buffer[10], leveldir[leveldir_nr].name);
- sendbuf(10 + strlen(leveldir[leveldir_nr].name)+1);
+ SendBufferToServer(10 + strlen(leveldir[leveldir_nr].name)+1);
}
void SendToServer_PausePlaying()
{
- buf[1] = OP_PAUSE_PLAYING;
+ buffer[1] = OP_PAUSE_PLAYING;
- sendbuf(2);
+ SendBufferToServer(2);
}
void SendToServer_ContinuePlaying()
{
- buf[1] = OP_CONTINUE_PLAYING;
+ buffer[1] = OP_CONTINUE_PLAYING;
- sendbuf(2);
+ SendBufferToServer(2);
}
void SendToServer_StopPlaying()
{
- buf[1] = OP_STOP_PLAYING;
+ buffer[1] = OP_STOP_PLAYING;
- sendbuf(2);
+ SendBufferToServer(2);
}
void SendToServer_MovePlayer(byte player_action)
{
- buf[1] = OP_MOVE_FIGURE;
- buf[2] = player_action;
+ buffer[1] = OP_MOVE_FIGURE;
+ buffer[2] = player_action;
- sendbuf(3);
+ SendBufferToServer(3);
}
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);
+ buffer[2], buffer[3],
+ PROTOCOL_VERSION_1, PROTOCOL_VERSION_2, PROTOCOL_VERSION_3);
}
static void Handle_OP_YOUR_NUMBER()
{
- int new_client_nr = buf[2];
+ 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];
- printf("OP_YOUR_NUMBER: %d\n", buf[0]);
- me.nr = new_client_nr;
+ printf("OP_YOUR_NUMBER: %d\n", buffer[0]);
+ first_player.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 */
- TestPlayer = new_index_nr;
+ *new_local_player = *old_local_player;
+ old_local_player->connected = FALSE;
+ local_player = new_local_player;
+ }
- if (me.nr > MAX_PLAYERS)
+ if (first_player.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);
+ Error(ERR_NETWORK_CLIENT, "you get client # %d", new_client_nr);
}
static void Handle_OP_NUMBER_WANTED()
{
- int client_nr_wanted = buf[2];
- int new_client_nr = buf[3];
+ 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", buf[0]);
+ printf("OP_NUMBER_WANTED: %d\n", buffer[0]);
- if (new_client_nr != client_nr_wanted)
+ if (new_client_nr == client_nr_wanted) /* switching succeeded */
{
- char *color[] = { "yellow", "red", "green", "blue" };
+ 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);
- sprintf(msgbuf, "Sorry ! You are %s player !",
- color[new_index_nr]);
- Request(msgbuf, REQ_CONFIRM);
+ if (old_client_nr != new_client_nr)
+ {
+ /* copy existing player settings and change to new player */
+
+ *new_player = *old_player;
+ old_player->connected = FALSE;
+ }
- sprintf(msgbuf, "cannot switch -- you keep client # %d",
- new_client_nr);
- sysmsg(msgbuf);
+ player = getNetworkPlayer(old_client_nr);
+ player->nr = new_client_nr;
+
+ if (old_player == local_player) /* local player switched */
+ local_player = new_player;
}
- else
+ else if (old_client_nr == first_player.nr) /* failed -- local player? */
{
- 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;
+ char *color[] = { "yellow", "red", "green", "blue" };
+ char request[100];
- stored_player[new_index_nr] = *local_player;
- local_player = &stored_player[new_index_nr];
+ sprintf(request, "Sorry ! %s player still exists ! You are %s player !",
+ color[index_nr_wanted], color[new_index_nr]);
+ Request(request, REQ_CONFIRM);
- TestPlayer = new_index_nr;
+ Error(ERR_NETWORK_CLIENT, "cannot switch -- you keep client # %d",
+ new_client_nr);
}
}
-static void Handle_OP_NICKNAME(unsigned int len)
+static void Handle_OP_PLAYER_NAME(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);
+ 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);
}
static void Handle_OP_PLAYER_CONNECTED()
{
- struct user *u, *v = NULL;
+ 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", buf[0]);
- sprintf(msgbuf, "new client %d connected", buf[0]);
- sysmsg(msgbuf);
+ printf("OP_PLAYER_CONNECTED: %d\n", new_client_nr);
+ Error(ERR_NETWORK_CLIENT, "new client %d connected", new_client_nr);
- for (u = &me; u; u = u->next)
+ for (player=&first_player; player; player=player->next)
{
- if (u->nr == buf[0])
+ if (player->nr == new_client_nr)
Error(ERR_EXIT, "multiplayer server sent duplicate player id");
- else
- v = u;
+
+ last_player = player;
}
- v->next = u = mmalloc(sizeof(struct user));
- u->nr = buf[0];
- u->name[0] = '\0';
- u->next = NULL;
+ 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 user *u, *v;
-
- 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);
-
- for (v = &me; v; v = v->next)
- if (v->next == u)
- v->next = u->next;
- free(u);
+ 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;
- unsigned char *new_leveldir_name;
+ 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_level_nr = (buffer[2] << 8) + buffer[3];
+ new_leveldir_nr = (buffer[4] << 8) + buffer[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);
+ (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_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;
- LoadPlayerInfo(PLAYER_LEVEL);
- SavePlayerInfo(PLAYER_SETUP);
-
level_nr = new_level_nr;
TapeErase();
- LoadLevelTape(level_nr);
-
- GetPlayerConfig();
+ LoadTape(level_nr);
LoadLevel(level_nr);
-
-
- if (autorecord_on)
+ if (setup.autorecord)
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();
}
static void Handle_OP_PAUSE_PLAYING()
{
- printf("OP_PAUSE_PLAYING: %d\n", buf[0]);
- sprintf(msgbuf, "client %d pauses game", buf[0]);
- sysmsg(msgbuf);
+ 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", buf[0]);
- sprintf(msgbuf, "client %d continues game", buf[0]);
- sysmsg(msgbuf);
+ 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", buf[0]);
- sprintf(msgbuf, "client %d stops game", buf[0]);
- sysmsg(msgbuf);
+ 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()
+static void Handle_OP_MOVE_FIGURE(unsigned int len)
{
- int frame_nr;
+ int server_frame_counter;
int i;
- frame_nr =
- (buf[2] << 24) | (buf[3] << 16) | (buf[4] << 8) | (buf[5]);
+ if (!network_playing)
+ return;
+
+ server_frame_counter =
+ (buffer[2] << 24) | (buffer[3] << 16) | (buffer[4] << 8) | (buffer[5]);
- if (frame_nr != FrameCounter)
+ 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", frame_nr);
+ 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<MAX_PLAYERS; i++)
- {
- if (stored_player[i].active)
- network_player_action[i] = buf[6 + i];
- }
+ stored_player[i].effective_action =
+ (i < len - 6 && stored_player[i].active ? buffer[6 + i] : 0);
network_player_action_received = TRUE;
-
- /*
- sprintf(msgbuf, "frame %d: client %d moves player [0x%02x]",
- FrameCounter, buf[0], buf[2]);
- sysmsg(msgbuf);
- */
}
-static void handlemessages()
+static void HandleNetworkingMessages()
{
- unsigned int len;
+ unsigned int message_length;
- while (nread >= 4 && nread >= 4 + readbuf[3])
+ while (nread >= 4 && nread >= 4 + readbuffer[3])
{
- len = readbuf[3];
- if (readbuf[0] || readbuf[1] || readbuf[2])
- fatal("Wrong server line length");
+ message_length = readbuffer[3];
+ if (readbuffer[0] || readbuffer[1] || readbuffer[2])
+ Error(ERR_EXIT, "wrong network server line length");
- memcpy(buf, &readbuf[4], len);
- nread -= 4 + len;
- copydown(readbuf, readbuf + 4 + len, nread);
+ memcpy(buffer, &readbuffer[4], message_length);
+ nread -= 4 + message_length;
+ memmove(readbuffer, readbuffer + 4 + message_length, nread);
- switch(buf[1])
+ switch(buffer[1])
{
case OP_BAD_PROTOCOL_VERSION:
Handle_OP_BAD_PROTOCOL_VERSION();
Handle_OP_NUMBER_WANTED();
break;
- case OP_NICKNAME:
- Handle_OP_NICKNAME(len);
+ case OP_PLAYER_NAME:
+ Handle_OP_PLAYER_NAME(message_length);
break;
case OP_PLAYER_CONNECTED:
break;
case OP_MOVE_FIGURE:
- Handle_OP_MOVE_FIGURE();
- break;
-
- case OP_WON:
- printf("OP_WON: %d\n", buf[0]);
- sprintf(msgbuf, "client %d wins the game", buf[0]);
- sysmsg(msgbuf);
- break;
-
- case OP_ZERO:
- printf("OP_ZERO: %d\n", buf[0]);
- sprintf(msgbuf, "client %d resets game counters", buf[0]);
- sysmsg(msgbuf);
+ Handle_OP_MOVE_FIGURE(message_length);
break;
- case OP_MSG:
- printf("OP_MSG: %d\n", buf[0]);
- sprintf(msgbuf, "client %d sends message", buf[0]);
- break;
-
- case OP_LOST:
- printf("OP_MSG: %d\n", buf[0]);
- sprintf(msgbuf, "client %d has lost", buf[0]);
- 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;
}
}
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);
{
int r;
- r = read(sfd, readbuf + nread, MAX_BUFFER_SIZE - 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 */
projects / rocksndiamonds.git / blobdiff