X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fnetwork.c;h=104b83f9bb2df69b3e36c2f83107fe37d0bd6772;hb=37a06df577bbfd00f4b361f92cacb0d97036ba93;hp=fba7b48c05431289c2cbebbfbb4453e13835ea2f;hpb=838825e11f7e4af0947bf9d40061defd4e499017;p=rocksndiamonds.git

diff --git a/src/network.c b/src/network.c
index fba7b48c..104b83f9 100644
--- a/src/network.c
+++ b/src/network.c
@@ -13,16 +13,21 @@
 
 #include "libgame/platform.h"
 
-#if defined(PLATFORM_UNIX)
+#if defined(NETWORK_AVALIABLE)
 
 #include <signal.h>
 #include <sys/time.h>
+
+#if defined(TARGET_SDL)
+#include "main.h"
+#else
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#endif
 
 #include "libgame/libgame.h"
 
@@ -50,7 +55,13 @@ static struct NetworkClientPlayerInfo first_player =
 
 /* server stuff */
 
-static int sfd;
+#if defined(TARGET_SDL)
+static TCPsocket sfd;		/* server socket */
+static SDLNet_SocketSet rfds;	/* socket set */
+#else
+static int sfd;			/* server socket */
+#endif
+
 static byte realbuffer[512];
 static byte readbuffer[MAX_BUFFER_SIZE], writbuffer[MAX_BUFFER_SIZE];
 static byte *buffer = realbuffer + 4;
@@ -72,7 +83,11 @@ static void SendBufferToServer(int size)
   nwrite += 4 + size;
 
   /* directly send the buffer to the network server */
+#if defined(TARGET_SDL)
+  SDLNet_TCP_Send(sfd, writbuffer, nwrite);
+#else
   write(sfd, writbuffer, nwrite);
+#endif
   nwrite = 0;
 }
 
@@ -100,7 +115,7 @@ char *getNetworkPlayerName(int player_nr)
   else if (player_nr == first_player.nr)
     return("you");
   else
-    for (player=&first_player; player; player=player->next)
+    for (player = &first_player; player; player = player->next)
       if (player->nr == player_nr && player->name && strlen(player->name))
 	return(player->name);
 
@@ -109,6 +124,15 @@ char *getNetworkPlayerName(int player_nr)
 
 static void StartNetworkServer(int port)
 {
+#if defined(TARGET_SDL)
+  static int p;
+
+  p = port;
+  server_thread = SDL_CreateThread(NetworkServerThread, &p);
+  network_server = TRUE;
+
+#else
+
   switch (fork())
   {
     case 0:
@@ -127,8 +151,68 @@ static void StartNetworkServer(int port)
       /* we are parent process -- resume normal operation */
       return;
   }
+#endif
+}
+
+#if defined(TARGET_SDL)
+boolean ConnectToServer(char *hostname, int port)
+{
+  IPaddress ip;
+  int i;
+
+  if (port == 0)
+    port = DEFAULT_SERVER_PORT;
+
+  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
+  {
+    SDLNet_Write32(0x7f000001, &ip.host);	/* 127.0.0.1 */
+    SDLNet_Write16(port, &ip.port);
+  }
+
+  sfd = SDLNet_TCP_Open(&ip);
+
+  if (sfd)
+  {
+    SDLNet_TCP_AddSocket(rfds, sfd);
+    return TRUE;
+  }
+  else
+  {
+    printf("SDLNet_TCP_Open(): %s\n", SDLNet_GetError());
+  }
+
+  if (hostname)			/* connect to specified server failed */
+    return FALSE;
+
+  printf("No rocksndiamonds server on localhost -- starting up one ...\n");
+  StartNetworkServer(port);
+
+  /* wait for server to start up and try connecting several times */
+  for (i = 0; i < 6; i++)
+  {
+    Delay(500);			/* wait 500 ms == 0.5 seconds */
+
+    if ((sfd = SDLNet_TCP_Open(&ip)))		/* connected */
+    {
+      SDLNet_TCP_AddSocket(rfds, sfd);
+      return TRUE;
+    }
+  }
+
+  /* when reaching this point, connect to newly started server has failed */
+  return FALSE;
 }
 
+#else
+
 boolean ConnectToServer(char *hostname, int port)
 {
   struct sockaddr_in s;
@@ -169,11 +253,11 @@ boolean ConnectToServer(char *hostname, int port)
   if (hostname)	/* connect to specified server failed */
     return FALSE;
 
-  printf("No rocksndiamonds server on localhost - starting up one ...\n");
+  printf("No rocksndiamonds server on localhost -- starting up one ...\n");
   StartNetworkServer(port);
 
   /* wait for server to start up and try connecting several times */
-  for (i=0; i<6; i++)
+  for (i = 0; i < 6; i++)
   {
     Delay(500);		/* wait 500 ms == 0.5 seconds */
     close(sfd);
@@ -191,6 +275,7 @@ boolean ConnectToServer(char *hostname, int port)
   /* when reaching this point, connect to newly started server has failed */
   return FALSE;
 }
+#endif	/* defined(TARGET_SDL) */
 
 void SendToServer_PlayerName(char *player_name)
 {
@@ -266,7 +351,7 @@ void SendToServer_StopPlaying()
 
 void SendToServer_MovePlayer(byte player_action)
 {
-  buffer[1] = OP_MOVE_FIGURE;
+  buffer[1] = OP_MOVE_PLAYER;
   buffer[2] = player_action;
 
   SendBufferToServer(3);
@@ -300,7 +385,7 @@ static void Handle_OP_YOUR_NUMBER()
   }
 
   if (first_player.nr > MAX_PLAYERS)
-    Error(ERR_EXIT, "sorry - no more than %d players", 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);
 }
@@ -378,7 +463,7 @@ static void Handle_OP_PLAYER_CONNECTED()
   printf("OP_PLAYER_CONNECTED: %d\n", new_client_nr);
   Error(ERR_NETWORK_CLIENT, "new client %d connected", new_client_nr);
 
-  for (player=&first_player; player; player=player->next)
+  for (player = &first_player; player; player = player->next)
   {
     if (player->nr == new_client_nr)
       Error(ERR_EXIT, "multiplayer server sent duplicate player id");
@@ -405,7 +490,7 @@ static void Handle_OP_PLAYER_DISCONNECTED()
   Error(ERR_NETWORK_CLIENT, "client %d (%s) disconnected",
 	player_nr, getNetworkPlayerName(buffer[0]));
 
-  for (player=&first_player; player; player=player->next)
+  for (player = &first_player; player; player = player->next)
     if (player->next == player_disconnected)
       player->next = player_disconnected->next;
   free(player_disconnected);
@@ -415,12 +500,12 @@ static void Handle_OP_START_PLAYING()
 {
   LevelDirTree *new_leveldir;
   int new_level_nr;
-  int dummy;				/* !!! HAS NO MEANING ANYMORE !!! */
+  int dummy;
   unsigned long new_random_seed;
   char *new_leveldir_identifier;
 
   new_level_nr = (buffer[2] << 8) + buffer[3];
-  dummy = (buffer[4] << 8) + buffer[5];
+  dummy = (buffer[4] << 8) + buffer[5];			/* (obsolete) */
   new_random_seed =
     (buffer[6] << 24) | (buffer[7] << 16) | (buffer[8] << 8) | (buffer[9]);
   new_leveldir_identifier = (char *)&buffer[10];
@@ -447,6 +532,9 @@ static void Handle_OP_START_PLAYING()
   LoadTape(level_nr);
   LoadLevel(level_nr);
 
+#if 1
+  StartGameActions(FALSE, setup.autorecord, new_random_seed);
+#else
   if (setup.autorecord)
     TapeStartRecording();
 
@@ -455,8 +543,9 @@ static void Handle_OP_START_PLAYING()
 
   InitRND(new_random_seed);
 
-  game_status = PLAYING;
+  game_status = GAME_MODE_PLAYING;
   InitGame();
+#endif
 }
 
 static void Handle_OP_PAUSE_PLAYING()
@@ -482,11 +571,11 @@ static void Handle_OP_STOP_PLAYING()
   printf("OP_STOP_PLAYING: %d\n", buffer[0]);
   Error(ERR_NETWORK_CLIENT, "client %d stops game", buffer[0]);
 
-  game_status = MAINMENU;
+  game_status = GAME_MODE_MAIN;
   DrawMainMenu();
 }
 
-static void Handle_OP_MOVE_FIGURE(unsigned int len)
+static void Handle_OP_MOVE_PLAYER(unsigned int len)
 {
   int server_frame_counter;
   int i;
@@ -506,7 +595,7 @@ static void Handle_OP_MOVE_FIGURE(unsigned int len)
   }
 
   /* copy valid player actions */
-  for (i=0; i<MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_PLAYERS; i++)
     stored_player[i].effective_action =
       (i < len - 6 && stored_player[i].active ? buffer[6 + i] : 0);
 
@@ -569,8 +658,8 @@ static void HandleNetworkingMessages()
 	Handle_OP_STOP_PLAYING();
 	break;
 
-      case OP_MOVE_FIGURE:
-	Handle_OP_MOVE_FIGURE(message_length);
+      case OP_MOVE_PLAYER:
+	Handle_OP_MOVE_PLAYER(message_length);
 	break;
 
       case OP_BROADCAST_MESSAGE:
@@ -583,39 +672,60 @@ static void HandleNetworkingMessages()
   fflush(stdout);
 }
 
+/* TODO */
+
 void HandleNetworking()
 {
+#if !defined(TARGET_SDL)
   static struct timeval tv = { 0, 0 };
   fd_set rfds;
+#endif
   int r = 0;
 
-  FD_ZERO(&rfds);
-  FD_SET(sfd, &rfds);
-
-  r = select(sfd + 1, &rfds, NULL, NULL, &tv);
+  do
+  {
+#if defined(TARGET_SDL)
+    if ((r = SDLNet_CheckSockets(rfds, 1)) < 0)
+      Error(ERR_EXIT, "HandleNetworking(): SDLNet_CheckSockets() failed");
 
-  if (r < 0 && errno != EINTR)
-    Error(ERR_EXIT, "HandleNetworking(): select() failed");
+#else
 
-  if (r < 0)
     FD_ZERO(&rfds);
+    FD_SET(sfd, &rfds);
 
-  if (FD_ISSET(sfd, &rfds))
-  {
-    int r;
+    r = select(sfd + 1, &rfds, NULL, NULL, &tv);
 
-    r = read(sfd, readbuffer + nread, MAX_BUFFER_SIZE - nread);
+    if (r < 0 && errno != EINTR)
+      Error(ERR_EXIT, "HandleNetworking(): select() failed");
 
     if (r < 0)
-      Error(ERR_EXIT, "error reading from network server");
+      FD_ZERO(&rfds);
+#endif
+
+#if defined(TARGET_SDL)
+    if (r > 0)
+#else
+    if (FD_ISSET(sfd, &rfds))
+#endif
+    {
+#if defined(TARGET_SDL)
+      r = SDLNet_TCP_Recv(sfd, readbuffer + nread, 1);
+#else
+      r = read(sfd, readbuffer + nread, MAX_BUFFER_SIZE - nread);
+#endif
+
+      if (r < 0)
+	Error(ERR_EXIT, "error reading from network server");
 
-    if (r == 0)
-      Error(ERR_EXIT, "connection to network server lost");
+      if (r == 0)
+	Error(ERR_EXIT, "connection to network server lost");
 
-    nread += r;
+      nread += r;
 
-    HandleNetworkingMessages();
+      HandleNetworkingMessages();
+    }
   }
+  while (r > 0);
 }
 
 #endif /* PLATFORM_UNIX */