From 37e08cfbb615d61516fc269a73bbf6da852ae25f Mon Sep 17 00:00:00 2001 From: woogerboy21 Date: Tue, 18 Nov 2014 17:27:57 -0500 Subject: [PATCH] added logic to only write debug if max user value is reached --- servatrice/src/serversocketinterface.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index a682b0c7..4f4e2293 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -117,14 +117,16 @@ bool ServerSocketInterface::initSession() SessionEvent *identSe = prepareSessionEvent(identEvent); sendProtocolItem(*identSe); delete identSe; + + int maxUsers = servatrice->getMaxUsersPerAddress(); //allow unlimited number of connections from the trusted sources QString trustedSources = settingsCache->value("server/trusted_sources","127.0.0.1,::1").toString(); if (trustedSources.contains(socket->peerAddress().toString(),Qt::CaseInsensitive)) - qDebug() << "Allowing user from trusted source: " << socket->peerAddress().toString(); + if (servatrice->getUsersWithAddress(socket->peerAddress()) >= maxUsers) + qDebug() << "Allowing user from trusted source: " << socket->peerAddress().toString(); return true; - int maxUsers = servatrice->getMaxUsersPerAddress(); if ((maxUsers > 0) && (servatrice->getUsersWithAddress(socket->peerAddress()) >= maxUsers)) { Event_ConnectionClosed event; event.set_reason(Event_ConnectionClosed::TOO_MANY_CONNECTIONS);