X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fnetserv.c;h=5ecbf1b72082c7586a3f3604ffbbd5299c5d67cc;hp=f1f9a1a96528bb36198982d200f2f70474c3f7e7;hb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;hpb=113df1c4ad60b24a31ec6498f8cd3b2d4cd9dbfd

diff --git a/src/netserv.c b/src/netserv.c
index f1f9a1a9..5ecbf1b7 100644
--- a/src/netserv.c
+++ b/src/netserv.c
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* netserv.c                                                *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// netserv.c
+// ============================================================================
 
 #include "libgame/platform.h"
 
@@ -77,7 +75,7 @@ static unsigned char realbuffer[512], *buffer = realbuffer + 4;
 
 static int interrupt;
 
-static unsigned long ServerFrameCounter = 0;
+static unsigned int ServerFrameCounter = 0;
 
 static void addtobuffer(struct NetworkServerPlayerInfo *player,
 			unsigned char *b, int len)
@@ -97,7 +95,8 @@ static void flushuser(struct NetworkServerPlayerInfo *player)
 #if defined(TARGET_SDL)
     SDLNet_TCP_Send(player->fd, player->writbuffer, player->nwrite);
 #else
-    write(player->fd, player->writbuffer, player->nwrite);
+    if (write(player->fd, player->writbuffer, player->nwrite) == -1)
+      Error(ERR_WARN, "write() failed; %s", strerror(errno));
 #endif
     player->nwrite = 0;
   }
@@ -293,11 +292,11 @@ static void Handle_OP_NUMBER_WANTED(struct NetworkServerPlayerInfo *player)
       Error(ERR_NETWORK_SERVER, "client %d (%s) switches to # %d",
 	    player->number, player->player_name, nr_wanted);
     else if (player->number == nr_wanted)
-      Error(ERR_NETWORK_SERVER, "client %d (%s) still has # %d",
+      Error(ERR_NETWORK_SERVER, "client %d (%s) already has # %d",
 	    player->number, player->player_name, nr_wanted);
     else
       Error(ERR_NETWORK_SERVER,
-	    "client %d (%s) cannot switch (client %d still exists)",
+	    "client %d (%s) cannot switch (client %d already exists)",
 	    player->number, player->player_name, nr_wanted);
   }
 
@@ -586,7 +585,8 @@ void NetworkServer(int port, int serveronly)
     setsid();
     if (fork())
       exit(0);
-    chdir("/");
+    if (chdir("/") == -1)
+      Error(ERR_WARN, "chdir() failed; %s", strerror(errno));
 
     /* open a fake stdin, stdout, stderr, just in case */
     open("/dev/null", O_RDONLY);
@@ -612,7 +612,8 @@ void NetworkServer(int port, int serveronly)
 #if defined(TARGET_SDL)
     if ((sl = SDLNet_CheckSockets(fds, 500000)) < 1)
     {
-      Error(ERR_NETWORK_SERVER, SDLNet_GetError());
+      Error(ERR_NETWORK_SERVER, "SDLNet_CheckSockets failed: %s",
+	    SDLNet_GetError());
       perror("SDLNet_CheckSockets");
     }
 
@@ -662,7 +663,8 @@ void NetworkServer(int port, int serveronly)
 
     if (FD_ISSET(lfd, &fds))
     {
-      int newfd, slen;
+      int newfd;
+      socklen_t slen;
 
       slen = sizeof(saddr);
       newfd = accept(lfd, (struct sockaddr *)&saddr, &slen);
@@ -740,7 +742,7 @@ void NetworkServer(int port, int serveronly)
 	    break;
 	  }
 
-	  switch(buffer[1])
+	  switch (buffer[1])
 	  {
 	    case OP_PLAYER_NAME:
 	      Handle_OP_PLAYER_NAME(player, len);