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

Fix SPTPS condition in try_harder().

Browse source 
A condition in try_harder() is always evaluating to false when talking
to a SPTPS node because n->status.validkey_in is always false in that
case. Fix the condition so that the SPTPS status is correctly checked.

This prevented recent tinc-1.1 nodes from talking to older, pre-node-ID
tinc-1.1 nodes.

The regression was introduced in
6056f1c13b.
This commit is contained in:
Etienne Dechamps 2015-05-18 20:35:44 +01:00
parent 01d2519862
commit 643149b449
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/net_packet.c
View file

@ -1350,7 +1350,7 @@ static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
if(!n->status.reachable || n == myself)
continue;
if((n->status.sptps && !n->sptps.instate) || !n->status.validkey_in)
if(!n->status.validkey_in && !(n->status.sptps && n->sptps.instate))
continue;
bool soft = false;