added loading custom artwork for network games
[rocksndiamonds.git] / src / network.c
index 2d4e0e64f542ae9de19ba38e1d6a2d47374eb531..d780e0d548ecb0755171fd599fb670cd95652629 100644 (file)
-/***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
-*----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
-*----------------------------------------------------------*
-*  network.c                                               *
-***********************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//                         Holger Schemel
+//                 info@artsoft.org
+//                 http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// network.c
+// ============================================================================
+
 #include <signal.h>
-#include <sys/types.h>
 #include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <errno.h>
+
+#include "libgame/libgame.h"
 
 #include "network.h"
 #include "netserv.h"
+#include "main.h"
 #include "game.h"
 #include "tape.h"
 #include "files.h"
 #include "tools.h"
-#include "buttons.h"
 #include "screens.h"
-#include "misc.h"
-
-#define MAXNICKLEN 14
+#include "init.h"
 
-struct user
+struct NetworkClientPlayerInfo
 {
   byte nr;
-  char name[MAXNICKLEN+2];
-  struct user *next;
+  char name[MAX_PLAYER_NAME_LEN + 1];
+  struct NetworkClientPlayerInfo *next;
 };
 
-struct user me =
+static struct NetworkClientPlayerInfo first_player =
 {
   0,
-  "no name",
+  EMPTY_PLAYER_NAME,
   NULL
 };
 
-static char msgbuf[300];
+struct NetworkLevelFileInfo
+{
+  char *leveldir_identifier;
+  struct LevelFileInfo file_info;
+  struct LevelFileInfo tmpl_info;
+  boolean use_network_level_files;
+  boolean use_custom_template;
+};
 
 /* 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 TCPsocket sfd;          /* TCP server socket */
+static UDPsocket udp;          /* UDP server socket */
+static SDLNet_SocketSet rfds;  /* socket set */
 
-static void sysmsg(char *s)
+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 NetworkLevelFileInfo network_level;
+
+static void DrawNetworkTextExt(char *message, int font_nr, boolean initialize)
 {
-  if (verbose)
+  static int xpos = 0, ypos = 0;
+  static int max_line_width = 0;
+  int font_width = getFontWidth(font_nr);
+  int font_height = getFontHeight(font_nr);
+  int ypos_1 = 120;
+  int ypos_2 = 150;
+
+  if (initialize)
   {
-    printf("** %s\n", s);
-    fflush(stdout);
+    if (game_status == GAME_MODE_LOADING)
+    {
+      max_line_width = WIN_XSIZE;
+
+      xpos = (max_line_width - getTextWidth(message, font_nr)) / 2;
+      ypos = ypos_1;
+
+      DrawText(xpos, ypos, message, font_nr);
+
+      xpos = 0;
+      ypos = ypos_2;
+    }
+    else
+    {
+      max_line_width = SXSIZE;
+
+      DrawTextSCentered(ypos_1, font_nr, message);
+
+      /* 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;
+
+      xpos = SX + xoffset;
+      ypos = SY + ypos_2;
+    }
+
+    Error(ERR_DEBUG, "========== %s ==========", message);
   }
-}
+  else
+  {
+    int max_chars_per_line = max_line_width / font_width;
+    int max_lines_per_text = 10;
+    int num_lines_spacing = (font_nr == FC_YELLOW ? 1 : 3);
+    int num_lines_printed = DrawTextBuffer(xpos, ypos, message, font_nr,
+                                          max_chars_per_line, -1,
+                                          max_lines_per_text, 0, -1,
+                                          TRUE, TRUE, FALSE);
 
-static void *mmalloc(int n)
-{
-  void *r;
+    ypos += (num_lines_printed + num_lines_spacing) * font_height;
+
+    Error(ERR_DEBUG, "%s", message);
+  }
 
-  r = malloc(n);
-  if (r == NULL)
-    fatal("Out of memory");
-  return r;
+  BackToFront();
 }
 
-static void u_sleep(int i)
+static void DrawNetworkText(char *message)
 {
-  struct timeval tm;
-  tm.tv_sec = i / 1000000;
-  tm.tv_usec = i % 1000000;
-  select(0, NULL, NULL, NULL, &tm);
+  DrawNetworkTextExt(message, FC_YELLOW, FALSE);
 }
 
-static void flushbuf()
+static void DrawNetworkText_Success(char *message)
 {
-  if (nwrite)
-  {
-    write(sfd, writbuf, nwrite);
-    nwrite = 0;
-  }
+  DrawNetworkTextExt(message, FC_GREEN, FALSE);
 }
 
-static void sendbuf(int len)
+static void DrawNetworkText_Failed(char *message)
 {
-  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;
+  DrawNetworkTextExt(message, FC_RED, FALSE);
+}
 
+static void DrawNetworkText_Title(char *message)
+{
+  DrawNetworkTextExt(message, FC_GREEN, TRUE);
+}
 
-    flushbuf();
+static void SendNetworkBufferToServer(struct NetworkBuffer *nb)
+{
+  if (!network.enabled)
+    return;
 
+  /* set message length header */
+  putNetwork32BitInteger(nb->buffer, nb->size - 4);
 
-  }
+  /* directly send the buffer to the network server */
+  SDLNet_TCP_Send(sfd, nb->buffer, nb->size);
 }
 
-struct user *finduser(unsigned char c)
+struct NetworkClientPlayerInfo *getNetworkPlayer(int player_nr)
 {
-  struct user *u;
+  struct NetworkClientPlayerInfo *player = NULL;
+
+  for (player = &first_player; player; player = player->next)
+    if (player->nr == player_nr)
+      break;
 
-  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 */
+  if (player == NULL)  /* should not happen */
+    Error(ERR_EXIT, "protocol error: reference to non-existing player %d",
+         player_nr);
+
+  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 && strlen(player->name) > 0)
+       return(player->name);
 
-  return("no name");
+  return(EMPTY_PLAYER_NAME);
 }
 
 static void StartNetworkServer(int port)
 {
-  switch (fork())
-  {
-    case 0:
-      NetworkServer(port, serveronly);
+  static int p;
+
+  p = port;
+#if defined(TARGET_SDL2)
+  server_thread = SDL_CreateThread(NetworkServerThread,
+                                  "NetworkServerThread", &p);
+#else
+  server_thread = SDL_CreateThread(NetworkServerThread, &p);
+#endif
+  network_server = TRUE;
+}
 
-      /* never reached */
-      exit(0);
+boolean ConnectToServer(char *hostname, int port)
+{
+  IPaddress ip;
+  int server_host = 0;
+  int i;
 
-    case -1:
-      Error(ERR_RETURN,
-           "cannot create network server process - no network games");
-      standalone = TRUE;
-      return;
+  if (read_buffer == NULL)
+    read_buffer = newNetworkBuffer();
 
-    default:
-      /* we are parent process -- resume normal operation */
-      return;
-  }
-}
+  if (write_buffer == NULL)
+    write_buffer = newNetworkBuffer();
 
-BOOL ConnectToServer(char *host, int port)
-{
-  struct hostent *hp;
-  struct sockaddr_in s;
-  struct protoent *tcpproto;
-  int on = 1, i;
+  DrawNetworkText_Title("Initializing Network");
+
+  if (port == 0)
+    port = DEFAULT_SERVER_PORT;
 
-  if (host)
+  if (hostname == NULL)
   {
-    if ((s.sin_addr.s_addr = inet_addr(host)) == -1)
+    // if no hostname given, try to auto-detect network server in local network
+    // by doing a UDP broadcast on the network server port and wait for answer
+
+    SDLNet_SocketSet udp_socket_set = SDLNet_AllocSocketSet(1);
+    if (!udp_socket_set)
+      Error(ERR_EXIT, "SDLNet_AllocSocketSet() failed: %s"), SDLNet_GetError();
+
+    udp = SDLNet_UDP_Open(0);
+    if(!udp)
+      Error(ERR_EXIT, "SDLNet_UDP_Open() failed: %s", SDLNet_GetError());
+
+    if (SDLNet_UDP_AddSocket(udp_socket_set, udp) == -1)
+      Error(ERR_EXIT_NETWORK_SERVER, "SDLNet_TCP_AddSocket() failed: %s"),
+        SDLNet_GetError();
+
+    char *data_ptr = "network server UDB broadcast";
+    int data_len = strlen(data_ptr) + 1;
+    IPaddress ip_address;
+
+    SDLNet_Write32(0xffffffff, &ip_address.host);      /* 255.255.255.255 */
+    SDLNet_Write16(port,       &ip_address.port);
+
+    UDPpacket packet =
     {
-      hp = gethostbyname(host);
-      if (!hp)
-       fatal("Host not found");
-      s.sin_addr = *(struct in_addr *)(hp->h_addr_list[0]);
-    }
-  }
-  else
-    s.sin_addr.s_addr = inet_addr("127.0.0.1");
+      -1,
+      (Uint8 *)data_ptr,
+      data_len,
+      data_len,
+      0,
+      ip_address
+    };
 
-  if (port == 0)
-    port = DEFAULTPORT;
+    SDLNet_UDP_Send(udp, -1, &packet);
 
-  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");
-  if ((tcpproto = getprotobyname("tcp")) != NULL)
-    setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int));
+    DrawNetworkText("Looking for local network server ...");
 
-  if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) < 0)
-  {
-    if (!host)
+    /* wait for any local network server to answer UDP broadcast */
+    for (i = 0; i < 5; i++)
     {
-      printf("No rocksndiamonds server on localhost - starting up one ...\n");
+      if (SDLNet_CheckSockets(udp_socket_set, 0) == 1)
+      {
+       int num_packets = SDLNet_UDP_Recv(udp, &packet);
+
+       if (num_packets == 1)
+       {
+         DrawNetworkText_Success("Network server found!");
 
-      StartNetworkServer(port);
+         server_host = SDLNet_Read32(&packet.address.host);
+       }
+       else
+       {
+         DrawNetworkText_Failed("No answer from network server!");
+       }
 
-      for (i=0; i<6; i++)
+       break;
+      }
+      else
       {
-       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;
+       Delay_WithScreenUpdates(100);
       }
-      if (i==6)
-       fatal("Can't connect to server");
     }
+
+    if (server_host == 0)
+      DrawNetworkText_Failed("No network server found!");
+  }
+
+  rfds = SDLNet_AllocSocketSet(1);
+
+  if (hostname)
+  {
+    SDLNet_ResolveHost(&ip, hostname, port);
+
+    if (ip.host == INADDR_NONE)
+      Error(ERR_EXIT, "cannot locate host '%s'", hostname);
     else
-      fatal("Can't connect to server");
+      server_host = SDLNet_Read32(&ip.host);
+
+    DrawNetworkText("Connecting to remote host ...");
   }
+  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 */
+
+    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 ...",
+        (server_host >> 24) & 0xff,
+        (server_host >> 16) & 0xff,
+        (server_host >>  8) & 0xff,
+        (server_host >>  0) & 0xff);
+
+  sfd = SDLNet_TCP_Open(&ip);
+
+  if (sfd)
+  {
+    SDLNet_TCP_AddSocket(rfds, sfd);
+
+    DrawNetworkText_Success("Successfully connected!");
+
+    return TRUE;
+  }
+  else
+  {
+    DrawNetworkText_Failed("Failed to connect to network server!");
 
-  return(TRUE);
+    printf("SDLNet_TCP_Open(): %s\n", SDLNet_GetError());
+  }
+
+  if (hostname)                        /* connect to specified server failed */
+    return FALSE;
+
+  DrawNetworkText("Starting new local network server ...");
+
+  StartNetworkServer(port);
+
+  /* wait for server to start up and try connecting several times */
+  for (i = 0; i < 30; i++)
+  {
+    if ((sfd = SDLNet_TCP_Open(&ip)))          /* connected */
+    {
+      DrawNetworkText_Success("Successfully connected!");
+
+      SDLNet_TCP_AddSocket(rfds, sfd);
+      return TRUE;
+    }
+
+    Delay_WithScreenUpdates(100);
+  }
+
+  DrawNetworkText_Failed("Failed to connect to network server!");
+
+  /* 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];
+  initNetworkBufferForWriting(write_buffer, OP_PLAYER_NAME, 0);
+
+  putNetworkBufferString(write_buffer, 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);
+  SendNetworkBufferToServer(write_buffer);
+
+  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;
+  initNetworkBufferForWriting(write_buffer, OP_PROTOCOL_VERSION, 0);
+
+  putNetworkBuffer8BitInteger(write_buffer, PROTOCOL_VERSION_MAJOR);
+  putNetworkBuffer8BitInteger(write_buffer, PROTOCOL_VERSION_MINOR);
+  putNetworkBuffer8BitInteger(write_buffer, PROTOCOL_VERSION_PATCH);
 
-  sendbuf(5);
+  SendNetworkBufferToServer(write_buffer);
 }
 
 void SendToServer_NrWanted(int nr_wanted)
 {
-  buf[1] = OP_NUMBER_WANTED;
-  buf[2] = nr_wanted;
+  initNetworkBufferForWriting(write_buffer, OP_NUMBER_WANTED, 0);
 
-  sendbuf(3);
+  putNetworkBuffer8BitInteger(write_buffer, nr_wanted);
+
+  SendNetworkBufferToServer(write_buffer);
 }
 
-void SendToServer_StartPlaying()
+void SendToServer_LevelFile()
 {
-  unsigned long new_random_seed = InitRND(NEW_RANDOMIZE);
+  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);
 
-  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);
+  if (level.use_custom_template)
+  {
+    putNetworkBufferString(write_buffer, level_template.file_info.basename);
+    putNetworkBufferFile(  write_buffer, level_template.file_info.filename);
+  }
 
-  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);
+  SendNetworkBufferToServer(write_buffer);
 
-  strcpy(&buf[10], leveldir[leveldir_nr].name);
+  setString(&network_level.leveldir_identifier, leveldir_current->identifier);
 
-  sendbuf(10 + strlen(leveldir[leveldir_nr].name)+1);
+  /* the sending client does not use network level files (but the real ones) */
+  network_level.use_network_level_files = FALSE;
+
+#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);
+
+  if (level.use_custom_template)
+    printf("::: '%s'\n", level_template.file_info.filename);
+#endif
+}
+
+void SendToServer_StartPlaying()
+{
+  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);
+
+  SendNetworkBufferToServer(write_buffer);
 }
 
 void SendToServer_PausePlaying()
 {
-  buf[1] = OP_PAUSE_PLAYING;
+  initNetworkBufferForWriting(write_buffer, OP_PAUSE_PLAYING, 0);
 
-  sendbuf(2);
+  SendNetworkBufferToServer(write_buffer);
 }
 
 void SendToServer_ContinuePlaying()
 {
-  buf[1] = OP_CONTINUE_PLAYING;
+  initNetworkBufferForWriting(write_buffer, OP_CONTINUE_PLAYING, 0);
 
-  sendbuf(2);
+  SendNetworkBufferToServer(write_buffer);
 }
 
-void SendToServer_StopPlaying()
+void SendToServer_StopPlaying(int cause_for_stopping)
 {
-  buf[1] = OP_STOP_PLAYING;
+  initNetworkBufferForWriting(write_buffer, OP_STOP_PLAYING, 0);
+
+  putNetworkBuffer8BitInteger(write_buffer, cause_for_stopping);
 
-  sendbuf(2);
+  SendNetworkBufferToServer(write_buffer);
 }
 
 void SendToServer_MovePlayer(byte player_action)
 {
-  buf[1] = OP_MOVE_FIGURE;
-  buf[2] = player_action;
+  initNetworkBufferForWriting(write_buffer, OP_MOVE_PLAYER, 0);
 
-  sendbuf(3);
+  putNetworkBuffer8BitInteger(write_buffer, player_action);
+
+  SendNetworkBufferToServer(write_buffer);
 }
 
 static void Handle_OP_BAD_PROTOCOL_VERSION()
 {
-  Error(ERR_RETURN, "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);
+  int protocol_version_major = getNetworkBuffer8BitInteger(read_buffer);
+  int protocol_version_minor = getNetworkBuffer8BitInteger(read_buffer);
+
+  Error(ERR_WARN, "protocol version mismatch");
+  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()
 {
-  int new_client_nr = buf[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", buf[0]);
-  me.nr = new_client_nr;
+  printf("OP_YOUR_NUMBER: %d\n", old_client_nr);
+  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)
+  {
+    /* set relevant player settings and change to new player */
 
-  TestPlayer = new_index_nr;
+    local_player = new_local_player;
 
-  if (me.nr > MAX_PLAYERS)
-    Error(ERR_EXIT, "sorry - no more than %d players", MAX_PLAYERS);
+    old_local_player->connected_locally = FALSE;
+    new_local_player->connected_locally = TRUE;
 
-  sprintf(msgbuf, "you get client # %d", new_client_nr);
-  sysmsg(msgbuf);
+    old_local_player->connected_network = FALSE;
+    new_local_player->connected_network = TRUE;
+  }
+
+  if (first_player.nr > MAX_PLAYERS)
+    Error(ERR_EXIT, "sorry, more than %d players not allowed", MAX_PLAYERS);
+
+  Error(ERR_NETWORK_CLIENT, "you get client # %d", new_client_nr);
+
+  stored_player[new_index_nr].connected_network = TRUE;
 }
 
 static void Handle_OP_NUMBER_WANTED()
 {
-  int client_nr_wanted = buf[2];
-  int new_client_nr = buf[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", buf[0]);
+  printf("OP_NUMBER_WANTED: %d\n", old_client_nr);
 
-  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);
+
+    if (old_client_nr != new_client_nr)
+    {
+      /* set relevant player settings and change to new player */
+
+      old_player->connected_network = FALSE;
+      new_player->connected_network = TRUE;
+    }
+
+    player = getNetworkPlayer(old_client_nr);
+    player->nr = new_client_nr;
 
-    sprintf(msgbuf, "Sorry ! You are %s player !",
-           color[new_index_nr]);
-    Request(msgbuf, REQ_CONFIRM);
+    if (old_player == local_player)            /* local player switched */
+    {
+      local_player = new_player;
 
-    sprintf(msgbuf, "cannot switch -- you keep client # %d",
-           new_client_nr);
-    sysmsg(msgbuf);
+      old_player->connected_locally = FALSE;
+      new_player->connected_locally = TRUE;
+    }
   }
-  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);
+    char request[100];
 
-    me.nr = new_client_nr;
+    sprintf(request, "Sorry! Player %d already exists! You are player %d!",
+           index_nr_wanted + 1, new_index_nr + 1);
 
-    stored_player[new_index_nr] = *local_player;
-    local_player = &stored_player[new_index_nr];
+    Request(request, REQ_CONFIRM);
 
-    TestPlayer = new_index_nr;
+    Error(ERR_NETWORK_CLIENT, "cannot switch -- you keep client # %d",
+         new_client_nr);
   }
+
+  if (game_status == GAME_MODE_MAIN)
+    DrawNetworkPlayers();
 }
 
-static void Handle_OP_NICKNAME(unsigned int len)
+static void Handle_OP_PLAYER_NAME()
 {
-  struct user *u;
+  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);
 
-  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);
+  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\"",
+       player_nr, player->name);
 }
 
 static void Handle_OP_PLAYER_CONNECTED()
 {
-  struct user *u, *v = NULL;
+  struct NetworkClientPlayerInfo *player, *last_player = NULL;
+  int new_client_nr = getNetworkBuffer8BitInteger(read_buffer);
+  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;
-  }
 
-  v->next = u = mmalloc(sizeof(struct user));
-  u->nr = buf[0];
-  u->name[0] = '\0';
-  u->next = NULL;
-}
-
-static void Handle_OP_PLAYER_DISCONNECTED()
-{
-  struct user *u, *v;
+    last_player = player;
+  }
 
-  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);
+  last_player->next = player =
+    checked_malloc(sizeof(struct NetworkClientPlayerInfo));
+  player->nr = new_client_nr;
+  player->name[0] = '\0';
+  player->next = NULL;
 
-  for (v = &me; v; v = v->next)
-    if (v->next == u)
-      v->next = u->next;
-  free(u);
+  stored_player[new_index_nr].connected_network = TRUE;
 }
 
-static void Handle_OP_START_PLAYING()
+static void Handle_OP_PLAYER_DISCONNECTED()
 {
-  int new_level_nr, new_leveldir_nr;
-  unsigned long new_random_seed;
-  unsigned char *new_leveldir_name;
+  struct NetworkClientPlayerInfo *player, *player_disconnected;
+  int player_nr = getNetworkBuffer8BitInteger(read_buffer);
+  int index_nr = player_nr - 1;
 
-  /*
-    if (game_status == PLAYING)
-    break;
-  */
+  printf("OP_PLAYER_DISCONNECTED: %d\n", player_nr);
+  player_disconnected = getNetworkPlayer(player_nr);
+  Error(ERR_NETWORK_CLIENT, "client %d (%s) disconnected",
+       player_nr, getNetworkPlayerName(player_nr));
 
-  new_level_nr = (buf[2] << 8) + buf[3];
-  new_leveldir_nr = (buf[4] << 8) + buf[5];
-  new_random_seed =
-    (buf[6] << 24) | (buf[7] << 16) | (buf[8] << 8) | (buf[9]);
-  new_leveldir_name = &buf[10];
+  for (player = &first_player; player; player = player->next)
+    if (player->next == player_disconnected)
+      player->next = player_disconnected->next;
+  free(player_disconnected);
 
-  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);
+  stored_player[index_nr].connected_locally = FALSE;
+  stored_player[index_nr].connected_network = FALSE;
 
+  if (game_status == GAME_MODE_PLAYING)
+  {
+    char message[100];
 
-  if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0)
-    Error(ERR_RETURN, "no such level directory: '%s'",new_leveldir_name);
-
-  leveldir_nr = new_leveldir_nr;
+    sprintf(message, "Player %d left network server! Network game stopped!",
+           player_nr);
 
-  local_player->leveldir_nr = leveldir_nr;
-  LoadPlayerInfo(PLAYER_LEVEL);
-  SavePlayerInfo(PLAYER_SETUP);
+    Request(message, REQ_CONFIRM | REQ_STAY_CLOSED);
 
-  level_nr = new_level_nr;
+    SetGameStatus(GAME_MODE_MAIN);
 
-  TapeErase();
-  LoadLevelTape(level_nr);
+    DrawMainMenu();
+  }
+  else if (game_status == GAME_MODE_MAIN)
+  {
+    DrawNetworkPlayers();
+  }
+}
 
-  GetPlayerConfig();
-  LoadLevel(level_nr);
+static void Handle_OP_START_PLAYING()
+{
+  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);
 
+  if (!strEqual(new_leveldir_identifier, network_level.leveldir_identifier))
+  {
+    Error(ERR_WARN, "no such level identifier: '%s'", new_leveldir_identifier);
 
+    stop_network_game = TRUE;
 
-  if (autorecord_on)
-    TapeStartRecording();
+    return;
+  }
 
+  printf("OP_START_PLAYING: %d\n", player_nr);
+  Error(ERR_NETWORK_CLIENT,
+       "client %d starts game [level %d from level identifier '%s']\n",
+       player_nr, new_level_nr, new_leveldir_identifier);
 
+  LevelDirTree *new_leveldir =
+    getTreeInfoFromIdentifier(leveldir_first, new_leveldir_identifier);
 
-  if (tape.recording)
-    tape.random_seed = new_random_seed;
+  if (new_leveldir != NULL)
+  {
+    leveldir_current = new_leveldir;
+    level_nr = new_level_nr;
+  }
 
-  InitRND(new_random_seed);
+  /* needed if level set of network game changed graphics, sounds or music */
+  ReloadCustomArtwork(0);
 
+  TapeErase();
 
-  /*
-    printf("tape.random_seed == %d\n", tape.random_seed);
-  */
+  if (network_level.use_network_level_files)
+    LoadLevelFromNetwork(&network_level.file_info,
+                        &network_level.tmpl_info);
+  else
+    LoadLevel(level_nr);
 
-  game_status = PLAYING;
-  InitGame();
+  StartGameActions(FALSE, setup.autorecord, new_random_seed);
 }
 
 static void Handle_OP_PAUSE_PLAYING()
 {
-  printf("OP_PAUSE_PLAYING: %d\n", buf[0]);
-  sprintf(msgbuf, "client %d pauses game", buf[0]);
-  sysmsg(msgbuf);
+  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()
 {
-  printf("OP_CONTINUE_PLAYING: %d\n", buf[0]);
-  sprintf(msgbuf, "client %d continues game", buf[0]);
-  sysmsg(msgbuf);
+  int player_nr = getNetworkBuffer8BitInteger(read_buffer);
+
+  printf("OP_CONTINUE_PLAYING: %d\n", player_nr);
+  Error(ERR_NETWORK_CLIENT, "client %d continues game", player_nr);
 
-  tape.pausing = FALSE;
-  DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);
+  if (game_status == GAME_MODE_PLAYING)
+  {
+    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);
+  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 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, (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 ||
+       stopped_by_remote_player)
+      Request(message, REQ_CONFIRM | REQ_STAY_CLOSED);
+
+    SetGameStatus(GAME_MODE_MAIN);
+
+    DrawMainMenu();
+  }
 }
 
-static void Handle_OP_MOVE_FIGURE()
+static void Handle_OP_MOVE_PLAYER()
 {
-  int frame_nr;
+  int player_nr = getNetworkBuffer8BitInteger(read_buffer);
+  int server_frame_counter = getNetworkBuffer32BitInteger(read_buffer);
   int i;
 
-  frame_nr =
-    (buf[2] << 24) | (buf[3] << 16) | (buf[4] << 8) | (buf[5]);
+  if (!network_playing)
+    return;
 
-  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_EXIT,   "this should not happen -- please debug");
-  }
+    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");
 
-  for (i=0; i<MAX_PLAYERS; i++)
-  {
-    if (stored_player[i].active)
-      network_player_action[i] = buf[6 + i];
+    stop_network_game = TRUE;
+
+    return;
   }
 
+  /* 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);
+
   network_player_action_received = TRUE;
+}
+
+static void Handle_OP_BROADCAST_MESSAGE()
+{
+  int player_nr = getNetworkBuffer8BitInteger(read_buffer);
 
-  /*
-    sprintf(msgbuf, "frame %d: client %d moves player [0x%02x]",
-    FrameCounter, buf[0], buf[2]);
-    sysmsg(msgbuf);
-  */
+  printf("OP_BROADCAST_MESSAGE: %d\n", player_nr);
+  Error(ERR_NETWORK_CLIENT, "client %d sends message", player_nr);
 }
 
-static void handlemessages()
+static void Handle_OP_LEVEL_FILE()
 {
-  unsigned int len;
+  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;
 
-  while (nread >= 4 && nread >= 4 + readbuf[3])
+  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));
+  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);
+
+  InitNetworkLevelDirectory(leveldir_identifier);
+
+  getNetworkBufferFile(read_buffer, file_info->filename);
+
+  use_custom_template = getNetworkBuffer8BitInteger(read_buffer);
+  if (use_custom_template)
   {
-    len = readbuf[3];
-    if (readbuf[0] || readbuf[1] || readbuf[2])
-      fatal("Wrong server line length");
+    *tmpl_info = *file_info;
 
-    memcpy(buf, &readbuf[4], len);
-    nread -= 4 + len;
-    copydown(readbuf, readbuf + 4 + len, nread);
+    tmpl_info->basename = getStringCopy(getNetworkBufferString(read_buffer));
+    tmpl_info->filename = getPath2(network_level_dir, tmpl_info->basename);
 
-    switch(buf[1])
-    {
-      case OP_BAD_PROTOCOL_VERSION:
-       Handle_OP_BAD_PROTOCOL_VERSION();
-       break;
+    getNetworkBufferFile(read_buffer, tmpl_info->filename);
+  }
 
-      case OP_YOUR_NUMBER:
-       Handle_OP_YOUR_NUMBER();
-       break;
+  network_level.leveldir_identifier = leveldir_identifier;
+  network_level.use_custom_template = use_custom_template;
 
-      case OP_NUMBER_WANTED:
-       Handle_OP_NUMBER_WANTED();
-       break;
+  /* the receiving client(s) use(s) the transferred network level files */
+  network_level.use_network_level_files = TRUE;
 
-      case OP_NICKNAME:
-       Handle_OP_NICKNAME(len);
-       break;
+#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);
 
-      case OP_PLAYER_CONNECTED:
-       Handle_OP_PLAYER_CONNECTED();
-       break;
-      
-      case OP_PLAYER_DISCONNECTED:
-       Handle_OP_PLAYER_DISCONNECTED();
-       break;
+  if (use_custom_template)
+    printf("::: '%s'\n", tmpl_info->filename);
+#endif
+}
 
-      case OP_START_PLAYING:
-       Handle_OP_START_PLAYING();
-       break;
+static void HandleNetworkingMessage()
+{
+  stop_network_game = FALSE;
 
-      case OP_PAUSE_PLAYING:
-       Handle_OP_PAUSE_PLAYING();
-       break;
+  initNetworkBufferForReading(read_buffer);
 
-      case OP_CONTINUE_PLAYING:
-       Handle_OP_CONTINUE_PLAYING();
-       break;
+  int message_type = getNetworkBuffer8BitInteger(read_buffer);
 
-      case OP_STOP_PLAYING:
-       Handle_OP_STOP_PLAYING();
-       break;
+  switch (message_type)
+  {
+    case OP_BAD_PROTOCOL_VERSION:
+      Handle_OP_BAD_PROTOCOL_VERSION();
+      break;
 
-      case OP_MOVE_FIGURE:
-       Handle_OP_MOVE_FIGURE();
-       break;
+    case OP_YOUR_NUMBER:
+      Handle_OP_YOUR_NUMBER();
+      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_NUMBER_WANTED:
+      Handle_OP_NUMBER_WANTED();
+      break;
 
-      case OP_ZERO:
-       printf("OP_ZERO: %d\n", buf[0]);
-       sprintf(msgbuf, "client %d resets game counters", buf[0]);
-       sysmsg(msgbuf);
-       break;
+    case OP_PLAYER_NAME:
+      Handle_OP_PLAYER_NAME();
+      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]);
-       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_PAUSE_PLAYING:
+      Handle_OP_PAUSE_PLAYING();
+      break;
+
+    case OP_CONTINUE_PLAYING:
+      Handle_OP_CONTINUE_PLAYING();
+      break;
+
+    case OP_STOP_PLAYING:
+      Handle_OP_STOP_PLAYING();
+      break;
+
+    case OP_MOVE_PLAYER:
+      Handle_OP_MOVE_PLAYER();
+      break;
+
+    case OP_BROADCAST_MESSAGE:
+      Handle_OP_BROADCAST_MESSAGE();
+      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);
+
+  /* in case of internal error, stop network game */
+  if (stop_network_game)
+    SendToServer_StopPlaying(NETWORK_STOP_BY_ERROR);
 }
 
-void HandleNetworking()
+static char *HandleNetworkingPackets()
 {
-  static struct timeval tv = { 0, 0 };
-  fd_set rfds;
-  int r = 0;
+  while (1)
+  {
+    /* ---------- check network server for activity ---------- */
 
-  if (standalone)
-    return;
+    int num_active_sockets = SDLNet_CheckSockets(rfds, 0);
 
-  flushbuf();
+    if (num_active_sockets < 0)
+      return "Error checking network sockets!";
 
-  FD_ZERO(&rfds);
-  FD_SET(sfd, &rfds);
+    if (num_active_sockets == 0)
+      break;   // no active sockets, stop here
 
-  r = select(sfd + 1, &rfds, NULL, NULL, &tv);
+    /* ---------- read packets from network server ---------- */
 
-  if (r < 0 && errno != EINTR)
-  {
-    perror("select");
-    fatal("fatal: select() failed");
+    initNetworkBufferForReceiving(read_buffer);
+
+    int num_bytes = receiveNetworkBufferPacket(read_buffer, sfd);
+
+    if (num_bytes < 0)
+      return "Error reading from network server!";
+
+    if (num_bytes == 0)
+      return "Connection to network server lost!";
+
+    HandleNetworkingMessage();
+
+    if (stop_network_client)
+      return stop_network_client_message;
   }
 
-  if (r < 0)
-    FD_ZERO(&rfds);
+  return NULL;
+}
 
-  if (FD_ISSET(sfd, &rfds))
+static void FreeNetworkClientPlayerInfo(struct NetworkClientPlayerInfo *player)
+{
+  if (player == NULL)
+    return;
+
+  if (player->next)
+    FreeNetworkClientPlayerInfo(player->next);
+
+  checked_free(player);
+}
+
+static void HandleNetworkingDisconnect()
+{
+  int i;
+
+  SDLNet_TCP_DelSocket(rfds, sfd);
+  SDLNet_TCP_Close(sfd);
+
+  network_playing = FALSE;
+
+  network.enabled = FALSE;
+  network.connected = FALSE;
+
+  setup.network_mode = FALSE;
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+    stored_player[i].connected_network = FALSE;
+
+  FreeNetworkClientPlayerInfo(first_player.next);
+
+  first_player.nr = 0;
+  first_player.next = NULL;
+}
+
+void HandleNetworking()
+{
+  char *error_message = HandleNetworkingPackets();
+
+  if (error_message != NULL)
   {
-    int r;
+    HandleNetworkingDisconnect();
 
-    r = read(sfd, readbuf + nread, MAX_BUFFER_SIZE - nread);
+    if (game_status == GAME_MODE_PLAYING)
+    {
+      Request(error_message, REQ_CONFIRM | REQ_STAY_CLOSED);
+
+      SetGameStatus(GAME_MODE_MAIN);
 
-    if (r < 0)
-      fatal("Error reading from server");
-    if (r == 0)
-      fatal("Connection to server lost");
-    nread += r;
+      DrawMainMenu();
+    }
+    else
+    {
+      Request(error_message, REQ_CONFIRM);
 
-    handlemessages();
+      if (game_status == GAME_MODE_MAIN)
+       ClearNetworkPlayers();
+    }
   }
 }
+
+void DisconnectFromNetworkServer()
+{
+  DrawNetworkText_Title("Terminating Network");
+  DrawNetworkText("Disconnecting from network server ...");
+
+  HandleNetworkingDisconnect();
+
+  DrawNetworkText_Success("Successfully disconnected!");
+
+  /* short time to recognize result of network initialization */
+  Delay_WithScreenUpdates(1000);
+}