X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fnetwork.c;h=f67f819c0e98334277586611c669ae5995702657;hp=657c796b7cfd30d7b5951ab686f82d3ba3f04a48;hb=30f7db91ed90b3c76ce50dca5884154b3f5d55e9;hpb=80a611519cc20b404bce7fc5dc6d321b082f99d2 diff --git a/src/network.c b/src/network.c index 657c796b..f67f819c 100644 --- a/src/network.c +++ b/src/network.c @@ -22,6 +22,7 @@ #include "files.h" #include "tools.h" #include "screens.h" +#include "init.h" struct NetworkClientPlayerInfo { @@ -43,11 +44,14 @@ static TCPsocket sfd; /* TCP server socket */ static UDPsocket udp; /* UDP server socket */ static SDLNet_SocketSet rfds; /* socket set */ -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 struct NetworkBuffer *read_buffer = NULL; +static struct NetworkBuffer *write_buffer = NULL; + static boolean stop_network_game = FALSE; +static boolean stop_network_client = FALSE; +static char stop_network_client_message[MAX_OUTPUT_LINESIZE + 1]; + +static struct NetworkLevelInfo network_level; static void DrawNetworkTextExt(char *message, int font_nr, boolean initialize) { @@ -126,27 +130,19 @@ static void DrawNetworkText_Title(char *message) DrawNetworkTextExt(message, FC_GREEN, TRUE); } -static void SendBufferToServer(int size) +static void SendNetworkBufferToServer(struct NetworkBuffer *nb) { if (!network.enabled) return; - realbuffer[0] = realbuffer[1] = realbuffer[2] = 0; - realbuffer[3] = (byte)size; - buffer[0] = 0; - - if (nwrite + 4 + size >= MAX_BUFFER_SIZE) - Error(ERR_EXIT, "internal error: network send buffer overflow"); - - memcpy(writbuffer + nwrite, realbuffer, 4 + size); - nwrite += 4 + size; + /* set message length header */ + putNetwork32BitInteger(nb->buffer, nb->size - 4); /* directly send the buffer to the network server */ - SDLNet_TCP_Send(sfd, writbuffer, nwrite); - nwrite = 0; + SDLNet_TCP_Send(sfd, nb->buffer, nb->size); } -struct NetworkClientPlayerInfo *getNetworkPlayer(int player_nr) +static struct NetworkClientPlayerInfo *getNetworkPlayer(int player_nr) { struct NetworkClientPlayerInfo *player = NULL; @@ -177,6 +173,11 @@ char *getNetworkPlayerName(int player_nr) return(EMPTY_PLAYER_NAME); } +static boolean hasPathSeparator(char *s) +{ + return (strchr(s, '/') != NULL); +} + static void StartNetworkServer(int port) { static int p; @@ -197,6 +198,12 @@ boolean ConnectToServer(char *hostname, int port) int server_host = 0; int i; + if (read_buffer == NULL) + read_buffer = newNetworkBuffer(); + + if (write_buffer == NULL) + write_buffer = newNetworkBuffer(); + DrawNetworkText_Title("Initializing Network"); if (port == 0) @@ -238,9 +245,9 @@ boolean ConnectToServer(char *hostname, int port) SDLNet_UDP_Send(udp, -1, &packet); - DrawNetworkText("Looking for local network server ..."); + DrawNetworkText("Looking for nearby network server ..."); - /* wait for any local network server to answer UDP broadcast */ + /* wait for any nearby network server to answer UDP broadcast */ for (i = 0; i < 5; i++) { if (SDLNet_CheckSockets(udp_socket_set, 0) == 1) @@ -249,9 +256,17 @@ boolean ConnectToServer(char *hostname, int port) if (num_packets == 1) { - DrawNetworkText_Success("Network server found!"); + char message[100]; server_host = SDLNet_Read32(&packet.address.host); + + sprintf(message, "Network server found at %d.%d.%d.%d!", + (server_host >> 24) & 0xff, + (server_host >> 16) & 0xff, + (server_host >> 8) & 0xff, + (server_host >> 0) & 0xff); + + DrawNetworkText_Success(message); } else { @@ -267,33 +282,52 @@ boolean ConnectToServer(char *hostname, int port) } if (server_host == 0) - DrawNetworkText_Failed("No network server found!"); + DrawNetworkText_Failed("No nearby network server found!"); } rfds = SDLNet_AllocSocketSet(1); if (hostname) { + char message[100]; + SDLNet_ResolveHost(&ip, hostname, port); if (ip.host == INADDR_NONE) - Error(ERR_EXIT, "cannot locate host '%s'", hostname); + { + sprintf(message, "Failed to resolve network server hostname '%s'!", + hostname); + + DrawNetworkText_Failed(message); + + return FALSE; + } else + { server_host = SDLNet_Read32(&ip.host); + } - DrawNetworkText("Connecting to remote host ..."); + sprintf(message, "Connecting to network server host %s ...", hostname); + + DrawNetworkText(message); } else { // if no hostname was given and no network server was auto-detected in the // local network, try to connect to a network server at the local host if (server_host == 0) + { server_host = 0x7f000001; /* 127.0.0.1 */ + DrawNetworkText("Looking for local network server ..."); + } + else + { + DrawNetworkText("Connecting to network server ..."); + } + SDLNet_Write32(server_host, &ip.host); SDLNet_Write16(port, &ip.port); - - DrawNetworkText("Connecting to local host ..."); } Error(ERR_DEBUG, "trying to connect to network server at %d.%d.%d.%d ...", @@ -314,7 +348,10 @@ boolean ConnectToServer(char *hostname, int port) } else { - DrawNetworkText_Failed("Failed to connect to network server!"); + if (hostname) + DrawNetworkText_Failed("Failed to connect to network server!"); + else + DrawNetworkText_Failed("No local network server found!"); printf("SDLNet_TCP_Open(): %s\n", SDLNet_GetError()); } @@ -331,16 +368,17 @@ boolean ConnectToServer(char *hostname, int port) { if ((sfd = SDLNet_TCP_Open(&ip))) /* connected */ { - DrawNetworkText_Success("Successfully connected!"); + DrawNetworkText_Success("Successfully connected to newly started network server!"); SDLNet_TCP_AddSocket(rfds, sfd); + return TRUE; } Delay_WithScreenUpdates(100); } - DrawNetworkText_Failed("Failed to connect to network server!"); + DrawNetworkText_Failed("Failed to connect to newly started network server!"); /* when reaching this point, connect to newly started server has failed */ return FALSE; @@ -348,101 +386,150 @@ boolean ConnectToServer(char *hostname, int port) void SendToServer_PlayerName(char *player_name) { - int len_player_name = strlen(player_name); + initNetworkBufferForWriting(write_buffer, OP_PLAYER_NAME, 0); + + putNetworkBufferString(write_buffer, player_name); + + SendNetworkBufferToServer(write_buffer); - 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() +void SendToServer_ProtocolVersion(void) { - buffer[1] = OP_PROTOCOL_VERSION; - buffer[2] = PROTOCOL_VERSION_1; - buffer[3] = PROTOCOL_VERSION_2; - buffer[4] = PROTOCOL_VERSION_3; + initNetworkBufferForWriting(write_buffer, OP_PROTOCOL_VERSION, 0); - SendBufferToServer(5); + putNetworkBuffer8BitInteger(write_buffer, PROTOCOL_VERSION_MAJOR); + putNetworkBuffer8BitInteger(write_buffer, PROTOCOL_VERSION_MINOR); + putNetworkBuffer8BitInteger(write_buffer, PROTOCOL_VERSION_PATCH); + + SendNetworkBufferToServer(write_buffer); } void SendToServer_NrWanted(int nr_wanted) { - buffer[1] = OP_NUMBER_WANTED; - buffer[2] = nr_wanted; + initNetworkBufferForWriting(write_buffer, OP_NUMBER_WANTED, 0); + + putNetworkBuffer8BitInteger(write_buffer, nr_wanted); - SendBufferToServer(3); + SendNetworkBufferToServer(write_buffer); } -void SendToServer_StartPlaying() +void SendToServer_LevelFile(void) { - unsigned int new_random_seed = InitRND(level.random_seed); + initNetworkBufferForWriting(write_buffer, OP_LEVEL_FILE, 0); + + putNetworkBufferString( write_buffer, leveldir_current->identifier); + putNetworkBuffer16BitInteger(write_buffer, level.file_info.nr); + putNetworkBuffer8BitInteger( write_buffer, level.file_info.type); + putNetworkBuffer8BitInteger( write_buffer, level.file_info.packed); + putNetworkBufferString( write_buffer, level.file_info.basename); + putNetworkBufferFile( write_buffer, level.file_info.filename); + putNetworkBuffer8BitInteger( write_buffer, level.use_custom_template); + + if (level.use_custom_template) + { + putNetworkBufferString(write_buffer, level_template.file_info.basename); + putNetworkBufferFile( write_buffer, level_template.file_info.filename); + } - int dummy = 0; /* !!! HAS NO MEANING ANYMORE !!! */ - /* the name of the level must be enough */ + SendNetworkBufferToServer(write_buffer); - buffer[1] = OP_START_PLAYING; - buffer[2] = (byte)(level_nr >> 8); - buffer[3] = (byte)(level_nr & 0xff); - buffer[4] = (byte)(dummy >> 8); - buffer[5] = (byte)(dummy & 0xff); + setString(&network_level.leveldir_identifier, leveldir_current->identifier); - 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); + /* the sending client does not use network level files (but the real ones) */ + network_level.use_network_level_files = FALSE; - strcpy((char *)&buffer[10], leveldir_current->identifier); +#if 0 + printf("::: '%s'\n", leveldir_current->identifier); + printf("::: '%d'\n", level.file_info.nr); + printf("::: '%d'\n", level.file_info.type); + printf("::: '%d'\n", level.file_info.packed); + printf("::: '%s'\n", level.file_info.basename); + printf("::: '%s'\n", level.file_info.filename); - SendBufferToServer(10 + strlen(leveldir_current->identifier) + 1); + if (level.use_custom_template) + printf("::: '%s'\n", level_template.file_info.filename); +#endif } -void SendToServer_PausePlaying() +void SendToServer_StartPlaying(void) { - buffer[1] = OP_PAUSE_PLAYING; + unsigned int new_random_seed = InitRND(level.random_seed); + + initNetworkBufferForWriting(write_buffer, OP_START_PLAYING, 0); + + putNetworkBufferString( write_buffer, leveldir_current->identifier); + putNetworkBuffer16BitInteger(write_buffer, level_nr); + putNetworkBuffer32BitInteger(write_buffer, new_random_seed); - SendBufferToServer(2); + SendNetworkBufferToServer(write_buffer); } -void SendToServer_ContinuePlaying() +void SendToServer_PausePlaying(void) { - buffer[1] = OP_CONTINUE_PLAYING; + initNetworkBufferForWriting(write_buffer, OP_PAUSE_PLAYING, 0); - SendBufferToServer(2); + SendNetworkBufferToServer(write_buffer); +} + +void SendToServer_ContinuePlaying(void) +{ + initNetworkBufferForWriting(write_buffer, OP_CONTINUE_PLAYING, 0); + + SendNetworkBufferToServer(write_buffer); } void SendToServer_StopPlaying(int cause_for_stopping) { - buffer[1] = OP_STOP_PLAYING; - buffer[2] = cause_for_stopping; + initNetworkBufferForWriting(write_buffer, OP_STOP_PLAYING, 0); - SendBufferToServer(3); + putNetworkBuffer8BitInteger(write_buffer, cause_for_stopping); + + SendNetworkBufferToServer(write_buffer); } void SendToServer_MovePlayer(byte player_action) { - buffer[1] = OP_MOVE_PLAYER; - buffer[2] = player_action; + initNetworkBufferForWriting(write_buffer, OP_MOVE_PLAYER, 0); + + putNetworkBuffer8BitInteger(write_buffer, player_action); - SendBufferToServer(3); + SendNetworkBufferToServer(write_buffer); } -static void Handle_OP_BAD_PROTOCOL_VERSION() +static void Handle_OP_BAD_PROTOCOL_VERSION(void) { + int protocol_version_major = getNetworkBuffer8BitInteger(read_buffer); + int protocol_version_minor = getNetworkBuffer8BitInteger(read_buffer); + Error(ERR_WARN, "protocol version mismatch"); - Error(ERR_EXIT, "server expects %d.%d.x instead of %d.%d.%d", - buffer[2], buffer[3], - PROTOCOL_VERSION_1, PROTOCOL_VERSION_2, PROTOCOL_VERSION_3); + Error(ERR_WARN, "server expects %d.%d.x instead of %d.%d.%d", + protocol_version_major, + protocol_version_minor, + PROTOCOL_VERSION_MAJOR, + PROTOCOL_VERSION_MINOR, + PROTOCOL_VERSION_PATCH); + + sprintf(stop_network_client_message, "Network protocol version mismatch! Server expects version %d.%d.x instead of %d.%d.%d!", + protocol_version_major, + protocol_version_minor, + PROTOCOL_VERSION_MAJOR, + PROTOCOL_VERSION_MINOR, + PROTOCOL_VERSION_PATCH); + + stop_network_client = TRUE; } -static void Handle_OP_YOUR_NUMBER() +static void Handle_OP_YOUR_NUMBER(void) { - int new_client_nr = buffer[2]; + int old_client_nr = getNetworkBuffer8BitInteger(read_buffer); + int new_client_nr = getNetworkBuffer8BitInteger(read_buffer); 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", buffer[0]); + printf("OP_YOUR_NUMBER: %d\n", old_client_nr); first_player.nr = new_client_nr; if (old_local_player != new_local_player) @@ -466,18 +553,18 @@ static void Handle_OP_YOUR_NUMBER() stored_player[new_index_nr].connected_network = TRUE; } -static void Handle_OP_NUMBER_WANTED() +static void Handle_OP_NUMBER_WANTED(void) { - int client_nr_wanted = buffer[2]; - int old_client_nr = buffer[0]; - int new_client_nr = buffer[3]; + int old_client_nr = getNetworkBuffer8BitInteger(read_buffer); + int client_nr_wanted = getNetworkBuffer8BitInteger(read_buffer); + int new_client_nr = getNetworkBuffer8BitInteger(read_buffer); 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", buffer[0]); + printf("OP_NUMBER_WANTED: %d\n", old_client_nr); if (new_client_nr == client_nr_wanted) /* switching succeeded */ { @@ -525,23 +612,25 @@ static void Handle_OP_NUMBER_WANTED() DrawNetworkPlayers(); } -static void Handle_OP_PLAYER_NAME(unsigned int len) +static void Handle_OP_PLAYER_NAME(void) { - struct NetworkClientPlayerInfo *player; - int player_nr = (int)buffer[0]; + int player_nr = getNetworkBuffer8BitInteger(read_buffer); + char *player_name = getNetworkBufferString(read_buffer); + struct NetworkClientPlayerInfo *player = getNetworkPlayer(player_nr); printf("OP_PLAYER_NAME: %d\n", player_nr); - player = getNetworkPlayer(player_nr); - buffer[len] = 0; + + strncpy(player->name, player_name, MAX_PLAYER_NAME_LEN); + player->name[MAX_PLAYER_NAME_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); + player_nr, player->name); } -static void Handle_OP_PLAYER_CONNECTED() +static void Handle_OP_PLAYER_CONNECTED(void) { struct NetworkClientPlayerInfo *player, *last_player = NULL; - int new_client_nr = (int)buffer[0]; + int new_client_nr = getNetworkBuffer8BitInteger(read_buffer); int new_index_nr = new_client_nr - 1; printf("OP_PLAYER_CONNECTED: %d\n", new_client_nr); @@ -564,16 +653,16 @@ static void Handle_OP_PLAYER_CONNECTED() stored_player[new_index_nr].connected_network = TRUE; } -static void Handle_OP_PLAYER_DISCONNECTED() +static void Handle_OP_PLAYER_DISCONNECTED(void) { struct NetworkClientPlayerInfo *player, *player_disconnected; - int player_nr = (int)buffer[0]; + int player_nr = getNetworkBuffer8BitInteger(read_buffer); int index_nr = player_nr - 1; 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])); + player_nr, getNetworkPlayerName(player_nr)); for (player = &first_player; player; player = player->next) if (player->next == player_disconnected) @@ -602,81 +691,102 @@ static void Handle_OP_PLAYER_DISCONNECTED() } } -static void Handle_OP_START_PLAYING() +static void Handle_OP_START_PLAYING(void) { - LevelDirTree *new_leveldir; - int new_level_nr; - unsigned int new_random_seed; - char *new_leveldir_identifier; + int player_nr = getNetworkBuffer8BitInteger(read_buffer); + char *new_leveldir_identifier = getNetworkBufferString(read_buffer); + int new_level_nr = getNetworkBuffer16BitInteger(read_buffer); + unsigned int new_random_seed = getNetworkBuffer32BitInteger(read_buffer); - new_level_nr = (buffer[2] << 8) + buffer[3]; - new_random_seed = - (buffer[6] << 24) | (buffer[7] << 16) | (buffer[8] << 8) | (buffer[9]); - new_leveldir_identifier = (char *)&buffer[10]; - - new_leveldir = getTreeInfoFromIdentifier(leveldir_first, - new_leveldir_identifier); - if (new_leveldir == NULL) + if (!strEqual(new_leveldir_identifier, network_level.leveldir_identifier)) { Error(ERR_WARN, "no such level identifier: '%s'", new_leveldir_identifier); - new_leveldir = leveldir_first; - Error(ERR_WARN, "using default level set: '%s'", new_leveldir->identifier); + stop_network_game = TRUE; + + return; } - printf("OP_START_PLAYING: %d\n", buffer[0]); + printf("OP_START_PLAYING: %d\n", player_nr); Error(ERR_NETWORK_CLIENT, "client %d starts game [level %d from level identifier '%s']\n", - buffer[0], new_level_nr, new_leveldir->identifier); + player_nr, new_level_nr, new_leveldir_identifier); + + LevelDirTree *new_leveldir = + getTreeInfoFromIdentifier(leveldir_first, new_leveldir_identifier); + + if (new_leveldir != NULL) + { + leveldir_current = new_leveldir; + level_nr = new_level_nr; + } - leveldir_current = new_leveldir; - level_nr = new_level_nr; + /* needed if level set of network game changed graphics, sounds or music */ + ReloadCustomArtwork(0); TapeErase(); - LoadTape(level_nr); - LoadLevel(level_nr); + + if (network_level.use_network_level_files) + LoadNetworkLevel(&network_level); + else + LoadLevel(level_nr); StartGameActions(FALSE, setup.autorecord, new_random_seed); } -static void Handle_OP_PAUSE_PLAYING() +static void Handle_OP_PAUSE_PLAYING(void) { - printf("OP_PAUSE_PLAYING: %d\n", buffer[0]); - Error(ERR_NETWORK_CLIENT, "client %d pauses game", buffer[0]); + int player_nr = getNetworkBuffer8BitInteger(read_buffer); - tape.pausing = TRUE; - DrawVideoDisplay(VIDEO_STATE_PAUSE_ON,0); + printf("OP_PAUSE_PLAYING: %d\n", player_nr); + Error(ERR_NETWORK_CLIENT, "client %d pauses game", player_nr); + + if (game_status == GAME_MODE_PLAYING) + { + tape.pausing = TRUE; + DrawVideoDisplay(VIDEO_STATE_PAUSE_ON, 0); + } } -static void Handle_OP_CONTINUE_PLAYING() +static void Handle_OP_CONTINUE_PLAYING(void) { - printf("OP_CONTINUE_PLAYING: %d\n", buffer[0]); - Error(ERR_NETWORK_CLIENT, "client %d continues game", buffer[0]); + int player_nr = getNetworkBuffer8BitInteger(read_buffer); - tape.pausing = FALSE; - DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0); + printf("OP_CONTINUE_PLAYING: %d\n", player_nr); + Error(ERR_NETWORK_CLIENT, "client %d continues game", player_nr); + + if (game_status == GAME_MODE_PLAYING) + { + tape.pausing = FALSE; + DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF, 0); + } } -static void Handle_OP_STOP_PLAYING() +static void Handle_OP_STOP_PLAYING(void) { - printf("OP_STOP_PLAYING: %d [%d]\n", buffer[0], buffer[2]); - Error(ERR_NETWORK_CLIENT, "client %d stops game [%d]", buffer[0], buffer[2]); + int client_nr = getNetworkBuffer8BitInteger(read_buffer); + int cause_for_stopping = getNetworkBuffer8BitInteger(read_buffer); + + printf("OP_STOP_PLAYING: %d [%d]\n", client_nr, cause_for_stopping); + Error(ERR_NETWORK_CLIENT, "client %d stops game [%d]", + client_nr, cause_for_stopping); if (game_status == GAME_MODE_PLAYING) { - int client_nr = buffer[0]; int index_nr = client_nr - 1; struct PlayerInfo *client_player = &stored_player[index_nr]; boolean stopped_by_remote_player = (!client_player->connected_locally); char message[100]; - sprintf(message, (buffer[2] == NETWORK_STOP_BY_PLAYER ? - "Network game stopped by player %d!" : - buffer[2] == NETWORK_STOP_BY_ERROR ? - "Network game stopped due to internal error!" : - "Network game stopped!"), client_nr); + if (cause_for_stopping == NETWORK_STOP_BY_PLAYER) + sprintf(message, "Network game stopped by player %d!", client_nr); + else + sprintf(message, (cause_for_stopping == NETWORK_STOP_BY_ERROR ? + "Network game stopped due to internal error!" : + "Network game stopped!")); - if (buffer[2] != NETWORK_STOP_BY_PLAYER || stopped_by_remote_player) + if (cause_for_stopping != NETWORK_STOP_BY_PLAYER || + stopped_by_remote_player) Request(message, REQ_CONFIRM | REQ_STAY_CLOSED); SetGameStatus(GAME_MODE_MAIN); @@ -685,20 +795,19 @@ static void Handle_OP_STOP_PLAYING() } } -static void Handle_OP_MOVE_PLAYER(unsigned int len) +static void Handle_OP_MOVE_PLAYER(void) { - int server_frame_counter; + int player_nr = getNetworkBuffer8BitInteger(read_buffer); + int server_frame_counter = getNetworkBuffer32BitInteger(read_buffer); int i; if (!network_playing) return; - server_frame_counter = - (buffer[2] << 24) | (buffer[3] << 16) | (buffer[4] << 8) | (buffer[5]); - if (server_frame_counter != FrameCounter) { - Error(ERR_INFO, "client and servers frame counters out of sync"); + Error(ERR_INFO, "frame counters of client %d and server out of sync", + player_nr); Error(ERR_INFO, "frame counter of client is %d", FrameCounter); Error(ERR_INFO, "frame counter of server is %d", server_frame_counter); Error(ERR_INFO, "this should not happen -- please debug"); @@ -708,81 +817,158 @@ static void Handle_OP_MOVE_PLAYER(unsigned int len) return; } - /* copy valid player actions */ + /* copy valid player actions (will be set to 0 for not connected players) */ for (i = 0; i < MAX_PLAYERS; i++) stored_player[i].effective_action = - (i < len - 6 ? buffer[6 + i] : 0); + getNetworkBuffer8BitInteger(read_buffer); network_player_action_received = TRUE; } -static void HandleNetworkingMessages() +static void Handle_OP_BROADCAST_MESSAGE(void) { - unsigned int message_length; + int player_nr = getNetworkBuffer8BitInteger(read_buffer); + + printf("OP_BROADCAST_MESSAGE: %d\n", player_nr); + Error(ERR_NETWORK_CLIENT, "client %d sends message", player_nr); +} + +static void Handle_OP_LEVEL_FILE(void) +{ + int player_nr = getNetworkBuffer8BitInteger(read_buffer); + char *leveldir_identifier; + char *network_level_dir; + struct LevelFileInfo *file_info = &network_level.file_info; + struct LevelFileInfo *tmpl_info = &network_level.tmpl_info; + boolean use_custom_template; + + setString(&network_level.leveldir_identifier, NULL); + setString(&network_level.file_info.basename, NULL); + setString(&network_level.file_info.filename, NULL); + setString(&network_level.tmpl_info.basename, NULL); + setString(&network_level.tmpl_info.filename, NULL); + + printf("OP_LEVEL_FILE: %d\n", player_nr); + + leveldir_identifier = getStringCopy(getNetworkBufferString(read_buffer)); + + if (hasPathSeparator(leveldir_identifier)) + Error(ERR_EXIT, "protocol error: invalid filename from network client"); + + InitNetworkLevelDirectory(leveldir_identifier); + + network_level_dir = getNetworkLevelDir(leveldir_identifier); + + file_info->nr = getNetworkBuffer16BitInteger(read_buffer); + file_info->type = getNetworkBuffer8BitInteger(read_buffer); + file_info->packed = getNetworkBuffer8BitInteger(read_buffer); + file_info->basename = getStringCopy(getNetworkBufferString(read_buffer)); + file_info->filename = getPath2(network_level_dir, file_info->basename); + + if (hasPathSeparator(file_info->basename)) + Error(ERR_EXIT, "protocol error: invalid filename from network client"); + + getNetworkBufferFile(read_buffer, file_info->filename); + + use_custom_template = getNetworkBuffer8BitInteger(read_buffer); + if (use_custom_template) + { + *tmpl_info = *file_info; + + tmpl_info->basename = getStringCopy(getNetworkBufferString(read_buffer)); + tmpl_info->filename = getPath2(network_level_dir, tmpl_info->basename); + + if (hasPathSeparator(tmpl_info->basename)) + Error(ERR_EXIT, "protocol error: invalid filename from network client"); + + getNetworkBufferFile(read_buffer, tmpl_info->filename); + } + + network_level.leveldir_identifier = leveldir_identifier; + network_level.use_custom_template = use_custom_template; + + /* the receiving client(s) use(s) the transferred network level files */ + network_level.use_network_level_files = TRUE; + +#if 0 + printf("::: '%s'\n", leveldir_identifier); + printf("::: '%d'\n", file_info->nr); + printf("::: '%d'\n", file_info->type); + printf("::: '%d'\n", file_info->packed); + printf("::: '%s'\n", file_info->basename); + printf("::: '%s'\n", file_info->filename); + + if (use_custom_template) + printf("::: '%s'\n", tmpl_info->filename); +#endif +} +static void HandleNetworkingMessage(void) +{ stop_network_game = FALSE; - while (nread >= 4 && nread >= 4 + readbuffer[3]) + initNetworkBufferForReading(read_buffer); + + int message_type = getNetworkBuffer8BitInteger(read_buffer); + + switch (message_type) { - message_length = readbuffer[3]; - if (readbuffer[0] || readbuffer[1] || readbuffer[2]) - Error(ERR_EXIT, "wrong network server line length"); + case OP_BAD_PROTOCOL_VERSION: + Handle_OP_BAD_PROTOCOL_VERSION(); + break; - memcpy(buffer, &readbuffer[4], message_length); - nread -= 4 + message_length; - memmove(readbuffer, readbuffer + 4 + message_length, nread); + case OP_YOUR_NUMBER: + Handle_OP_YOUR_NUMBER(); + break; - switch (buffer[1]) - { - case OP_BAD_PROTOCOL_VERSION: - Handle_OP_BAD_PROTOCOL_VERSION(); - break; + case OP_NUMBER_WANTED: + Handle_OP_NUMBER_WANTED(); + break; - case OP_YOUR_NUMBER: - Handle_OP_YOUR_NUMBER(); - break; + case OP_PLAYER_NAME: + Handle_OP_PLAYER_NAME(); + break; - case OP_NUMBER_WANTED: - Handle_OP_NUMBER_WANTED(); - break; + case OP_PLAYER_CONNECTED: + Handle_OP_PLAYER_CONNECTED(); + break; - case OP_PLAYER_NAME: - Handle_OP_PLAYER_NAME(message_length); - break; + case OP_PLAYER_DISCONNECTED: + Handle_OP_PLAYER_DISCONNECTED(); + break; - case OP_PLAYER_CONNECTED: - Handle_OP_PLAYER_CONNECTED(); - break; - - case OP_PLAYER_DISCONNECTED: - Handle_OP_PLAYER_DISCONNECTED(); - break; + case OP_START_PLAYING: + Handle_OP_START_PLAYING(); + break; - case OP_START_PLAYING: - Handle_OP_START_PLAYING(); - break; + case OP_PAUSE_PLAYING: + Handle_OP_PAUSE_PLAYING(); + break; - case OP_PAUSE_PLAYING: - Handle_OP_PAUSE_PLAYING(); - break; + case OP_CONTINUE_PLAYING: + Handle_OP_CONTINUE_PLAYING(); + break; - case OP_CONTINUE_PLAYING: - Handle_OP_CONTINUE_PLAYING(); - break; + case OP_STOP_PLAYING: + Handle_OP_STOP_PLAYING(); + break; - case OP_STOP_PLAYING: - Handle_OP_STOP_PLAYING(); - break; + case OP_MOVE_PLAYER: + Handle_OP_MOVE_PLAYER(); + break; - case OP_MOVE_PLAYER: - Handle_OP_MOVE_PLAYER(message_length); - break; + case OP_BROADCAST_MESSAGE: + Handle_OP_BROADCAST_MESSAGE(); + break; - case OP_BROADCAST_MESSAGE: - printf("OP_BROADCAST_MESSAGE: %d\n", buffer[0]); - Error(ERR_NETWORK_CLIENT, "client %d sends message", buffer[0]); - break; - } + case OP_LEVEL_FILE: + Handle_OP_LEVEL_FILE(); + break; + + default: + if (options.verbose) + Error(ERR_NETWORK_CLIENT, + "unknown opcode %d from server", message_type); } fflush(stdout); @@ -792,13 +978,13 @@ static void HandleNetworkingMessages() SendToServer_StopPlaying(NETWORK_STOP_BY_ERROR); } -static char *HandleNetworkingPackets() +static char *HandleNetworkingPackets(void) { while (1) { /* ---------- check network server for activity ---------- */ - int num_active_sockets = SDLNet_CheckSockets(rfds, 1); + int num_active_sockets = SDLNet_CheckSockets(rfds, 0); if (num_active_sockets < 0) return "Error checking network sockets!"; @@ -808,7 +994,9 @@ static char *HandleNetworkingPackets() /* ---------- read packets from network server ---------- */ - int num_bytes = SDLNet_TCP_Recv(sfd, readbuffer + nread, 1); + initNetworkBufferForReceiving(read_buffer); + + int num_bytes = receiveNetworkBufferPacket(read_buffer, sfd); if (num_bytes < 0) return "Error reading from network server!"; @@ -816,9 +1004,10 @@ static char *HandleNetworkingPackets() if (num_bytes == 0) return "Connection to network server lost!"; - nread += num_bytes; + HandleNetworkingMessage(); - HandleNetworkingMessages(); + if (stop_network_client) + return stop_network_client_message; } return NULL; @@ -835,7 +1024,7 @@ static void FreeNetworkClientPlayerInfo(struct NetworkClientPlayerInfo *player) checked_free(player); } -static void HandleNetworkingDisconnect() +static void HandleNetworkingDisconnect(void) { int i; @@ -858,7 +1047,7 @@ static void HandleNetworkingDisconnect() first_player.next = NULL; } -void HandleNetworking() +void HandleNetworking(void) { char *error_message = HandleNetworkingPackets(); @@ -884,7 +1073,7 @@ void HandleNetworking() } } -void DisconnectFromNetworkServer() +void DisconnectFromNetworkServer(void) { DrawNetworkText_Title("Terminating Network"); DrawNetworkText("Disconnecting from network server ..."); @@ -892,7 +1081,4 @@ void DisconnectFromNetworkServer() HandleNetworkingDisconnect(); DrawNetworkText_Success("Successfully disconnected!"); - - /* short time to recognize result of network initialization */ - Delay_WithScreenUpdates(1000); }