X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fnetwork.c;h=226ce34cce0b98ee65d5572dd3268536781129b7;hp=bfe53c37c829e388dbf5ffb2bb197f9be720ef2e;hb=115ce6f2da1914d68b0fe0e5f9082973190dacdd;hpb=bb49e2b2a9bb4aefe76182be725e998bf9495976

diff --git a/src/network.c b/src/network.c
index bfe53c37..226ce34c 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
 {
@@ -37,15 +38,6 @@ static struct NetworkClientPlayerInfo first_player =
   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 */
 
 static TCPsocket sfd;		/* TCP server socket */
@@ -59,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 struct NetworkLevelFileInfo network_level;
+static struct NetworkLevelInfo network_level;
 
 static void DrawNetworkTextExt(char *message, int font_nr, boolean initialize)
 {
@@ -181,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;
@@ -367,7 +364,7 @@ void SendToServer_PlayerName(char *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);
 
@@ -387,7 +384,7 @@ void SendToServer_NrWanted(int nr_wanted)
   SendNetworkBufferToServer(write_buffer);
 }
 
-void SendToServer_LevelFile()
+void SendToServer_LevelFile(void)
 {
   initNetworkBufferForWriting(write_buffer, OP_LEVEL_FILE, 0);
 
@@ -425,7 +422,7 @@ void SendToServer_LevelFile()
 #endif
 }
 
-void SendToServer_StartPlaying()
+void SendToServer_StartPlaying(void)
 {
   unsigned int new_random_seed = InitRND(level.random_seed);
 
@@ -438,14 +435,14 @@ void SendToServer_StartPlaying()
   SendNetworkBufferToServer(write_buffer);
 }
 
-void SendToServer_PausePlaying()
+void SendToServer_PausePlaying(void)
 {
   initNetworkBufferForWriting(write_buffer, OP_PAUSE_PLAYING, 0);
 
   SendNetworkBufferToServer(write_buffer);
 }
 
-void SendToServer_ContinuePlaying()
+void SendToServer_ContinuePlaying(void)
 {
   initNetworkBufferForWriting(write_buffer, OP_CONTINUE_PLAYING, 0);
 
@@ -470,7 +467,7 @@ void SendToServer_MovePlayer(byte player_action)
   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);
@@ -493,7 +490,7 @@ static void Handle_OP_BAD_PROTOCOL_VERSION()
   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);
@@ -525,7 +522,7 @@ 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 old_client_nr    = getNetworkBuffer8BitInteger(read_buffer);
   int client_nr_wanted = getNetworkBuffer8BitInteger(read_buffer);
@@ -584,7 +581,7 @@ static void Handle_OP_NUMBER_WANTED()
     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);
@@ -599,7 +596,7 @@ static void Handle_OP_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);
@@ -625,7 +622,7 @@ 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 = getNetworkBuffer8BitInteger(read_buffer);
@@ -663,7 +660,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);
@@ -693,18 +690,20 @@ static void Handle_OP_START_PLAYING()
     level_nr = new_level_nr;
   }
 
+  /* needed if level set of network game changed graphics, sounds or music */
+  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);
 }
 
-static void Handle_OP_PAUSE_PLAYING()
+static void Handle_OP_PAUSE_PLAYING(void)
 {
   int player_nr = getNetworkBuffer8BitInteger(read_buffer);
 
@@ -718,7 +717,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);
 
@@ -732,7 +731,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);
@@ -748,11 +747,12 @@ static void Handle_OP_STOP_PLAYING()
     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)
@@ -764,7 +764,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);
@@ -794,7 +794,7 @@ static void Handle_OP_MOVE_PLAYER()
   network_player_action_received = TRUE;
 }
 
-static void Handle_OP_BROADCAST_MESSAGE()
+static void Handle_OP_BROADCAST_MESSAGE(void)
 {
   int player_nr = getNetworkBuffer8BitInteger(read_buffer);
 
@@ -802,7 +802,7 @@ static void Handle_OP_BROADCAST_MESSAGE()
   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;
@@ -820,6 +820,12 @@ static void Handle_OP_LEVEL_FILE()
   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);
@@ -828,7 +834,8 @@ static void Handle_OP_LEVEL_FILE()
   file_info->basename = getStringCopy(getNetworkBufferString(read_buffer));
   file_info->filename = getPath2(network_level_dir, file_info->basename);
 
-  InitNetworkLevelDirectory(leveldir_identifier);
+  if (hasPathSeparator(file_info->basename))
+    Error(ERR_EXIT, "protocol error: invalid filename from network client");
 
   getNetworkBufferFile(read_buffer, file_info->filename);
 
@@ -840,6 +847,9 @@ static void Handle_OP_LEVEL_FILE()
     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);
   }
 
@@ -862,7 +872,7 @@ static void Handle_OP_LEVEL_FILE()
 #endif
 }
 
-static void HandleNetworkingMessage()
+static void HandleNetworkingMessage(void)
 {
   stop_network_game = FALSE;
 
@@ -937,7 +947,7 @@ static void HandleNetworkingMessage()
     SendToServer_StopPlaying(NETWORK_STOP_BY_ERROR);
 }
 
-static char *HandleNetworkingPackets()
+static char *HandleNetworkingPackets(void)
 {
   while (1)
   {
@@ -983,7 +993,7 @@ static void FreeNetworkClientPlayerInfo(struct NetworkClientPlayerInfo *player)
   checked_free(player);
 }
 
-static void HandleNetworkingDisconnect()
+static void HandleNetworkingDisconnect(void)
 {
   int i;
 
@@ -1006,7 +1016,7 @@ static void HandleNetworkingDisconnect()
   first_player.next = NULL;
 }
 
-void HandleNetworking()
+void HandleNetworking(void)
 {
   char *error_message = HandleNetworkingPackets();
 
@@ -1032,7 +1042,7 @@ void HandleNetworking()
   }
 }
 
-void DisconnectFromNetworkServer()
+void DisconnectFromNetworkServer(void)
 {
   DrawNetworkText_Title("Terminating Network");
   DrawNetworkText("Disconnecting from network server ...");