From f5d0b19320b39684cf56369d039b45ed140ed759 Mon Sep 17 00:00:00 2001 From: lotodore Date: Sun, 15 Nov 2009 09:07:43 +0000 Subject: [PATCH] Fixing another guest login issue. Setting login timeout to 60 seconds to allow the user to enter the password. --- src/net/common/clientstate.cpp | 8 +++++--- src/net/common/serverlobbythread.cpp | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp index 170b04b1..19d4dbba 100644 --- a/src/net/common/clientstate.cpp +++ b/src/net/common/clientstate.cpp @@ -1095,6 +1095,9 @@ ClientStateWaitEnterLogin::TimerLoop(const boost::system::error_code& ec, boost: OCTET_STRING_fromBuf(&guestLogin->nickName, context.GetPlayerName().c_str(), context.GetPlayerName().length()); + + client->GetSender().Send(context.GetSessionData(), init); + client->SetState(ClientStateWaitSession::Instance()); } // If the player is not a guest, authenticate. else @@ -1125,10 +1128,9 @@ ClientStateWaitEnterLogin::TimerLoop(const boost::system::error_code& ec, boost: MD5_DATA_SIZE); } } + client->GetSender().Send(context.GetSessionData(), init); + client->SetState(ClientStateWaitAuthChallenge::Instance()); } - - client->GetSender().Send(context.GetSessionData(), init); - client->SetState(ClientStateWaitAuthChallenge::Instance()); } else { diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index f6ba867c..abc5d39e 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -59,7 +59,7 @@ #define SERVER_INIT_AVATAR_CLIENT_LOCK_SEC 30 // Forbid a client to send an additional avatar. -#define SERVER_INIT_SESSION_TIMEOUT_SEC 20 +#define SERVER_INIT_SESSION_TIMEOUT_SEC 60 #define SERVER_TIMEOUT_WARNING_REMAINING_SEC 60 #define SERVER_SESSION_ACTIVITY_TIMEOUT_SEC 1800 // 30 min, MUST be > SERVER_TIMEOUT_WARNING_REMAINING_SEC #define SERVER_SESSION_FORCED_TIMEOUT_SEC 86400 // 1 day, should be quite large.