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

(svn r15981) -Fix: don't print the address family when writing the IP+port to the config file.

Browse Source
This commit is contained in:
rubidium
2009-04-08 12:09:07 +00:00
parent 18146572b0
commit 9d6edae94d
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/core/address.cpp
View File

@@ -56,18 +56,22 @@ void NetworkAddress::SetPort(uint16 port)
}
}
const char *NetworkAddress::GetAddressAsString()
const char *NetworkAddress::GetAddressAsString(bool with_family)
{
/* 6 = for the : and 5 for the decimal port number */
static char buf[NETWORK_HOSTNAME_LENGTH + 6 + 7];
char family;
switch (this->address.ss_family) {
case AF_INET: family = '4'; break;
case AF_INET6: family = '6'; break;
default: family = '?'; break;
if (with_family) {
char family;
switch (this->address.ss_family) {
case AF_INET: family = '4'; break;
case AF_INET6: family = '6'; break;
default: family = '?'; break;
}
seprintf(buf, lastof(buf), "%s:%d (IPv%c)", this->GetHostname(), this->GetPort(), family);
} else {
seprintf(buf, lastof(buf), "%s:%d", this->GetHostname(), this->GetPort());
}
seprintf(buf, lastof(buf), "%s:%d (IPv%c)", this->GetHostname(), this->GetPort(), family);
return buf;
}