projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rocksndiamonds-3.3.1.0
[rocksndiamonds.git]
/
src
/
netserv.c
diff --git
a/src/netserv.c
b/src/netserv.c
index a62cae02ccfec722f4e7d2b08e41a95c72e14e20..b895a30318a93172e3d0284e7d27a4bf492e7702 100644
(file)
--- a/
src/netserv.c
+++ b/
src/netserv.c
@@
-77,7
+77,7
@@
static unsigned char realbuffer[512], *buffer = realbuffer + 4;
static int interrupt;
static int interrupt;
-static unsigned
long
ServerFrameCounter = 0;
+static unsigned
int
ServerFrameCounter = 0;
static void addtobuffer(struct NetworkServerPlayerInfo *player,
unsigned char *b, int len)
static void addtobuffer(struct NetworkServerPlayerInfo *player,
unsigned char *b, int len)
@@
-97,7
+97,8
@@
static void flushuser(struct NetworkServerPlayerInfo *player)
#if defined(TARGET_SDL)
SDLNet_TCP_Send(player->fd, player->writbuffer, player->nwrite);
#else
#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;
}
#endif
player->nwrite = 0;
}
@@
-586,7
+587,8
@@
void NetworkServer(int port, int serveronly)
setsid();
if (fork())
exit(0);
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);
/* open a fake stdin, stdout, stderr, just in case */
open("/dev/null", O_RDONLY);
@@
-662,7
+664,8
@@
void NetworkServer(int port, int serveronly)
if (FD_ISSET(lfd, &fds))
{
if (FD_ISSET(lfd, &fds))
{
- int newfd, slen;
+ int newfd;
+ socklen_t slen;
slen = sizeof(saddr);
newfd = accept(lfd, (struct sockaddr *)&saddr, &slen);
slen = sizeof(saddr);
newfd = accept(lfd, (struct sockaddr *)&saddr, &slen);