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

Change option to disable guest login restriction.

Browse Source
This commit is contained in:
Lothar May
2016-08-13 14:53:05 +02:00
parent 612751044d
commit 2b372d0019
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/configfile.cpp
+1 -1
View File
@@ -311,7 +311,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
configList.push_back(ConfigInfo("DBServerDatabaseName", CONFIG_TYPE_STRING, "pokerth"));
configList.push_back(ConfigInfo("DBServerEncryptionKey", CONFIG_TYPE_STRING, ""));
configList.push_back(ConfigInfo("GameNameBadWordList", CONFIG_TYPE_STRING_LIST, "Regex"));
configList.push_back(ConfigInfo("ServerBlockGuestDuplicateIP", CONFIG_TYPE_INT, "0"));
configList.push_back(ConfigInfo("ServerRestrictGuestLogin", CONFIG_TYPE_INT, "0"));
//fill tempList firstTime
configBufferList = configList;
src/net/common/serverlobbythread.cpp
+2 -1
View File
@@ -1062,7 +1062,8 @@ ServerLobbyThread::HandleNetPacketInit(boost::shared_ptr<SessionData> session, c
}
// check if a guest session in lobby with same ip is already connected and
// if number of lobby guests >= SERVER_MAX_GUEST_USERS_LOBBY
if(!m_sessionManager.IsGuestAllowedToConnect(session->GetClientAddr(), m_serverConfig.readConfigInt("ServerBlockGuestDuplicateIP"))) {
if(m_serverConfig.readConfigInt("ServerRestrictGuestLogin") != 0
&& !m_sessionManager.IsGuestAllowedToConnect(session->GetClientAddr())) {
SessionError(session, ERR_NET_SERVER_FULL);
return;
}
src/net/common/sessionmanager.cpp
+2 -2
View File
@@ -249,7 +249,7 @@ SessionManager::IsClientAddressConnected(const std::string &clientAddress) const
}
bool
SessionManager::IsGuestAllowedToConnect(const std::string &clientAddress, int blockDup) const
SessionManager::IsGuestAllowedToConnect(const std::string &clientAddress) const
{
bool retVal = true;
boost::recursive_mutex::scoped_lock lock(m_sessionMapMutex);
@@ -262,7 +262,7 @@ SessionManager::IsGuestAllowedToConnect(const std::string &clientAddress, int bl
boost::shared_ptr<PlayerData> tmpPlayer(i->second->GetPlayerData());
if (tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST) {
num++;
if (blockDup && i->second->GetClientAddr() == clientAddress) {
if (i->second->GetClientAddr() == clientAddress) {
// guest has same ip as another guest in lobby or
retVal = false;
break;