From c5160c7c8e80b1b64bf474ec1d2a54c2bcef690b Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 2 Apr 2009 20:39:30 +0000 Subject: (svn r15917) -Codechange: remove the latest traces of NetworkAddress::GetIP. --- src/network/core/address.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/network/core/address.h') diff --git a/src/network/core/address.h b/src/network/core/address.h index faa173493..3a4b8c06e 100644 --- a/src/network/core/address.h +++ b/src/network/core/address.h @@ -97,13 +97,6 @@ public: */ const sockaddr_storage *GetAddress(); - /** - * Get the IP address. If the IP has not been resolved yet this will resolve - * it possibly blocking this function for a while - * @return the IP address - */ - uint32 GetIP(); - /** * Get the port * @return the port @@ -131,12 +124,20 @@ public: */ bool operator == (NetworkAddress &address) { - if (this->IsResolved() != address.IsResolved()) return false; - - if (this->IsResolved()) return memcmp(&this->address, &address.address, sizeof(this->address)) == 0; - + 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; } + + NetworkAddress& operator = (const NetworkAddress &other) + { + if (this != &other) { // protect against invalid self-assignment + free(this->hostname); + memcpy(this, &other, sizeof(*this)); + if (other.hostname != NULL) this->hostname = strdup(other.hostname); + } + return *this; + } + }; #endif /* ENABLE_NETWORK */ -- cgit v1.2.3-70-g09d2