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

Merge branch 'thkr-1.1-20160510-fix-receive_tcppacket_sptps' into thkr-1.1-ponyhof

Browse source
This commit is contained in:
thorkill 2016-05-10 12:01:06 +02:00
commit bd95c231ce
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/net_packet.c
View file

@ -471,8 +471,11 @@ bool receive_tcppacket_sptps(connection_t *c, const char *data, int len) {
/* If we're not the final recipient, relay the packet. */ /* If we're not the final recipient, relay the packet. */
if(to != myself) { if(to != myself) {
send_sptps_data(to, from, 0, data, len); if (!to->status.waitingforkey) {
try_tx(to, true); send_sptps_data(to, from, 0, data, len);
try_tx(to, true);
} else
logger(DEBUG_ALWAYS, LOG_INFO, "Cannot forward TCP packet from %s (%s) to %s (%s) because we are still wating for key", from->name, from->hostname, to->name, to->hostname);
return true; return true;
} }