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

Prevent tinc from forgeting e->local_address

Browse source 
If ADD_EDGE came from tinc version 1.0.x local_address.sa.sa_family is set to 0.
If it came from tinc version 1.1.x forwarded for older verion it will be 255 - AF_UNKNOWN.
This commit is contained in:
thorkill 2015-07-07 23:14:08 +02:00 committed by Guus Sliepen
parent 1e7ef38198
commit 3c54765bcd
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/protocol_edge.c
View file

@ -158,8 +158,11 @@ bool add_edge_h(connection_t *c, const char *request) {
// Otherwise, just ignore it. // Otherwise, just ignore it.
sockaddrfree(&local_address); sockaddrfree(&local_address);
return true; return true;
} else if(local_address.sa.sa_family) { } else if(local_address.sa.sa_family && local_address.sa.sa_family != AF_UNKNOWN) {
// We learned a new local address for this edge. // We learned a new local address for this edge.
// local_address.sa.sa_family will be 0 if we got it from older tinc versions
// local_address.sa.sa_family will be 255 (AF_UNKNOWN) if we got it from newer versions
// but for edge which does not have local_address
sockaddrfree(&e->local_address); sockaddrfree(&e->local_address);
e->local_address = local_address; e->local_address = local_address;
@ -169,6 +172,7 @@ bool add_edge_h(connection_t *c, const char *request) {
return true; return true;
} else { } else {
sockaddrfree(&local_address);
return true; return true;
} }
} else { } else {