sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guest IP-check and number of guest in lobby check combined now in one function

Browse Source
This commit is contained in:
Kai Philipp
2016-07-19 14:01:13 +02:00
parent 1abc9dc452
commit 1b5cf1bfb8
3 changed files with 19 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/sessionmanager.cpp
+14 -26
View File
@@ -34,8 +34,11 @@
#include <net/serverexception.h>
#include <net/socket_msg.h>
#include <core/loghelper.h> // debug - remove me
using namespace std;
#define SERVER_MAX_GUEST_USERS_LOBBY 50 // LG: Maximum number of guests users in lobby allowed
SessionManager::SessionManager()
{
@@ -248,23 +251,25 @@ SessionManager::IsClientAddressConnected(const std::string &clientAddress) const
}
bool
SessionManager::IsGuestConnectedMultiple(const std::string &clientAddress) const
SessionManager::IsGuestAllowedToConnect(const std::string &clientAddress) const
{
bool retVal = false;
bool retVal = true;
boost::recursive_mutex::scoped_lock lock(m_sessionMapMutex);
SessionMap::const_iterator i = m_sessionMap.begin();
SessionMap::const_iterator end = m_sessionMap.end();
int num = 0;
while (i != end) {
boost::shared_ptr<PlayerData> tmpPlayer(i->second->GetPlayerData());
// productive:
//if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST && i->second->GetClientAddr() == clientAddress){
// debug:
// if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_NORMAL && i->second->GetClientAddr() == clientAddress){
if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST && i->second->GetClientAddr() == clientAddress) {
retVal = true;
break;
if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST){
num++;
if(i->second->GetClientAddr() == clientAddress || num >= SERVER_MAX_GUEST_USERS_LOBBY) {
// guest has same ip as another guest in lobby or
// number of guests in lobby >= SERVER_MAX_GUEST_USERS_LOBBY => not allowed
retVal = false;
break;
}
}
++i;
}
@@ -433,20 +438,3 @@ SessionManager::SendToAllButOneSessions(SenderHelper &sender, boost::shared_ptr<
}
}
unsigned
SessionManager::GetGuestsCount() const
{
unsigned counter = 0;
boost::recursive_mutex::scoped_lock lock(m_sessionMapMutex);
SessionMap::const_iterator i = m_sessionMap.begin();
SessionMap::const_iterator end = m_sessionMap.end();
while (i != end) {
if (i->second && i->second->GetPlayerData() &&
i->second->GetPlayerData()->GetRights() == PLAYER_RIGHTS_GUEST)
++counter;
++i;
}
return counter;
}