void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-08-02 07:02:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Temporarily disable checks to always forward -- for testing.
Some checks failed
/ build_macos (push) Has been cancelled
Details
/ build_windows (push) Has been cancelled
Details
/ build_ubuntu (push) Has been cancelled
Details

Browse source
This commit is contained in:
Adam Ierymenko 2025-07-18 14:26:19 -04:00
parent 92838fa1b2
commit d51b82d0e6
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
node/Switch.cpp
View file

@ -83,10 +83,13 @@ void Switch::onRemotePacket(void* tPtr, const int64_t localSocket, const InetAdd
const Address destination(fragment.destination()); const Address destination(fragment.destination());
if (destination != RR->identity.address()) { if (destination != RR->identity.address()) {
// Fragment is someone else's. // 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();
@ -104,7 +107,8 @@ void Switch::onRemotePacket(void* tPtr, const int64_t localSocket, const InetAdd
} }
} }
else { else {
// Fragment looks like ours // RECEIVE: fragment appears to be ours (this is validated in cryptographic auth after assembly)
const uint64_t fragmentPacketId = fragment.packetId(); const uint64_t fragmentPacketId = fragment.packetId();
const unsigned int fragmentNumber = fragment.fragmentNumber(); const unsigned int fragmentNumber = fragment.fragmentNumber();
const unsigned int totalFragments = fragment.totalFragments(); const unsigned int totalFragments = fragment.totalFragments();
@ -165,8 +169,9 @@ void Switch::onRemotePacket(void* tPtr, const int64_t localSocket, const InetAdd
} }
if (destination != RR->identity.address()) { if (destination != RR->identity.address()) {
// Not our packet head. // 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;
} }
@ -197,7 +202,7 @@ void Switch::onRemotePacket(void* tPtr, const int64_t localSocket, const InetAdd
} }
} }
else if ((reinterpret_cast<const uint8_t*>(data)[ZT_PACKET_IDX_FLAGS] & ZT_PROTO_FLAG_FRAGMENTED) != 0) { else if ((reinterpret_cast<const uint8_t*>(data)[ZT_PACKET_IDX_FLAGS] & ZT_PROTO_FLAG_FRAGMENTED) != 0) {
// Packet is the head of a fragmented packet series // RECEIVE: packet head appears to be ours (this is validated in cryptographic auth after assembly)
const uint64_t packetId = const uint64_t packetId =
((((uint64_t)reinterpret_cast<const uint8_t*>(data)[0]) << 56) | (((uint64_t)reinterpret_cast<const uint8_t*>(data)[1]) << 48) | (((uint64_t)reinterpret_cast<const uint8_t*>(data)[2]) << 40) ((((uint64_t)reinterpret_cast<const uint8_t*>(data)[0]) << 56) | (((uint64_t)reinterpret_cast<const uint8_t*>(data)[1]) << 48) | (((uint64_t)reinterpret_cast<const uint8_t*>(data)[2]) << 40)
@ -242,7 +247,8 @@ void Switch::onRemotePacket(void* tPtr, const int64_t localSocket, const InetAdd
} // else this is a duplicate head, ignore } // else this is a duplicate head, ignore
} }
else { else {
// Packet is unfragmented, so just process it // RECEIVE: unfragmented packet appears to be ours (this is validated in cryptographic auth after assembly)
IncomingPacket packet(data, len, path, now); IncomingPacket packet(data, len, path, now);
if (! packet.tryDecode(RR, tPtr, flowId)) { if (! packet.tryDecode(RR, tPtr, flowId)) {
RXQueueEntry* const rq = _nextRXQueueEntry(); RXQueueEntry* const rq = _nextRXQueueEntry();