j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Move UDP probe reply code into its own function.

Browse source 
This reduces the level of indentation, and prepares for sending gratuitous type 2 probe replies.
This commit is contained in:
Guus Sliepen 2015-01-11 16:12:57 +01:00
parent f0afde0467
commit 79b6adb489
1 changed files with 63 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/net_packet.c
View file

@ -101,10 +101,7 @@ static void udp_probe_timeout_handler(void *data) {
n->maxmtu = MTU; n->maxmtu = MTU;
} }
static void udp_probe_h(node_t *n, vpn_packet_t *packet, length_t len) { static void send_udp_probe_reply(node_t *n, vpn_packet_t *packet, length_t len) {
if(!DATA(packet)[0]) {
/* It's a probe request, send back a reply */
if(!n->status.sptps && !n->status.validkey) { if(!n->status.sptps && !n->status.validkey) {
// But not if we don't have his key. // But not if we don't have his key.
logger(DEBUG_TRAFFIC, LOG_INFO, "Got UDP probe request from %s (%s) but we don't have his key yet", n->name, n->hostname); logger(DEBUG_TRAFFIC, LOG_INFO, "Got UDP probe request from %s (%s) but we don't have his key yet", n->name, n->hostname);
@ -117,7 +114,8 @@ static void udp_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
if ((n->options >> 24) >= 3) { if ((n->options >> 24) >= 3) {
uint8_t *data = DATA(packet); uint8_t *data = DATA(packet);
*data++ = 2; *data++ = 2;
uint16_t len16 = htons(len); memcpy(data, &len16, 2); data += 2; uint16_t len16 = htons(len);
memcpy(data, &len16, 2);
packet->len = MIN_PROBE_SIZE; packet->len = MIN_PROBE_SIZE;
} else { } else {
/* Legacy protocol: n won't understand type 2 probe replies. */ /* Legacy protocol: n won't understand type 2 probe replies. */
@ -131,16 +129,22 @@ static void udp_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
n->status.udp_confirmed = true; n->status.udp_confirmed = true;
send_udppacket(n, packet); send_udppacket(n, packet);
n->status.udp_confirmed = udp_confirmed; n->status.udp_confirmed = udp_confirmed;
} else { }
length_t probelen = len;
static void udp_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
if(!DATA(packet)[0]) {
/* It's a probe request, send back a reply */
return send_udp_probe_reply(n, packet, len);
}
if (DATA(packet)[0] == 2) { if (DATA(packet)[0] == 2) {
if (len < 3) // It's a type 2 probe reply, use the length field inside the packet
logger(DEBUG_TRAFFIC, LOG_WARNING, "Received invalid (too short) UDP probe reply from %s (%s)", n->name, n->hostname); uint16_t len16;
else { memcpy(&len16, DATA(packet) + 1, 2);
uint16_t probelen16; memcpy(&probelen16, DATA(packet) + 1, 2); probelen = ntohs(probelen16); len = ntohs(len16);
} }
}
logger(DEBUG_TRAFFIC, LOG_INFO, "Got type %d UDP probe reply %d from %s (%s)", DATA(packet)[0], probelen, n->name, n->hostname); logger(DEBUG_TRAFFIC, LOG_INFO, "Got type %d UDP probe reply %d from %s (%s)", DATA(packet)[0], len, n->name, n->hostname);
/* It's a valid reply: now we know bidirectional communication /* It's a valid reply: now we know bidirectional communication
is possible using the address and socket that the reply is possible using the address and socket that the reply
@ -152,26 +156,26 @@ static void udp_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
timeout_add(&n->udp_ping_timeout, &udp_probe_timeout_handler, n, &(struct timeval){udp_discovery_timeout, 0}); timeout_add(&n->udp_ping_timeout, &udp_probe_timeout_handler, n, &(struct timeval){udp_discovery_timeout, 0});
} }
if(probelen > n->maxmtu) { if(len > n->maxmtu) {
logger(DEBUG_TRAFFIC, LOG_INFO, "Increase in PMTU to %s (%s) detected, restarting PMTU discovery", n->name, n->hostname); logger(DEBUG_TRAFFIC, LOG_INFO, "Increase in PMTU to %s (%s) detected, restarting PMTU discovery", n->name, n->hostname);
n->minmtu = probelen; n->minmtu = len;
n->maxmtu = MTU; n->maxmtu = MTU;
/* Set mtuprobes to 1 so that try_mtu() doesn't reset maxmtu */ /* Set mtuprobes to 1 so that try_mtu() doesn't reset maxmtu */
n->mtuprobes = 1; n->mtuprobes = 1;
return; return;
} else if(n->mtuprobes < 0 && probelen == n->maxmtu) { } else if(n->mtuprobes < 0 && len == n->maxmtu) {
/* We got a maxmtu sized packet, confirming the PMTU is still valid. */ /* We got a maxmtu sized packet, confirming the PMTU is still valid. */
n->mtuprobes = -1; n->mtuprobes = -1;
n->mtu_ping_sent = now;
} }
/* If applicable, raise the minimum supported MTU */ /* If applicable, raise the minimum supported MTU */
if(n->minmtu < probelen) { if(n->minmtu < len) {
n->minmtu = probelen; n->minmtu = len;
try_fix_mtu(n); try_fix_mtu(n);
} }
} }
}
static length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t len, int level) { static length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t len, int level) {
if(level == 0) { if(level == 0) {