projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
359f8ed
)
code cleanup (handling of network socket activity)
author
Holger Schemel
<info@artsoft.org>
Thu, 31 May 2018 11:15:57 +0000
(13:15 +0200)
committer
Holger Schemel
<info@artsoft.org>
Mon, 18 Jun 2018 17:47:31 +0000
(19:47 +0200)
src/netserv.c
patch
|
blob
|
history
diff --git
a/src/netserv.c
b/src/netserv.c
index 71b23c959b0587ce5ce4231cfd8259d1165c3134..7c38ceed788b44a2f5921dc6a9c011c2a134cc73 100644
(file)
--- a/
src/netserv.c
+++ b/
src/netserv.c
@@
-452,7
+452,6
@@
int NetworkServerThread(void *ptr)
void NetworkServer(int port, int serveronly)
{
void NetworkServer(int port, int serveronly)
{
- int sl;
struct NetworkServerPlayerInfo *player;
int r;
unsigned int len;
struct NetworkServerPlayerInfo *player;
int r;
unsigned int len;
@@
-507,17
+506,8
@@
void NetworkServer(int port, int serveronly)
for (player = first_player; player; player = player->next)
flushuser(player);
for (player = first_player; player; player = player->next)
flushuser(player);
- if ((sl = SDLNet_CheckSockets(fds, 500000)) < 1)
- {
- Error(ERR_NETWORK_SERVER, "SDLNet_CheckSockets failed: %s",
- SDLNet_GetError());
- perror("SDLNet_CheckSockets");
- }
-
- if (sl < 0)
- continue;
-
- if (sl == 0)
+ // wait for 100 ms for activity on open network sockets
+ if (SDLNet_CheckSockets(fds, 100) < 1)
continue;
/* accept incoming connections */
continue;
/* accept incoming connections */