projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Cache node IDs in a hash table for faster lookups."
[tinc]
/
src
/
protocol_edge.c
diff --git
a/src/protocol_edge.c
b/src/protocol_edge.c
index
1924ee3
..
c000ec0
100644
(file)
--- a/
src/protocol_edge.c
+++ b/
src/protocol_edge.c
@@
-158,8
+158,11
@@
bool add_edge_h(connection_t *c, const char *request) {
// Otherwise, just ignore it.
sockaddrfree(&local_address);
return true;
// Otherwise, just ignore it.
sockaddrfree(&local_address);
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);
e->local_address = local_address;
sockaddrfree(&e->local_address);
e->local_address = local_address;
@@
-169,6
+172,7
@@
bool add_edge_h(connection_t *c, const char *request) {
return true;
} else {
return true;
} else {
+ sockaddrfree(&local_address);
return true;
}
} else {
return true;
}
} else {