mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-09-07 07:12:52 +02:00
Re-enable relaying checks, also not bug related but put back after we decided to punt removing moons.
This commit is contained in:
parent
0d3ed4769e
commit
bed6557a6d
1 changed files with 1 additions and 4 deletions
|
@ -79,12 +79,9 @@ void Switch::onRemotePacket(void* tPtr, const int64_t localSocket, const InetAdd
|
||||||
|
|
||||||
if (destination != RR->identity.address()) {
|
if (destination != RR->identity.address()) {
|
||||||
// RELAY: fragment is for a different node, so maybe send it there if we should relay.
|
// RELAY: fragment is for a different node, so maybe send it there if we should relay.
|
||||||
|
|
||||||
/*
|
|
||||||
if ((! RR->topology->amUpstream()) && (! path->trustEstablished(now))) {
|
if ((! RR->topology->amUpstream()) && (! path->trustEstablished(now))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
|
|
||||||
if (fragment.hops() < ZT_RELAY_MAX_HOPS) {
|
if (fragment.hops() < ZT_RELAY_MAX_HOPS) {
|
||||||
fragment.incrementHops();
|
fragment.incrementHops();
|
||||||
|
@ -166,7 +163,7 @@ void Switch::onRemotePacket(void* tPtr, const int64_t localSocket, const InetAdd
|
||||||
if (destination != RR->identity.address()) {
|
if (destination != RR->identity.address()) {
|
||||||
// RELAY: packet head is for a different node, so maybe send it there if we should relay.
|
// RELAY: packet head is for a different node, so maybe send it there if we should relay.
|
||||||
|
|
||||||
if (/* (! RR->topology->amUpstream()) && (! path->trustEstablished(now)) && */ (source != RR->identity.address())) {
|
if ((! RR->topology->amUpstream()) && (! path->trustEstablished(now)) && (source != RR->identity.address())) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue