diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-06-23 21:31:09 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2019-01-09 17:35:18 +0100 |
| commit | 50cfeb9aa406b9f81a6aa51dcd87201e5f3bae1e (patch) | |
| tree | 5f47b715128418cc91091711f0358e5c2dea961f /src/server/bnetserver | |
| parent | 61532e9816f750ae1690f8d5fca92525d6297ab6 (diff) | |
Core/Misc: Improved ip2location code and set it to disabled by default
(cherry picked from commit 0ead73516adfeaff96292685592085e20737d535)
Diffstat (limited to 'src/server/bnetserver')
| -rw-r--r-- | src/server/bnetserver/Server/Session.cpp | 4 | ||||
| -rw-r--r-- | src/server/bnetserver/bnetserver.conf.dist | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/server/bnetserver/Server/Session.cpp b/src/server/bnetserver/Server/Session.cpp index 56c71a3eeb6..7ebb7abb58b 100644 --- a/src/server/bnetserver/Server/Session.cpp +++ b/src/server/bnetserver/Server/Session.cpp @@ -336,8 +336,8 @@ uint32 Battlenet::Session::VerifyWebCredentials(std::string const& webCredential } else { - if (IpLocationRecord* location = sIPLocation->GetData(ip_address)) - _ipCountry = location->country_code; + if (IpLocationRecord const* location = sIPLocation->GetLocationRecord(ip_address)) + _ipCountry = location->CountryCode; TC_LOG_DEBUG("session", "[Session::HandleVerifyWebCredentials] Account '%s' is not locked to ip", _accountInfo->Login.c_str()); if (_accountInfo->LockCountry.empty() || _accountInfo->LockCountry == "00") diff --git a/src/server/bnetserver/bnetserver.conf.dist b/src/server/bnetserver/bnetserver.conf.dist index 0e5ccc18a53..f6fcb5764b4 100644 --- a/src/server/bnetserver/bnetserver.conf.dist +++ b/src/server/bnetserver/bnetserver.conf.dist @@ -200,12 +200,11 @@ MySQLExecutable = "" # # IPLocationFile # Description: The path to your IP2Location database CSV file. -# Example: "C:/Trinity/IP2Location.csv" -# "/home/trinity/IP2Location.csv" -# Default: "." - (Current core directory) -# "" - (Disabled) +# Example: "C:/Trinity/IP2LOCATION-LITE-DB1.CSV" +# "/home/trinity/IP2LOCATION-LITE-DB1.CSV" +# Default: "" - (Disabled) -IPLocationFile = "." +IPLocationFile = "" # ################################################################################################### |