mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15993) -Codechange: clean up/generalise the handling of the server list

release/1.0
rubidium 2009-04-08 23:41:48 +00:00
parent c2dbc8270b
commit 882e495f5c
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,21 +45,6 @@ private:
*/ */
SOCKET Resolve(int family, int socktype, int flags, SocketList *sockets, LoopProc func); SOCKET Resolve(int family, int socktype, int flags, SocketList *sockets, LoopProc func);
public: public:
/**
* Create a network address based on a resolved IP and port
* @param ip the resolved ip
* @param port the port
*/
NetworkAddress(in_addr_t ip, uint16 port) :
address_length(sizeof(sockaddr))
{
*this->hostname = '\0';
memset(&this->address, 0, sizeof(this->address));
this->address.ss_family = AF_INET;
((struct sockaddr_in*)&this->address)->sin_addr.s_addr = ip;
this->SetPort(port);
}
/** /**
* Create a network address based on a resolved IP and port * Create a network address based on a resolved IP and port
* @param address the IP address with port * @param address the IP address with port

4
src/network/core/os_abstraction.h
View File

@ -289,6 +289,10 @@ static inline bool SetNoDelay(SOCKET d)
#endif #endif
} }
/* Make sure these structures have the size we expect them to be */
assert_compile(sizeof(in_addr) == 4);
assert_compile(sizeof(in6_addr) == 16);
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */
#endif /* NETWORK_CORE_OS_ABSTRACTION_H */ #endif /* NETWORK_CORE_OS_ABSTRACTION_H */

26
src/network/network_udp.cpp
View File

@ -270,8 +270,13 @@ DEF_UDP_RECEIVE_COMMAND(Client, PACKET_UDP_SERVER_RESPONSE)
} }
} }
if (item->info.hostname[0] == '\0') if (item->info.hostname[0] == '\0') {
snprintf(item->info.hostname, sizeof(item->info.hostname), "%s", client_addr->GetHostname()); snprintf(item->info.hostname, sizeof(item->info.hostname), "%s", client_addr->GetHostname());
}
if (client_addr->GetAddress()->ss_family == AF_INET6) {
strecat(item->info.server_name, " (IPv6)", lastof(item->info.server_name));
}
/* Check if we are allowed on this server based on the revision-match */ /* Check if we are allowed on this server based on the revision-match */
item->info.version_compatible = IsNetworkCompatibleVersion(item->info.server_revision); item->info.version_compatible = IsNetworkCompatibleVersion(item->info.server_revision);
@ -294,12 +299,25 @@ DEF_UDP_RECEIVE_COMMAND(Client, PACKET_UDP_MASTER_RESPONSE_LIST)
if (type < SLT_END) { if (type < SLT_END) {
for (int i = p->Recv_uint16(); i != 0 ; i--) { for (int i = p->Recv_uint16(); i != 0 ; i--) {
uint32 ip = TO_LE32(p->Recv_uint32()); sockaddr_storage addr_storage;
uint16 port = p->Recv_uint16(); memset(&addr_storage, 0, sizeof(addr_storage));
if (type == SLT_IPv4) {
addr_storage.ss_family = AF_INET;
((sockaddr_in*)&addr_storage)->sin_addr.s_addr = TO_LE32(p->Recv_uint32());
} else {
assert(type == SLT_IPv6);
addr_storage.ss_family = AF_INET6;
byte *addr = (byte*)&((sockaddr_in6*)&addr_storage)->sin6_addr;
for (uint i = 0; i < sizeof(in6_addr); i++) *addr++ = p->Recv_uint8();
}
NetworkAddress addr(addr_storage, type == SLT_IPv4 ? sizeof(sockaddr_in) : sizeof(sockaddr_in6));
addr.SetPort(p->Recv_uint16());
/* Somehow we reached the end of the packet */ /* Somehow we reached the end of the packet */
if (this->HasClientQuit()) return; if (this->HasClientQuit()) return;
NetworkUDPQueryServer(NetworkAddress(ip, port));
NetworkUDPQueryServer(addr);
} }
} }
} }