Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r16007) -Fix (r16004): when we want to bind to both IPv4 and IPv6, make the master socket do that too; too bad getaddrinfo can't handle binding to any address on any port at the same time :(

Browse Source
This commit is contained in:
rubidium 2009-04-10 09:23:35 +00:00
parent 870e234d23
commit 7ae8228ed3
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,14 +178,21 @@ SOCKET NetworkAddress::Resolve(int family, int socktype, int flags, SocketList *
char port_name[6]; char port_name[6];
seprintf(port_name, lastof(port_name), "%u", this->GetPort()); seprintf(port_name, lastof(port_name), "%u", this->GetPort());
bool reset_hostname = false;
/* Setting both hostname to NULL and port to 0 is not allowed. /* Setting both hostname to NULL and port to 0 is not allowed.
* As port 0 means bind to any port, the other must mean that * As port 0 means bind to any port, the other must mean that
* we want to bind to 'all' IPs. */ * we want to bind to 'all' IPs. */
if (StrEmpty(this->hostname) && this->address_length == 0 && this->GetPort() == 0) { if (StrEmpty(this->hostname) && this->address_length == 0 && this->GetPort() == 0) {
strecpy(this->hostname, this->address.ss_family == AF_INET ? "0.0.0.0" : "::", lastof(this->hostname)); reset_hostname = true;
int fam = this->address.ss_family;
if (fam == AF_UNSPEC) fam = family;
strecpy(this->hostname, fam == AF_INET ? "0.0.0.0" : "::", lastof(this->hostname));
} }
int e = getaddrinfo(StrEmpty(this->hostname) ? NULL : this->hostname, port_name, &hints, &ai); int e = getaddrinfo(StrEmpty(this->hostname) ? NULL : this->hostname, port_name, &hints, &ai);
if (reset_hostname) strecpy(this->hostname, "", lastof(this->hostname));
if (e != 0) { if (e != 0) {
if (func != ResolveLoopProc) { if (func != ResolveLoopProc) {
DEBUG(net, 0, "getaddrinfo(%s, %s) failed: %s", this->hostname, port_name, FS2OTTD(gai_strerror(e))); DEBUG(net, 0, "getaddrinfo(%s, %s) failed: %s", this->hostname, port_name, FS2OTTD(gai_strerror(e)));
@ -305,9 +312,20 @@ static SOCKET ListenLoopProc(addrinfo *runp)
return sock; return sock;
} }
SOCKET NetworkAddress::Listen(int socktype, SocketList *sockets) void NetworkAddress::Listen(int socktype, SocketList *sockets)
{ {
return this->Resolve(AF_UNSPEC, socktype, AI_ADDRCONFIG | AI_PASSIVE, sockets, ListenLoopProc); assert(sockets != NULL);
/* Setting both hostname to NULL and port to 0 is not allowed.
* As port 0 means bind to any port, the other must mean that
* we want to bind to 'all' IPs. */
if (this->address_length == 0 && this->address.ss_family == AF_UNSPEC &&
StrEmpty(this->hostname) && this->GetPort() == 0) {
this->Resolve(AF_INET, socktype, AI_ADDRCONFIG | AI_PASSIVE, sockets, ListenLoopProc);
this->Resolve(AF_INET6, socktype, AI_ADDRCONFIG | AI_PASSIVE, sockets, ListenLoopProc);
} else {
this->Resolve(AF_UNSPEC, socktype, AI_ADDRCONFIG | AI_PASSIVE, sockets, ListenLoopProc);
}
} }
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */

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

@ -227,9 +227,8 @@ public:
* Make the given socket listen. * Make the given socket listen.
* @param socktype the type of socket (TCP, UDP, etc) * @param socktype the type of socket (TCP, UDP, etc)
* @param sockets the list of sockets to add the sockets to * @param sockets the list of sockets to add the sockets to
* @return the socket (if sockets != NULL)
*/ */
SOCKET Listen(int socktype, SocketList *sockets = NULL); void Listen(int socktype, SocketList *sockets);
}; };
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */