pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More NAT fixes, please work

Browse Source
This commit is contained in:
KimLS 2015-07-16 15:07:59 -07:00
parent 87d42931aa
commit 4d68ddc82f
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
world/client.cpp
View File

@ -1227,14 +1227,17 @@ void Client::Clearance(int8 response)
if(local_addr[0]) {
zs_addr = local_addr;
} else {
if(strcmp(local_addr, "127.0.0.1") == 0)
{
zs_addr = WorldConfig::get()->LocalAddress.c_str();
} else {
struct in_addr in;
in.s_addr = zs->GetIP();
zs_addr = inet_ntoa(in);
if(strcmp(zs_addr, "127.0.0.1") == 0)
{
Log.Out(Logs::Detail, Logs::World_Server, "Local zone address was %s, setting local address to: %s", zs_addr, WorldConfig::get()->LocalAddress.c_str());
zs_addr = WorldConfig::get()->LocalAddress.c_str();
} else {
Log.Out(Logs::Detail, Logs::World_Server, "Local zone address %s", zs_addr);
}
}
@ -1243,16 +1246,8 @@ void Client::Clearance(int8 response)
if(addr[0]) {
zs_addr = addr;
} else {
if(strcmp(addr, "127.0.0.1") == 0)
{
zs_addr = WorldConfig::get()->WorldAddress.c_str();
}
else {
struct in_addr in;
in.s_addr = zs->GetIP();
zs_addr = inet_ntoa(in);
}
}
}
strcpy(zsi->ip, zs_addr);

2
world/zoneserver.h
View File

@ -56,7 +56,7 @@ public:
inline uint32 GetIP() const { return tcpc->GetrIP(); }
inline uint16 GetPort() const { return tcpc->GetrPort(); }
inline const char* GetCAddress() const { return clientaddress; }
inline const char* GetCLocalAddress() const { return clientaddress; }
inline const char* GetCLocalAddress() const { return clientlocaladdress; }
inline uint16 GetCPort() const { return clientport; }
inline uint32 GetID() const { return ID; }
inline bool IsBootingUp() const { return BootingUp; }