projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix direct UDP communciation with pre-relaying 1.1 nodes.
[tinc]
/
src
/
net_packet.c
diff --git
a/src/net_packet.c
b/src/net_packet.c
index
4c06045
..
fc24c9a
100644
(file)
--- a/
src/net_packet.c
+++ b/
src/net_packet.c
@@
-1190,15
+1190,13
@@
static void try_tx_sptps(node_t *n, bool mtu) {
node_t *via = (n->via == myself) ? n->nexthop : n->via;
node_t *via = (n->via == myself) ? n->nexthop : n->via;
- /* If
the static relay doesn't support SPTPS, everything goes via TCP anyway
. */
+ /* If
we do have a static relay, try everything with that one instead, if it supports relaying
. */
- if((via->options >> 24) < 4)
- return;
-
- /* If we do have a static relay, try everything with that one instead. */
-
- if(via != n)
+ if(via != n) {
+ if((via->options >> 24) < 4)
+ return;
return try_tx_sptps(via, mtu);
return try_tx_sptps(via, mtu);
+ }
/* Otherwise, try to establish UDP connectivity. */
/* Otherwise, try to establish UDP connectivity. */