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

Merge branch '1.1' of github.com:gsliepen/tinc into thkr-1.1-ponyhof

Browse source
This commit is contained in:
thorkill 2015-06-06 01:50:28 +02:00
commit e0221cc00d
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/net_packet.c
View file

@ -455,6 +455,13 @@ bool receive_tcppacket_sptps(connection_t *c, const char *data, int len) {
return true; return true;
} }
if(!to->status.reachable) {
/* This can happen in the form of a race condition
if the node just became unreachable. */
logger(DEBUG_TRAFFIC, LOG_WARNING, "Cannot relay TCP packet from %s (%s) because the destination, %s (%s), is unreachable", from->name, from->hostname, to->name, to->hostname);
return true;
}
/* Help the sender reach us over UDP. /* Help the sender reach us over UDP.
Note that we only do this if we're the destination or the static relay; Note that we only do this if we're the destination or the static relay;
otherwise every hop would initiate its own UDP info message, resulting in elevated chatter. */ otherwise every hop would initiate its own UDP info message, resulting in elevated chatter. */
@ -1462,6 +1469,13 @@ skip_harder:
return; return;
} }
if(!to->status.reachable) {
/* This can happen in the form of a race condition
if the node just became unreachable. */
logger(DEBUG_TRAFFIC, LOG_WARNING, "Cannot relay packet from %s (%s) because the destination, %s (%s), is unreachable", from->name, from->hostname, to->name, to->hostname);
return;
}
/* The packet is supposed to come from the originator or its static relay /* The packet is supposed to come from the originator or its static relay
(i.e. with no dynamic relays in between). (i.e. with no dynamic relays in between).
If it did not, "help" the static relay by sending it UDP info. If it did not, "help" the static relay by sending it UDP info.