mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r7932) -Fix (r7931): committed a few files too much :( (the ones I used to test the new masterserver)
This commit is contained in:
parent
8d41fe225e
commit
432ea5bbd6
|
@ -6,7 +6,7 @@
|
|||
#ifdef ENABLE_NETWORK
|
||||
|
||||
/** DNS hostname of the masterserver */
|
||||
#define NETWORK_MASTER_SERVER_HOST "localhost"
|
||||
#define NETWORK_MASTER_SERVER_HOST "master.openttd.org"
|
||||
/** Message sent to the masterserver to 'identify' this client as OpenTTD */
|
||||
#define NETWORK_MASTER_SERVER_WELCOME_MESSAGE "OpenTTDRegister"
|
||||
|
||||
|
|
|
@ -116,19 +116,11 @@ void NetworkUDPReceive(const SOCKET udp)
|
|||
/* Try to receive anything */
|
||||
nbytes = recvfrom(udp, p.buffer, packet_len, 0, (struct sockaddr *)&client_addr, &client_len);
|
||||
|
||||
/* We got some bytes for the base header of the packet. */
|
||||
/* We got some bytes for the base header of the packet.
|
||||
* Assume we received the whole packet. */
|
||||
if (nbytes > 2) {
|
||||
NetworkRecv_ReadPacketSize(&p);
|
||||
|
||||
/* If the size does not match the packet must be corrupted.
|
||||
* Otherwise it will be marked as corrupted later on. */
|
||||
if (nbytes != p.size) {
|
||||
DEBUG(net, 1, "received a packet with mismatching size from %s:%d",
|
||||
inet_ntoa(client_addr.sin_addr), ntohs(client_addr.sin_port));
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/* Put the position on the right place */
|
||||
p.pos = 2;
|
||||
p.next = NULL;
|
||||
|
|
|
@ -53,7 +53,7 @@ DEF_UDP_RECEIVE_COMMAND(PACKET_UDP_CLIENT_FIND_SERVER)
|
|||
NetworkSend_NetworkGameInfo(packet, &_network_game_info);
|
||||
|
||||
// Let the client know that we are here
|
||||
// NetworkSendUDP_Packet(_udp_server_socket, packet, client_addr);
|
||||
NetworkSendUDP_Packet(_udp_server_socket, packet, client_addr);
|
||||
|
||||
free(packet);
|
||||
|
||||
|
|
Loading…
Reference in New Issue