projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't set up an ongoing connection to myself.
[tinc]
/
src
/
net_packet.c
diff --git
a/src/net_packet.c
b/src/net_packet.c
index
8313a54
..
e4b839e
100644
(file)
--- a/
src/net_packet.c
+++ b/
src/net_packet.c
@@
-282,9
+282,8
@@
static bool receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
}
return false;
}
}
return false;
}
- inpkt->offset += 2 * sizeof(node_id_t);
n->status.udppacket = true;
n->status.udppacket = true;
- bool result = sptps_receive_data(&n->sptps, DATA(inpkt), inpkt->len
- 2 * sizeof(node_id_t)
);
+ bool result = sptps_receive_data(&n->sptps, DATA(inpkt), inpkt->len);
n->status.udppacket = false;
if(!result) {
n->status.udppacket = false;
if(!result) {
@@
-1191,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)
- return try_tx_sptps(via, mtu);
+ if(via != n) {
+ if((via->options >> 24) < 4)
+ return;
+ return try_tx(via, mtu);
+ }
/* Otherwise, try to establish UDP connectivity. */
/* Otherwise, try to establish UDP connectivity. */
@@
-1211,7
+1208,7
@@
static void try_tx_sptps(node_t *n, bool mtu) {
while we try to establish direct connectivity. */
if(!n->status.udp_confirmed && n != n->nexthop && (n->nexthop->options >> 24) >= 4)
while we try to establish direct connectivity. */
if(!n->status.udp_confirmed && n != n->nexthop && (n->nexthop->options >> 24) >= 4)
- try_tx
_sptps
(n->nexthop, mtu);
+ try_tx(n->nexthop, mtu);
}
static void try_tx_legacy(node_t *n, bool mtu) {
}
static void try_tx_legacy(node_t *n, bool mtu) {
@@
-1236,6
+1233,8
@@
static void try_tx_legacy(node_t *n, bool mtu) {
}
void try_tx(node_t *n, bool mtu) {
}
void try_tx(node_t *n, bool mtu) {
+ if(!n->status.reachable)
+ return;
if(n->status.sptps)
try_tx_sptps(n, mtu);
else
if(n->status.sptps)
try_tx_sptps(n, mtu);
else
@@
-1272,7
+1271,7
@@
void send_packet(node_t *n, vpn_packet_t *packet) {
if(n->status.sptps) {
send_sptps_packet(n, packet);
if(n->status.sptps) {
send_sptps_packet(n, packet);
- try_tx
_sptps
(n, true);
+ try_tx(n, true);
return;
}
return;
}
@@
-1292,7
+1291,7
@@
void send_packet(node_t *n, vpn_packet_t *packet) {
}
send_udppacket(via, packet);
}
send_udppacket(via, packet);
- try_tx
_legacy
(via, true);
+ try_tx(via, true);
}
void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
}
void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
@@
-1350,7
+1349,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.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;
continue;
bool soft = false;
@@
-1440,10
+1439,16
@@
skip_harder:
return;
}
return;
}
+ pkt.offset = 0;
+
if(n->status.sptps) {
if(n->status.sptps) {
- pkt.offset = 2 * sizeof(node_id_t);
+ bool relay_enabled = (n->options >> 24) >= 4;
+ if (relay_enabled) {
+ pkt.offset = 2 * sizeof(node_id_t);
+ pkt.len -= pkt.offset;
+ }
- if(!memcmp(DSTID(&pkt), &nullid, sizeof nullid)) {
+ if(!memcmp(DSTID(&pkt), &nullid, sizeof nullid)
|| !relay_enabled
) {
direct = true;
from = n;
to = myself;
direct = true;
from = n;
to = myself;
@@
-1468,8
+1473,8
@@
skip_harder:
/* If we're not the final recipient, relay the packet. */
if(to != myself) {
/* If we're not the final recipient, relay the packet. */
if(to != myself) {
- send_sptps_data(to, from, 0, DATA(&pkt), pkt.len
- 2 * sizeof(node_id_t)
);
- try_tx
_sptps
(to, true);
+ send_sptps_data(to, from, 0, DATA(&pkt), pkt.len);
+ try_tx(to, true);
return;
}
} else {
return;
}
} else {
@@
-1477,7
+1482,6
@@
skip_harder:
from = n;
}
from = n;
}
- pkt.offset = 0;
if(!receive_udppacket(from, &pkt))
return;
if(!receive_udppacket(from, &pkt))
return;