dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r15916) -Codechange: let the network game list use NetworkAddress

Browse Source
This commit is contained in:
rubidium
2009-04-02 20:17:46 +00:00
parent c0c6e07081
commit 1e205e01b8
7 changed files with 61 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ public:
memset(&this->address, 0, sizeof(this->address));
this->address.ss_family = AF_INET;
((struct sockaddr_in*)&this->address)->sin_addr.s_addr = ip;
((struct sockaddr_in*)&this->address)->sin_port = htons(port);
this->SetPort(port);
}
/**
@@ -58,7 +58,7 @@ public:
{
memset(&this->address, 0, sizeof(this->address));
this->address.ss_family = AF_INET;
((struct sockaddr_in*)&this->address)->sin_port = htons(port);
this->SetPort(port);
}
/**
@@ -110,6 +110,12 @@ public:
*/
uint16 GetPort() const;
/**
* Set the port
* @param port set the port number
*/
void SetPort(uint16 port);
/**
* Check whether the IP address has been resolved already
* @return true iff the port has been resolved
@@ -118,6 +124,19 @@ public:
{
return this->resolved;
}
/**
* Compare the address of this class with the address of another.
* @param address the other address.
*/
bool operator == (NetworkAddress &address)
{
if (this->IsResolved() != address.IsResolved()) return false;
if (this->IsResolved()) return memcmp(&this->address, &address.address, sizeof(this->address)) == 0;
return this->GetPort() == address.GetPort() && strcmp(this->GetHostname(), address.GetHostname()) == 0;
}
};
#endif /* ENABLE_NETWORK */