gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 07:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r15948) -Fix: resolve network addresses before comparing them

Browse Source
This commit is contained in:
rubidium 2009-04-04 01:51:32 +00:00
parent c9ebf14ba5
commit a779611665
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/network/core/address.h
View File

@ -169,28 +169,33 @@ public:
/**
* Compare the address of this class with the address of another.
* @param address the other address.
* @return < 0 if address is less, 0 if equal and > 0 if address is more
*/
bool operator == (NetworkAddress &address)
int CompareTo(NetworkAddress address)
{
if (this->IsResolved() && address.IsResolved()) return memcmp(&this->address, &address.address, sizeof(this->address)) == 0;
return this->GetPort() == address.GetPort() && strcmp(this->GetHostname(), address.GetHostname()) == 0;
int r = this->GetAddressLength() - address.GetAddressLength();
if (r == 0) r = this->address.ss_family - address.address.ss_family;
if (r == 0) r = memcmp(&this->address, &address.address, this->address_length) == 0;
if (r == 0) r = this->GetPort() - address.GetPort();
return r;
}
/**
* Compare the address of this class with the address of another.
* @param address the other address.
*/
bool operator < (NetworkAddress &address)
bool operator == (NetworkAddress address)
{
int r = this->address.ss_family - address.address.ss_family;
if (r == 0 && this->IsResolved() && address.IsResolved()) {
r = this->address_length - address.address_length;
if (r == 0) r = memcmp(&this->address, &address.address, this->address_length) == 0;
} else {
r = strcmp(this->GetHostname(), address.GetHostname());
}
if (r == 0) r = this->GetPort() - address.GetPort();
return r < 0;
return this->CompareTo(address) == 0;
}
/**
* Compare the address of this class with the address of another.
* @param address the other address.
*/
bool operator < (NetworkAddress address)
{
return this->CompareTo(address) < 0;
}
/**