From 629ec5929d1e1e62966dfb0a26adfbbefaf437a2 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Mon, 7 Mar 2011 20:54:55 +0000
Subject: [PATCH] Limiting total number of sessions to prevent hitting the file
 descriptor ulimit.

---
 src/net/common/serverlobbythread.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp
index a2e6d470..6f645e62 100644
--- a/src/net/common/serverlobbythread.cpp
+++ b/src/net/common/serverlobbythread.cpp
@@ -46,11 +46,12 @@
 #include <boost/lambda/lambda.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/bind.hpp>
-#include <boost/foreach.hpp>
+#include <boost/foreach.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <gsasl.h>
 
-#define SERVER_MAX_NUM_SESSIONS						512		// Maximum number of idle users in lobby.
+#define SERVER_MAX_NUM_LOBBY_SESSIONS				512		// Maximum number of idle users in lobby.
+#define SERVER_MAX_NUM_TOTAL_SESSIONS				2000	// Total maximum of sessions, fitting a 2048 handle limit
 
 #define SERVER_CACHE_CLEANUP_INTERVAL_SEC			86400	// 1 day
 #define SERVER_SAVE_STATISTICS_INTERVAL_SEC			60
@@ -242,7 +243,10 @@ ServerLobbyThread::AddConnection(boost::shared_ptr<tcp::socket> sock)
 	LOG_VERBOSE("Accepted connection - session #" << sessionData->GetId() << ".");
 
 	bool hasClientIp = false;
-	if (m_sessionManager.GetRawSessionCount() <= SERVER_MAX_NUM_SESSIONS) {
+	unsigned numLobbySessions = m_sessionManager.GetRawSessionCount();
+	unsigned numGameSessions = m_gameSessionManager.GetRawSessionCount();
+	if (numLobbySessions <= SERVER_MAX_NUM_LOBBY_SESSIONS
+			&& numLobbySessions + numGameSessions <= SERVER_MAX_NUM_TOTAL_SESSIONS) {
 		boost::system::error_code errCode;
 		tcp::endpoint clientEndpoint = sock->remote_endpoint(errCode);
 		if (!errCode) {
@@ -1815,7 +1819,7 @@ ServerLobbyThread::HandleReAddedSession(SessionWrapper session)
 	// Remove session from game session list.
 	m_gameSessionManager.RemoveSession(session.sessionData->GetId());
 
-	if (m_sessionManager.GetRawSessionCount() <= SERVER_MAX_NUM_SESSIONS) {
+	if (m_sessionManager.GetRawSessionCount() <= SERVER_MAX_NUM_LOBBY_SESSIONS) {
 		// Set state (back) to established.
 		session.sessionData->SetState(SessionData::Established);
 		session.sessionData->SetGameId(0);