-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back! *
-*----------------------------------------------------------*
-* (c) 1995-2006 Artsoft Entertainment *
-* Holger Schemel *
-* Detmolder Strasse 189 *
-* 33604 Bielefeld *
-* Germany *
-* e-mail: info@artsoft.org *
-*----------------------------------------------------------*
-* network.c *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+// Holger Schemel
+// info@artsoft.org
+// http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// network.c
+// ============================================================================
#include "libgame/platform.h"
#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"
/* server stuff */
-#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];
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;
}
return("you");
else
for (player = &first_player; player; player = player->next)
- if (player->nr == player_nr && player->name && strlen(player->name))
+ if (player->nr == player_nr && strlen(player->name) > 0)
return(player->name);
return(EMPTY_PLAYER_NAME);
static void StartNetworkServer(int port)
{
-#if defined(TARGET_SDL)
static int p;
p = port;
- server_thread = SDL_CreateThread(NetworkServerThread, &p);
- network_server = TRUE;
-
+#if defined(TARGET_SDL2)
+ server_thread = SDL_CreateThread(NetworkServerThread,
+ "NetworkServerThread", &p);
#else
-
- switch (fork())
- {
- case 0:
- NetworkServer(port, options.serveronly);
-
- /* never reached */
- exit(0);
-
- case -1:
- Error(ERR_WARN,
- "cannot create network server process - no network playing");
- options.network = FALSE;
- return;
-
- default:
- /* we are parent process -- resume normal operation */
- return;
- }
+ server_thread = SDL_CreateThread(NetworkServerThread, &p);
#endif
+ network_server = TRUE;
}
-#if defined(TARGET_SDL)
boolean ConnectToServer(char *hostname, int port)
{
IPaddress ip;
return FALSE;
}
-#else
-
-boolean ConnectToServer(char *hostname, int port)
-{
- struct sockaddr_in s;
- struct protoent *tcpproto;
- int on = 1, i;
-
- if (hostname)
- {
- if ((s.sin_addr.s_addr = inet_addr(hostname)) == -1)
- {
- struct hostent *host;
-
- if ((host = gethostbyname(hostname)) == NULL)
- Error(ERR_EXIT, "cannot locate host '%s'", hostname);
-
- s.sin_addr = *(struct in_addr *)(host->h_addr_list[0]);
- }
- }
- else
- s.sin_addr.s_addr = inet_addr("127.0.0.1"); /* localhost */
-
- if (port == 0)
- port = DEFAULT_SERVER_PORT;
-
- s.sin_port = htons(port);
- s.sin_family = AF_INET;
-
- sfd = socket(PF_INET, SOCK_STREAM, 0);
- if (sfd < 0)
- Error(ERR_EXIT, "out of file descriptors");
-
- if ((tcpproto = getprotobyname("tcp")) != NULL)
- setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int));
-
- if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) == 0) /* connected */
- return TRUE;
-
- 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 */
- close(sfd);
-
- sfd = socket(PF_INET, SOCK_STREAM, 0);
- if (sfd < 0)
- Error(ERR_EXIT, "out of file descriptors");
-
- setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int));
-
- if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) >= 0) /* connected */
- return TRUE;
- }
-
- /* when reaching this point, connect to newly started server has failed */
- return FALSE;
-}
-#endif /* defined(TARGET_SDL) */
-
void SendToServer_PlayerName(char *player_name)
{
int len_player_name = strlen(player_name);
void SendToServer_StartPlaying()
{
- unsigned long new_random_seed = InitRND(NEW_RANDOMIZE);
+ unsigned int new_random_seed = InitRND(level.random_seed);
int dummy = 0; /* !!! HAS NO MEANING ANYMORE !!! */
/* the name of the level must be enough */
if (old_local_player != new_local_player)
{
- /* copy existing player settings and change to new player */
+ /* set relevant player settings and change to new player */
- *new_local_player = *old_local_player;
- old_local_player->connected = FALSE;
local_player = new_local_player;
+
+ old_local_player->connected_locally = FALSE;
+ new_local_player->connected_locally = TRUE;
+
+ old_local_player->connected_network = FALSE;
+ new_local_player->connected_network = TRUE;
}
if (first_player.nr > MAX_PLAYERS)
if (old_client_nr != new_client_nr)
{
- /* copy existing player settings and change to new player */
+ /* set relevant player settings and change to new player */
- *new_player = *old_player;
- old_player->connected = FALSE;
+ old_player->connected_network = FALSE;
+ new_player->connected_network = TRUE;
}
player = getNetworkPlayer(old_client_nr);
player->nr = new_client_nr;
if (old_player == local_player) /* local player switched */
+ {
local_player = new_player;
+
+ old_player->connected_locally = FALSE;
+ new_player->connected_locally = TRUE;
+ }
}
else if (old_client_nr == first_player.nr) /* failed -- local player? */
{
char request[100];
- sprintf(request, "Sorry ! Player %d already exists ! You are player %d !",
+ sprintf(request, "Sorry! Player %d already exists! You are player %d!",
index_nr_wanted + 1, new_index_nr + 1);
Request(request, REQ_CONFIRM);
player->name[0] = '\0';
player->next = NULL;
- stored_player[new_index_nr].connected = TRUE;
+ stored_player[new_index_nr].connected_network = TRUE;
}
static void Handle_OP_PLAYER_DISCONNECTED()
{
struct NetworkClientPlayerInfo *player, *player_disconnected;
int player_nr = (int)buffer[0];
+ int index_nr = player_nr - 1;
printf("OP_PLAYER_DISCONNECTED: %d\n", player_nr);
player_disconnected = getNetworkPlayer(player_nr);
if (player->next == player_disconnected)
player->next = player_disconnected->next;
free(player_disconnected);
+
+ stored_player[index_nr].connected_locally = FALSE;
+ stored_player[index_nr].connected_network = FALSE;
}
static void Handle_OP_START_PLAYING()
{
LevelDirTree *new_leveldir;
int new_level_nr;
- int dummy;
- unsigned long new_random_seed;
+ unsigned int new_random_seed;
char *new_leveldir_identifier;
new_level_nr = (buffer[2] << 8) + buffer[3];
- 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];
else if (buffer[2] == NETWORK_STOP_BY_ERROR)
Request("Network game stopped due to internal error!", REQ_CONFIRM);
else
- Request("Network game stopped !", REQ_CONFIRM);
+ Request("Network game stopped!", REQ_CONFIRM);
}
- game_status = GAME_MODE_MAIN;
+ SetGameStatus(GAME_MODE_MAIN);
+
DrawMainMenu();
}
server_frame_counter =
(buffer[2] << 24) | (buffer[3] << 16) | (buffer[4] << 8) | (buffer[5]);
-#if 0
- Error(ERR_NETWORK_CLIENT, "receiving server frame counter value %d [%d]",
- server_frame_counter, FrameCounter);
-#endif
-
if (server_frame_counter != FrameCounter)
{
Error(ERR_INFO, "client and servers frame counters out of sync");
/* copy valid player actions */
for (i = 0; i < MAX_PLAYERS; i++)
stored_player[i].effective_action =
- (i < len - 6 && stored_player[i].active ? buffer[6 + i] : 0);
+ (i < len - 6 ? buffer[6 + i] : 0);
network_player_action_received = TRUE;
}
void HandleNetworking()
{
-#if !defined(TARGET_SDL)
- static struct timeval tv = { 0, 0 };
- fd_set rfds;
-#endif
int r = 0;
do
{
-#if defined(TARGET_SDL)
if ((r = SDLNet_CheckSockets(rfds, 1)) < 0)
Error(ERR_EXIT, "HandleNetworking(): SDLNet_CheckSockets() failed");
-#else
-
- FD_ZERO(&rfds);
- FD_SET(sfd, &rfds);
-
- r = select(sfd + 1, &rfds, NULL, NULL, &tv);
-
- if (r < 0 && errno != EINTR)
- Error(ERR_EXIT, "HandleNetworking(): select() failed");
-
- if (r < 0)
- 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");
while (r > 0);
}
-#endif /* PLATFORM_UNIX */
+#endif /* NETWORK_AVALIABLE */