Skip to content

Get IP for cluster list from database if you want #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tekaoh merged 2 commits into from
Dec 19, 2018
Merged

Get IP for cluster list from database if you want #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
193b3ed
Get IP for cluster list from database if you want
Tekaoh Dec 17, 2018
783bf51
Take 2
Tekaoh Dec 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion engine/server/application/LoginServer/src/shared/ConfigLoginServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ void ConfigLoginServer::install(void)
KEY_INT (maxCharactersPerAccount, 20);
KEY_BOOL (validateClientVersion, true);
KEY_BOOL (validateStationKey, false);
KEY_BOOL (easyExternalAccess, false);
KEY_BOOL (doSessionLogin, false);
KEY_BOOL (doConsumption, false);
KEY_STRING (sessionServers, "localhost:3004");
Expand Down Expand Up @@ -163,7 +164,7 @@ void ConfigLoginServer::install(void)
}

{
char keyName[500];
char keyName[500];
for (int index=0; index < ms_numPurgePhases; index++)
{
snprintf(keyName,sizeof(keyName),"purgePhaseAdvanceDays%i",index);
Expand Down
9 changes: 9 additions & 0 deletions engine/server/application/LoginServer/src/shared/ConfigLoginServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class ConfigLoginServer
int httpServicePort;
bool validateClientVersion;
bool validateStationKey;
bool easyExternalAccess;
bool doSessionLogin;
bool doConsumption;
const char * sessionServers;
Expand Down Expand Up @@ -80,6 +81,7 @@ class ConfigLoginServer
static const uint16 getHttpServicePort();
static const bool getValidateClientVersion();
static const bool getValidateStationKey();
static const bool getEasyExternalAccess();
static const bool getDoSessionLogin();
static const bool getDoConsumption();
static const char * getSessionServers();
Expand Down Expand Up @@ -217,6 +219,13 @@ inline const bool ConfigLoginServer::getValidateStationKey()

// ----------------------------------------------------------------------

inline const bool ConfigLoginServer::getEasyExternalAccess()
{
return (data->easyExternalAccess);
}

// ----------------------------------------------------------------------

inline const bool ConfigLoginServer::getDoSessionLogin()
{
return (data->doSessionLogin);
Expand Down
6 changes: 5 additions & 1 deletion engine/server/application/LoginServer/src/shared/LoginServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,7 +1438,11 @@ void LoginServer::sendClusterStatus(ClientConnection &conn) const {
// size_t connectionServerChoice = Random::random(cle->m_connectionServers.size() - 1); //lint !e713 !e732 // loss of precision (arg no 1)
ConnectionServerEntry &connServer = cle->m_connectionServers[0];

item.m_connectionServerAddress = connServer.clientServiceAddress;
if (ConfigLoginServer::getEasyExternalAccess()) {
item.m_connectionServerAddress = cle->m_address;
} else {
item.m_connectionServerAddress = connServer.clientServiceAddress;
}
if (clientIsPrivate) {
item.m_connectionServerPort = connServer.clientServicePortPrivate;
} else {
Expand Down