projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor change to handle explosion sound for EM engine
[rocksndiamonds.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index 574809781e92dcbbb4cf5a75c78b34f65dc5f220..25108000ba44d12a0dd2d04925282b47a35d4cae 100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-38,20
+38,11
@@
static struct NetworkClientPlayerInfo first_player =
NULL
};
NULL
};
-struct NetworkLevelFileInfo
-{
- char *leveldir_identifier;
- struct LevelFileInfo file_info;
- struct LevelFileInfo tmpl_info;
- boolean use_network_level_files;
- boolean use_custom_template;
-};
-
-/* server stuff */
+// server stuff
-static TCPsocket sfd; /
* TCP server socket */
-static UDPsocket udp; /
* UDP server socket */
-static SDLNet_SocketSet rfds; /
* socket set */
+static TCPsocket sfd; /
/ TCP server socket
+static UDPsocket udp; /
/ UDP server socket
+static SDLNet_SocketSet rfds; /
/ socket set
static struct NetworkBuffer *read_buffer = NULL;
static struct NetworkBuffer *write_buffer = NULL;
static struct NetworkBuffer *read_buffer = NULL;
static struct NetworkBuffer *write_buffer = NULL;
@@
-60,7
+51,7
@@
static boolean stop_network_game = FALSE;
static boolean stop_network_client = FALSE;
static char stop_network_client_message[MAX_OUTPUT_LINESIZE + 1];
static boolean stop_network_client = FALSE;
static char stop_network_client_message[MAX_OUTPUT_LINESIZE + 1];
-static struct NetworkLevel
File
Info network_level;
+static struct NetworkLevelInfo network_level;
static void DrawNetworkTextExt(char *message, int font_nr, boolean initialize)
{
static void DrawNetworkTextExt(char *message, int font_nr, boolean initialize)
{
@@
-91,7
+82,7
@@
static void DrawNetworkTextExt(char *message, int font_nr, boolean initialize)
DrawTextSCentered(ypos_1, font_nr, message);
DrawTextSCentered(ypos_1, font_nr, message);
- /
* calculate offset to x position caused by rounding */
+ /
/ calculate offset to x position caused by rounding
int max_chars_per_line = max_line_width / font_width;
int xoffset = (max_line_width - max_chars_per_line * font_width) / 2;
int max_chars_per_line = max_line_width / font_width;
int xoffset = (max_line_width - max_chars_per_line * font_width) / 2;
@@
-144,14
+135,14
@@
static void SendNetworkBufferToServer(struct NetworkBuffer *nb)
if (!network.enabled)
return;
if (!network.enabled)
return;
- /
* set message length header */
+ /
/ set message length header
putNetwork32BitInteger(nb->buffer, nb->size - 4);
putNetwork32BitInteger(nb->buffer, nb->size - 4);
- /
* directly send the buffer to the network server */
+ /
/ directly send the buffer to the network server
SDLNet_TCP_Send(sfd, nb->buffer, nb->size);
}
SDLNet_TCP_Send(sfd, nb->buffer, nb->size);
}
-struct NetworkClientPlayerInfo *getNetworkPlayer(int player_nr)
+st
atic st
ruct NetworkClientPlayerInfo *getNetworkPlayer(int player_nr)
{
struct NetworkClientPlayerInfo *player = NULL;
{
struct NetworkClientPlayerInfo *player = NULL;
@@
-159,7
+150,7
@@
struct NetworkClientPlayerInfo *getNetworkPlayer(int player_nr)
if (player->nr == player_nr)
break;
if (player->nr == player_nr)
break;
- if (player == NULL) /
* should not happen */
+ if (player == NULL) /
/ should not happen
Error(ERR_EXIT, "protocol error: reference to non-existing player %d",
player_nr);
Error(ERR_EXIT, "protocol error: reference to non-existing player %d",
player_nr);
@@
-182,17
+173,24
@@
char *getNetworkPlayerName(int player_nr)
return(EMPTY_PLAYER_NAME);
}
return(EMPTY_PLAYER_NAME);
}
+boolean hasStartedNetworkGame(void)
+{
+ return !network_level.use_network_level_files;
+}
+
+static boolean hasPathSeparator(char *s)
+{
+ return (strchr(s, '/') != NULL);
+}
+
static void StartNetworkServer(int port)
{
static int p;
p = port;
static void StartNetworkServer(int port)
{
static int p;
p = port;
-#if defined(TARGET_SDL2)
+
server_thread = SDL_CreateThread(NetworkServerThread,
"NetworkServerThread", &p);
server_thread = SDL_CreateThread(NetworkServerThread,
"NetworkServerThread", &p);
-#else
- server_thread = SDL_CreateThread(NetworkServerThread, &p);
-#endif
network_server = TRUE;
}
network_server = TRUE;
}
@@
-223,7
+221,7
@@
boolean ConnectToServer(char *hostname, int port)
Error(ERR_EXIT, "SDLNet_AllocSocketSet() failed: %s"), SDLNet_GetError();
udp = SDLNet_UDP_Open(0);
Error(ERR_EXIT, "SDLNet_AllocSocketSet() failed: %s"), SDLNet_GetError();
udp = SDLNet_UDP_Open(0);
- if(!udp)
+ if
(!udp)
Error(ERR_EXIT, "SDLNet_UDP_Open() failed: %s", SDLNet_GetError());
if (SDLNet_UDP_AddSocket(udp_socket_set, udp) == -1)
Error(ERR_EXIT, "SDLNet_UDP_Open() failed: %s", SDLNet_GetError());
if (SDLNet_UDP_AddSocket(udp_socket_set, udp) == -1)
@@
-234,7
+232,7
@@
boolean ConnectToServer(char *hostname, int port)
int data_len = strlen(data_ptr) + 1;
IPaddress ip_address;
int data_len = strlen(data_ptr) + 1;
IPaddress ip_address;
- SDLNet_Write32(0xffffffff, &ip_address.host); /
* 255.255.255.255 */
+ SDLNet_Write32(0xffffffff, &ip_address.host); /
/ 255.255.255.255
SDLNet_Write16(port, &ip_address.port);
UDPpacket packet =
SDLNet_Write16(port, &ip_address.port);
UDPpacket packet =
@@
-249,9
+247,9
@@
boolean ConnectToServer(char *hostname, int port)
SDLNet_UDP_Send(udp, -1, &packet);
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)
for (i = 0; i < 5; i++)
{
if (SDLNet_CheckSockets(udp_socket_set, 0) == 1)
@@
-260,9
+258,17
@@
boolean ConnectToServer(char *hostname, int port)
if (num_packets == 1)
{
if (num_packets == 1)
{
-
DrawNetworkText_Success("Network server found!")
;
+
char message[100]
;
server_host = SDLNet_Read32(&packet.address.host);
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
{
}
else
{
@@
-278,33
+284,52
@@
boolean ConnectToServer(char *hostname, int port)
}
if (server_host == 0)
}
if (server_host == 0)
- DrawNetworkText_Failed("No network server found!");
+ DrawNetworkText_Failed("No ne
arby ne
twork server found!");
}
rfds = SDLNet_AllocSocketSet(1);
if (hostname)
{
}
rfds = SDLNet_AllocSocketSet(1);
if (hostname)
{
+ char message[100];
+
SDLNet_ResolveHost(&ip, hostname, port);
if (ip.host == INADDR_NONE)
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
else
+ {
server_host = SDLNet_Read32(&ip.host);
server_host = SDLNet_Read32(&ip.host);
+ }
+
+ sprintf(message, "Connecting to network server host %s ...", hostname);
- DrawNetworkText(
"Connecting to remote host ..."
);
+ 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)
}
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 */
+ {
+ 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);
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 ...",
}
Error(ERR_DEBUG, "trying to connect to network server at %d.%d.%d.%d ...",
@@
-325,35
+350,39
@@
boolean ConnectToServer(char *hostname, int port)
}
else
{
}
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());
}
printf("SDLNet_TCP_Open(): %s\n", SDLNet_GetError());
}
- if (hostname) /
* connect to specified server failed */
+ if (hostname) /
/ connect to specified server failed
return FALSE;
DrawNetworkText("Starting new local network server ...");
StartNetworkServer(port);
return FALSE;
DrawNetworkText("Starting new local network server ...");
StartNetworkServer(port);
- /
* wait for server to start up and try connecting several times */
+ /
/ wait for server to start up and try connecting several times
for (i = 0; i < 30; i++)
{
for (i = 0; i < 30; i++)
{
- if ((sfd = SDLNet_TCP_Open(&ip))) /
* connected */
+ 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);
SDLNet_TCP_AddSocket(rfds, sfd);
+
return TRUE;
}
Delay_WithScreenUpdates(100);
}
return TRUE;
}
Delay_WithScreenUpdates(100);
}
- DrawNetworkText_Failed("Failed to connect to network server!");
+ DrawNetworkText_Failed("Failed to connect to ne
wly started ne
twork server!");
- /
* when reaching this point, connect to newly started server has failed */
+ /
/ when reaching this point, connect to newly started server has failed
return FALSE;
}
return FALSE;
}
@@
-368,7
+397,7
@@
void SendToServer_PlayerName(char *player_name)
Error(ERR_NETWORK_CLIENT, "you set your player name to \"%s\"", player_name);
}
Error(ERR_NETWORK_CLIENT, "you set your player name to \"%s\"", player_name);
}
-void SendToServer_ProtocolVersion()
+void SendToServer_ProtocolVersion(
void
)
{
initNetworkBufferForWriting(write_buffer, OP_PROTOCOL_VERSION, 0);
{
initNetworkBufferForWriting(write_buffer, OP_PROTOCOL_VERSION, 0);
@@
-388,7
+417,7
@@
void SendToServer_NrWanted(int nr_wanted)
SendNetworkBufferToServer(write_buffer);
}
SendNetworkBufferToServer(write_buffer);
}
-void SendToServer_LevelFile()
+void SendToServer_LevelFile(
void
)
{
initNetworkBufferForWriting(write_buffer, OP_LEVEL_FILE, 0);
{
initNetworkBufferForWriting(write_buffer, OP_LEVEL_FILE, 0);
@@
-410,7
+439,7
@@
void SendToServer_LevelFile()
setString(&network_level.leveldir_identifier, leveldir_current->identifier);
setString(&network_level.leveldir_identifier, leveldir_current->identifier);
- /
* the sending client does not use network level files (but the real ones) */
+ /
/ the sending client does not use network level files (but the real ones)
network_level.use_network_level_files = FALSE;
#if 0
network_level.use_network_level_files = FALSE;
#if 0
@@
-426,7
+455,7
@@
void SendToServer_LevelFile()
#endif
}
#endif
}
-void SendToServer_StartPlaying()
+void SendToServer_StartPlaying(
void
)
{
unsigned int new_random_seed = InitRND(level.random_seed);
{
unsigned int new_random_seed = InitRND(level.random_seed);
@@
-439,14
+468,14
@@
void SendToServer_StartPlaying()
SendNetworkBufferToServer(write_buffer);
}
SendNetworkBufferToServer(write_buffer);
}
-void SendToServer_PausePlaying()
+void SendToServer_PausePlaying(
void
)
{
initNetworkBufferForWriting(write_buffer, OP_PAUSE_PLAYING, 0);
SendNetworkBufferToServer(write_buffer);
}
{
initNetworkBufferForWriting(write_buffer, OP_PAUSE_PLAYING, 0);
SendNetworkBufferToServer(write_buffer);
}
-void SendToServer_ContinuePlaying()
+void SendToServer_ContinuePlaying(
void
)
{
initNetworkBufferForWriting(write_buffer, OP_CONTINUE_PLAYING, 0);
{
initNetworkBufferForWriting(write_buffer, OP_CONTINUE_PLAYING, 0);
@@
-471,7
+500,7
@@
void SendToServer_MovePlayer(byte player_action)
SendNetworkBufferToServer(write_buffer);
}
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);
{
int protocol_version_major = getNetworkBuffer8BitInteger(read_buffer);
int protocol_version_minor = getNetworkBuffer8BitInteger(read_buffer);
@@
-494,7
+523,7
@@
static void Handle_OP_BAD_PROTOCOL_VERSION()
stop_network_client = TRUE;
}
stop_network_client = TRUE;
}
-static void Handle_OP_YOUR_NUMBER()
+static void Handle_OP_YOUR_NUMBER(
void
)
{
int old_client_nr = getNetworkBuffer8BitInteger(read_buffer);
int new_client_nr = getNetworkBuffer8BitInteger(read_buffer);
{
int old_client_nr = getNetworkBuffer8BitInteger(read_buffer);
int new_client_nr = getNetworkBuffer8BitInteger(read_buffer);
@@
-507,7
+536,7
@@
static void Handle_OP_YOUR_NUMBER()
if (old_local_player != new_local_player)
{
if (old_local_player != new_local_player)
{
- /
* set relevant player settings and change to new player */
+ /
/ set relevant player settings and change to new player
local_player = new_local_player;
local_player = new_local_player;
@@
-526,7
+555,7
@@
static void Handle_OP_YOUR_NUMBER()
stored_player[new_index_nr].connected_network = TRUE;
}
stored_player[new_index_nr].connected_network = TRUE;
}
-static void Handle_OP_NUMBER_WANTED()
+static void Handle_OP_NUMBER_WANTED(
void
)
{
int old_client_nr = getNetworkBuffer8BitInteger(read_buffer);
int client_nr_wanted = getNetworkBuffer8BitInteger(read_buffer);
{
int old_client_nr = getNetworkBuffer8BitInteger(read_buffer);
int client_nr_wanted = getNetworkBuffer8BitInteger(read_buffer);
@@
-539,19
+568,19
@@
static void Handle_OP_NUMBER_WANTED()
printf("OP_NUMBER_WANTED: %d\n", old_client_nr);
printf("OP_NUMBER_WANTED: %d\n", old_client_nr);
- if (new_client_nr == client_nr_wanted) /
* switching succeeded */
+ if (new_client_nr == client_nr_wanted) /
/ switching succeeded
{
struct NetworkClientPlayerInfo *player;
{
struct NetworkClientPlayerInfo *player;
- if (old_client_nr != client_nr_wanted) /
* client's nr has changed */
+ 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);
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 */
+ else if (old_client_nr == first_player.nr) /
/ local player keeps his nr
Error(ERR_NETWORK_CLIENT, "keeping client # %d", new_client_nr);
if (old_client_nr != new_client_nr)
{
Error(ERR_NETWORK_CLIENT, "keeping client # %d", new_client_nr);
if (old_client_nr != new_client_nr)
{
- /
* set relevant player settings and change to new player */
+ /
/ set relevant player settings and change to new player
old_player->connected_network = FALSE;
new_player->connected_network = TRUE;
old_player->connected_network = FALSE;
new_player->connected_network = TRUE;
@@
-560,7
+589,7
@@
static void Handle_OP_NUMBER_WANTED()
player = getNetworkPlayer(old_client_nr);
player->nr = new_client_nr;
player = getNetworkPlayer(old_client_nr);
player->nr = new_client_nr;
- if (old_player == local_player) /
* local player switched */
+ if (old_player == local_player) /
/ local player switched
{
local_player = new_player;
{
local_player = new_player;
@@
-568,7
+597,7
@@
static void Handle_OP_NUMBER_WANTED()
new_player->connected_locally = TRUE;
}
}
new_player->connected_locally = TRUE;
}
}
- else if (old_client_nr == first_player.nr) /
* failed -- local player? */
+ else if (old_client_nr == first_player.nr) /
/ failed -- local player?
{
char request[100];
{
char request[100];
@@
-585,7
+614,7
@@
static void Handle_OP_NUMBER_WANTED()
DrawNetworkPlayers();
}
DrawNetworkPlayers();
}
-static void Handle_OP_PLAYER_NAME()
+static void Handle_OP_PLAYER_NAME(
void
)
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
char *player_name = getNetworkBufferString(read_buffer);
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
char *player_name = getNetworkBufferString(read_buffer);
@@
-600,7
+629,7
@@
static void Handle_OP_PLAYER_NAME()
player_nr, player->name);
}
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 = getNetworkBuffer8BitInteger(read_buffer);
{
struct NetworkClientPlayerInfo *player, *last_player = NULL;
int new_client_nr = getNetworkBuffer8BitInteger(read_buffer);
@@
-626,7
+655,7
@@
static void Handle_OP_PLAYER_CONNECTED()
stored_player[new_index_nr].connected_network = TRUE;
}
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 = getNetworkBuffer8BitInteger(read_buffer);
{
struct NetworkClientPlayerInfo *player, *player_disconnected;
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
@@
-664,7
+693,7
@@
static void Handle_OP_PLAYER_DISCONNECTED()
}
}
}
}
-static void Handle_OP_START_PLAYING()
+static void Handle_OP_START_PLAYING(
void
)
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
char *new_leveldir_identifier = getNetworkBufferString(read_buffer);
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
char *new_leveldir_identifier = getNetworkBufferString(read_buffer);
@@
-694,21
+723,20
@@
static void Handle_OP_START_PLAYING()
level_nr = new_level_nr;
}
level_nr = new_level_nr;
}
- /
* needed if level set of network game changed graphics, sounds or music */
+ /
/ needed if level set of network game changed graphics, sounds or music
ReloadCustomArtwork(0);
TapeErase();
if (network_level.use_network_level_files)
ReloadCustomArtwork(0);
TapeErase();
if (network_level.use_network_level_files)
- LoadLevelFromNetwork(&network_level.file_info,
- &network_level.tmpl_info);
+ LoadNetworkLevel(&network_level);
else
LoadLevel(level_nr);
StartGameActions(FALSE, setup.autorecord, new_random_seed);
}
else
LoadLevel(level_nr);
StartGameActions(FALSE, setup.autorecord, new_random_seed);
}
-static void Handle_OP_PAUSE_PLAYING()
+static void Handle_OP_PAUSE_PLAYING(
void
)
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
@@
-722,7
+750,7
@@
static void Handle_OP_PAUSE_PLAYING()
}
}
}
}
-static void Handle_OP_CONTINUE_PLAYING()
+static void Handle_OP_CONTINUE_PLAYING(
void
)
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
@@
-736,7
+764,7
@@
static void Handle_OP_CONTINUE_PLAYING()
}
}
}
}
-static void Handle_OP_STOP_PLAYING()
+static void Handle_OP_STOP_PLAYING(
void
)
{
int client_nr = getNetworkBuffer8BitInteger(read_buffer);
int cause_for_stopping = getNetworkBuffer8BitInteger(read_buffer);
{
int client_nr = getNetworkBuffer8BitInteger(read_buffer);
int cause_for_stopping = getNetworkBuffer8BitInteger(read_buffer);
@@
-752,11
+780,12
@@
static void Handle_OP_STOP_PLAYING()
boolean stopped_by_remote_player = (!client_player->connected_locally);
char message[100];
boolean stopped_by_remote_player = (!client_player->connected_locally);
char message[100];
- sprintf(message, (cause_for_stopping == NETWORK_STOP_BY_PLAYER ?
- "Network game stopped by player %d!" :
- cause_for_stopping == 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 (cause_for_stopping != NETWORK_STOP_BY_PLAYER ||
stopped_by_remote_player)
if (cause_for_stopping != NETWORK_STOP_BY_PLAYER ||
stopped_by_remote_player)
@@
-768,7
+797,7
@@
static void Handle_OP_STOP_PLAYING()
}
}
}
}
-static void Handle_OP_MOVE_PLAYER()
+static void Handle_OP_MOVE_PLAYER(
void
)
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
int server_frame_counter = getNetworkBuffer32BitInteger(read_buffer);
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
int server_frame_counter = getNetworkBuffer32BitInteger(read_buffer);
@@
-790,7
+819,7
@@
static void Handle_OP_MOVE_PLAYER()
return;
}
return;
}
- /
* copy valid player actions (will be set to 0 for not connected players) */
+ /
/ 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 =
getNetworkBuffer8BitInteger(read_buffer);
for (i = 0; i < MAX_PLAYERS; i++)
stored_player[i].effective_action =
getNetworkBuffer8BitInteger(read_buffer);
@@
-798,7
+827,7
@@
static void Handle_OP_MOVE_PLAYER()
network_player_action_received = TRUE;
}
network_player_action_received = TRUE;
}
-static void Handle_OP_BROADCAST_MESSAGE()
+static void Handle_OP_BROADCAST_MESSAGE(
void
)
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
@@
-806,7
+835,7
@@
static void Handle_OP_BROADCAST_MESSAGE()
Error(ERR_NETWORK_CLIENT, "client %d sends message", player_nr);
}
Error(ERR_NETWORK_CLIENT, "client %d sends message", player_nr);
}
-static void Handle_OP_LEVEL_FILE()
+static void Handle_OP_LEVEL_FILE(
void
)
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
char *leveldir_identifier;
{
int player_nr = getNetworkBuffer8BitInteger(read_buffer);
char *leveldir_identifier;
@@
-825,6
+854,9
@@
static void Handle_OP_LEVEL_FILE()
leveldir_identifier = getStringCopy(getNetworkBufferString(read_buffer));
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);
InitNetworkLevelDirectory(leveldir_identifier);
network_level_dir = getNetworkLevelDir(leveldir_identifier);
@@
-835,7
+867,14
@@
static void Handle_OP_LEVEL_FILE()
file_info->basename = getStringCopy(getNetworkBufferString(read_buffer));
file_info->filename = getPath2(network_level_dir, file_info->basename);
file_info->basename = getStringCopy(getNetworkBufferString(read_buffer));
file_info->filename = getPath2(network_level_dir, file_info->basename);
- getNetworkBufferFile(read_buffer, file_info->filename);
+ if (hasPathSeparator(file_info->basename))
+ Error(ERR_EXIT, "protocol error: invalid filename from network client");
+
+ int num_bytes = getNetworkBufferFile(read_buffer, file_info->filename);
+
+ // if received level file is empty, remove it (as being non-existent)
+ if (num_bytes == 0)
+ remove(file_info->filename);
use_custom_template = getNetworkBuffer8BitInteger(read_buffer);
if (use_custom_template)
use_custom_template = getNetworkBuffer8BitInteger(read_buffer);
if (use_custom_template)
@@
-845,13
+884,20
@@
static void Handle_OP_LEVEL_FILE()
tmpl_info->basename = getStringCopy(getNetworkBufferString(read_buffer));
tmpl_info->filename = getPath2(network_level_dir, tmpl_info->basename);
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);
getNetworkBufferFile(read_buffer, tmpl_info->filename);
+
+ // if received level file is empty, use level template file instead
+ if (num_bytes == 0)
+ setString(&file_info->filename, tmpl_info->filename);
}
network_level.leveldir_identifier = leveldir_identifier;
network_level.use_custom_template = use_custom_template;
}
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 */
+ /
/ the receiving client(s) use(s) the transferred network level files
network_level.use_network_level_files = TRUE;
#if 0
network_level.use_network_level_files = TRUE;
#if 0
@@
-867,7
+913,7
@@
static void Handle_OP_LEVEL_FILE()
#endif
}
#endif
}
-static void HandleNetworkingMessage()
+static void HandleNetworkingMessage(
void
)
{
stop_network_game = FALSE;
{
stop_network_game = FALSE;
@@
-937,16
+983,16
@@
static void HandleNetworkingMessage()
fflush(stdout);
fflush(stdout);
- /
* in case of internal error, stop network game */
+ /
/ in case of internal error, stop network game
if (stop_network_game)
SendToServer_StopPlaying(NETWORK_STOP_BY_ERROR);
}
if (stop_network_game)
SendToServer_StopPlaying(NETWORK_STOP_BY_ERROR);
}
-static char *HandleNetworkingPackets()
+static char *HandleNetworkingPackets(
void
)
{
while (1)
{
{
while (1)
{
- /
* ---------- check network server for activity ---------- */
+ /
/ ---------- check network server for activity ----------
int num_active_sockets = SDLNet_CheckSockets(rfds, 0);
int num_active_sockets = SDLNet_CheckSockets(rfds, 0);
@@
-956,7
+1002,7
@@
static char *HandleNetworkingPackets()
if (num_active_sockets == 0)
break; // no active sockets, stop here
if (num_active_sockets == 0)
break; // no active sockets, stop here
- /
* ---------- read packets from network server ---------- */
+ /
/ ---------- read packets from network server ----------
initNetworkBufferForReceiving(read_buffer);
initNetworkBufferForReceiving(read_buffer);
@@
-988,7
+1034,7
@@
static void FreeNetworkClientPlayerInfo(struct NetworkClientPlayerInfo *player)
checked_free(player);
}
checked_free(player);
}
-static void HandleNetworkingDisconnect()
+static void HandleNetworkingDisconnect(
void
)
{
int i;
{
int i;
@@
-1011,8
+1057,12
@@
static void HandleNetworkingDisconnect()
first_player.next = NULL;
}
first_player.next = NULL;
}
-void HandleNetworking()
+void HandleNetworking(
void
)
{
{
+ // do not handle any networking packets if request dialog is active
+ if (game.request_active)
+ return;
+
char *error_message = HandleNetworkingPackets();
if (error_message != NULL)
char *error_message = HandleNetworkingPackets();
if (error_message != NULL)
@@
-1037,7
+1087,7
@@
void HandleNetworking()
}
}
}
}
-void DisconnectFromNetworkServer()
+void DisconnectFromNetworkServer(
void
)
{
DrawNetworkText_Title("Terminating Network");
DrawNetworkText("Disconnecting from network server ...");
{
DrawNetworkText_Title("Terminating Network");
DrawNetworkText("Disconnecting from network server ...");
@@
-1045,7
+1095,4
@@
void DisconnectFromNetworkServer()
HandleNetworkingDisconnect();
DrawNetworkText_Success("Successfully disconnected!");
HandleNetworkingDisconnect();
DrawNetworkText_Success("Successfully disconnected!");
-
- /* short time to recognize result of network initialization */
- Delay_WithScreenUpdates(1000);
}
}