From 0bc6be39b12aa3481b3a8f16e1fed2a000dbf917 Mon Sep 17 00:00:00 2001 From: Giel van Schijndel Date: Sun, 3 May 2009 15:18:07 +0000 Subject: [PATCH] Fix logic in handling return value of addSocket When a socket set is full (in addSocket) print a debug message This is the last change, part of, and closes #435 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7294 4a71c877-e1ca-e34f-864e-861f7616d084 --- lib/netplay/netplay.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/netplay/netplay.c b/lib/netplay/netplay.c index c9d88fdee..3b78bb60c 100644 --- a/lib/netplay/netplay.c +++ b/lib/netplay/netplay.c @@ -476,6 +476,8 @@ static bool addSocket(SocketSet* set, Socket* socket) } } + debug(LOG_ERROR, "Socket set full, no room left (max %zu)", set->len); + return false; } @@ -2454,7 +2456,7 @@ static void NETregisterServer(int state) { debug(LOG_ERROR, "Couldn't create socket set for master server because: %s", strsockerror(getSockErr())); } - if (!addSocket(masterset, rs_socket)) + if (addSocket(masterset, rs_socket)) { debug(LOG_NET,"TCP_AddSocket using socket set %p, socket %p", masterset, rs_socket); } @@ -2537,15 +2539,10 @@ static void NETallowJoining(void) } debug(LOG_NET, "Created tmp_socket_set %p", tmp_socket_set); - if (!addSocket(tmp_socket_set, tcp_socket)) + if (addSocket(tmp_socket_set, tcp_socket)) { debug(LOG_NET,"TCP_AddSocket using socket set %p, socket %p", tmp_socket_set, tcp_socket); } - else - { - // Should never fail, or we will have major problems. - debug(LOG_ERROR,"SDLNet_AddSocket: %s\n", strsockerror(getSockErr())); - } } if (checkSockets(tmp_socket_set, NET_READ_TIMEOUT) > 0)