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

running astyle

Browse Source
This commit is contained in:
Albert Medela
2016-07-07 20:52:44 +02:00
parent 55174a71a7
commit 417d9a5bd2
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/netpacket.cpp
+1 -1
View File
@@ -250,7 +250,7 @@ NetPacket::GameErrorToNetError(int gameErrorReason)
break; break;
case ERR_NET_FULL_GUESTS : case ERR_NET_FULL_GUESTS :
retVal = ErrorMessage::initServerFull; // LG: @TODO: maybe create a better error message, if possible retVal = ErrorMessage::initServerFull; // LG: @TODO: maybe create a better error message, if possible
break; break;
default : default :
retVal = ErrorMessage::reserved; retVal = ErrorMessage::reserved;
break; break;
src/net/common/serverlobbythread.cpp
+15 -15
View File
@@ -396,7 +396,7 @@ ServerLobbyThread::CloseSession(boost::shared_ptr<SessionData> session)
m_sessionManager.RemoveSession(session->GetId()); m_sessionManager.RemoveSession(session->GetId());
m_gameSessionManager.RemoveSession(session->GetId()); m_gameSessionManager.RemoveSession(session->GetId());
if (session->GetPlayerData()){ if (session->GetPlayerData()) {
if (session->GetPlayerData()->GetRights() == PLAYER_RIGHTS_GUEST) { if (session->GetPlayerData()->GetRights() == PLAYER_RIGHTS_GUEST) {
DecrementGuests(); DecrementGuests();
} }
@@ -1011,12 +1011,12 @@ void
ServerLobbyThread::HandleNetPacketInit(boost::shared_ptr<SessionData> session, const InitMessage &initMessage) ServerLobbyThread::HandleNetPacketInit(boost::shared_ptr<SessionData> session, const InitMessage &initMessage)
{ {
LOG_VERBOSE("Received init for session #" << session->GetId() << "."); LOG_VERBOSE("Received init for session #" << session->GetId() << ".");
// @XXX: debug tests // @XXX: debug tests
//if(m_sessionManager.IsGuestConnectedMultiple(session->GetClientAddr())){ //if(m_sessionManager.IsGuestConnectedMultiple(session->GetClientAddr())){
// LOG_ERROR("Guest with IP " << session->GetClientAddr() << " already connected! Should be declined!"); // LOG_ERROR("Guest with IP " << session->GetClientAddr() << " already connected! Should be declined!");
//} //}
// @XXX: end debug tests // @XXX: end debug tests
// Before any other processing, perform some denial of service and // Before any other processing, perform some denial of service and
// brute force attack prevention by checking whether the user recently sent an // brute force attack prevention by checking whether the user recently sent an
@@ -1059,7 +1059,7 @@ ServerLobbyThread::HandleNetPacketInit(boost::shared_ptr<SessionData> session, c
bool noAuth = false; bool noAuth = false;
bool validGuest = false; bool validGuest = false;
// @XXX: productive: if (initMessage.login() == InitMessage::guestLogin) { // @XXX: productive: if (initMessage.login() == InitMessage::guestLogin) {
// @XXX: debug: if (initMessage.login() == InitMessage::unauthenticatedLogin) { // @XXX: debug: if (initMessage.login() == InitMessage::unauthenticatedLogin) {
if (initMessage.login() == InitMessage::guestLogin) { if (initMessage.login() == InitMessage::guestLogin) {
playerName = initMessage.nickname(); playerName = initMessage.nickname();
// Verify guest player name. // Verify guest player name.
@@ -1070,12 +1070,12 @@ ServerLobbyThread::HandleNetPacketInit(boost::shared_ptr<SessionData> session, c
validGuest = true; validGuest = true;
noAuth = true; noAuth = true;
} }
// @XXX: check if a guest session with same ip is already connected - decline if true // @XXX: check if a guest session with same ip is already connected - decline if true
if(m_sessionManager.IsGuestConnectedMultiple(session->GetClientAddr())){ if(m_sessionManager.IsGuestConnectedMultiple(session->GetClientAddr())) {
//LOG_ERROR("Guest with IP " << session->GetClientAddr() << " already connected! Decline!"); //LOG_ERROR("Guest with IP " << session->GetClientAddr() << " already connected! Decline!");
SessionError(session, ERR_NET_FULL_GUESTS); SessionError(session, ERR_NET_FULL_GUESTS);
return; return;
} }
} }
if (!validGuest) { if (!validGuest) {
@@ -2398,7 +2398,7 @@ ServerLobbyThread::GetRejoinGameIdForPlayer(const std::string &playerName, const
} }
// LG: Handle guests_ variable. Remove in production to access variable itself // LG: Handle guests_ variable. Remove in production to access variable itself
void ServerLobbyThread::DecrementGuests(){ void ServerLobbyThread::DecrementGuests() {
this->guests_.fetch_sub(1); this->guests_.fetch_sub(1);
} }