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

(svn r7821) -Fix: be more strict about the socket from where packets arrive. Do not accept requests about the game server on the master/client socket, do not accept master server acks on the client/server socket, etc.

release/0.6
rubidium 2007-01-04 15:42:09 +00:00
parent 90f546e87e
commit 6851608c00
3 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/core/udp.c
View File

@ -119,7 +119,7 @@ void NetworkUDPReceive(SOCKET udp)
p.next = NULL; p.next = NULL;
/* Handle the packet */ /* Handle the packet */
NetworkHandleUDPPacket(&p, &client_addr); NetworkHandleUDPPacket(udp, &p, &client_addr);
} }
} }

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

@ -17,10 +17,11 @@ void NetworkUDPReceive(SOCKET udp);
/** /**
* Function that is called for every received UDP packet. * Function that is called for every received UDP packet.
* @param udp the socket the packet is received on
* @param packet the received packet * @param packet the received packet
* @param client_addr the address of the sender of the packet * @param client_addr the address of the sender of the packet
*/ */
void NetworkHandleUDPPacket(Packet *p, struct sockaddr_in *client_addr); void NetworkHandleUDPPacket(SOCKET udp, Packet *p, struct sockaddr_in *client_addr);
///** Sending/receiving of (large) chuncks of UDP packets **//// ///** Sending/receiving of (large) chuncks of UDP packets **////

55
src/network/network_udp.c
View File

@ -397,30 +397,31 @@ DEF_UDP_RECEIVE_COMMAND(PACKET_UDP_SERVER_NEWGRFS)
} }
} }
/**
* Every type of UDP packet should only be received by a single socket;
* The socket communicating with the masterserver should receive the
* game information of some 'random' host.
*/
typedef struct NetworkUDPPacketAndSocket {
void (*callback)(Packet *p, struct sockaddr_in *client_addr);
SOCKET *incoming_socket;
} NetworkUPDPacketAndSocket;
// The layout for the receive-functions by UDP static const NetworkUPDPacketAndSocket _network_udp_packet[PACKET_UDP_END] = {
typedef void NetworkUDPPacket(Packet *p, struct sockaddr_in *client_addr); { RECEIVE_COMMAND(PACKET_UDP_CLIENT_FIND_SERVER), &_udp_server_socket },
{ RECEIVE_COMMAND(PACKET_UDP_SERVER_RESPONSE), &_udp_client_socket },
static NetworkUDPPacket* const _network_udp_packet[] = { { RECEIVE_COMMAND(PACKET_UDP_CLIENT_DETAIL_INFO), &_udp_server_socket },
RECEIVE_COMMAND(PACKET_UDP_CLIENT_FIND_SERVER), { NULL, NULL },
RECEIVE_COMMAND(PACKET_UDP_SERVER_RESPONSE), { NULL, NULL },
RECEIVE_COMMAND(PACKET_UDP_CLIENT_DETAIL_INFO), { RECEIVE_COMMAND(PACKET_UDP_MASTER_ACK_REGISTER), &_udp_master_socket },
NULL, { NULL, NULL },
NULL, { RECEIVE_COMMAND(PACKET_UDP_MASTER_RESPONSE_LIST), &_udp_client_socket },
RECEIVE_COMMAND(PACKET_UDP_MASTER_ACK_REGISTER), { NULL, NULL },
NULL, { RECEIVE_COMMAND(PACKET_UDP_CLIENT_GET_NEWGRFS), &_udp_server_socket },
RECEIVE_COMMAND(PACKET_UDP_MASTER_RESPONSE_LIST), { RECEIVE_COMMAND(PACKET_UDP_SERVER_NEWGRFS), &_udp_client_socket },
NULL,
RECEIVE_COMMAND(PACKET_UDP_CLIENT_GET_NEWGRFS),
RECEIVE_COMMAND(PACKET_UDP_SERVER_NEWGRFS),
}; };
void NetworkHandleUDPPacket(SOCKET udp, Packet *p, struct sockaddr_in *client_addr)
// If this fails, check the array above with network_data.h
assert_compile(lengthof(_network_udp_packet) == PACKET_UDP_END);
void NetworkHandleUDPPacket(Packet *p, struct sockaddr_in *client_addr)
{ {
byte type; byte type;
@ -430,13 +431,15 @@ void NetworkHandleUDPPacket(Packet *p, struct sockaddr_in *client_addr)
type = NetworkRecv_uint8(&_udp_cs, p); type = NetworkRecv_uint8(&_udp_cs, p);
if (type < PACKET_UDP_END && _network_udp_packet[type] != NULL && !_udp_cs.has_quit) { if (type < PACKET_UDP_END && *_network_udp_packet[type].incoming_socket == udp && !_udp_cs.has_quit) {
_network_udp_packet[type](p, client_addr); _network_udp_packet[type].callback(p, client_addr);
} else { } else {
if (!_udp_cs.has_quit) { if (*_network_udp_packet[type].incoming_socket != udp) {
DEBUG(net, 0, "[udp] received invalid packet type %d", type); DEBUG(net, 0, "[udp] received packet on wrong port from %s:%d", inet_ntoa(client_addr->sin_addr),ntohs(client_addr->sin_port));
} else if (!_udp_cs.has_quit) {
DEBUG(net, 0, "[udp] received invalid packet type %d from %s:%d", type, inet_ntoa(client_addr->sin_addr),ntohs(client_addr->sin_port));
} else { } else {
DEBUG(net, 0, "[udp] received illegal packet"); DEBUG(net, 0, "[udp] received illegal packet from %s:%d", inet_ntoa(client_addr->sin_addr),ntohs(client_addr->sin_port));
} }
} }
} }