mirrors/ZeroTierOne
1
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2026-01-01 14:51:49 -08:00
Code Issues Projects Releases Wiki Activity

Plumb through attaching network ID to packet sends.

Browse source
This commit is contained in:
Adam Ierymenko 2025-07-16 11:55:00 -04:00
parent 58c80ff0ab
commit 055be92ef0
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
11 changed files with 76 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
node/Multicaster.cpp
View file

@ -272,7 +272,7 @@ void Multicaster::send(void* tPtr, int64_t now, const SharedPtr<Network>& networ
Address explicitGatherPeers[16];
unsigned int numExplicitGatherPeers = 0;
SharedPtr<Peer> bestRoot(RR->topology->getUpstreamPeer());
SharedPtr<Peer> bestRoot(RR->topology->getUpstreamPeer(network->id()));
if (bestRoot) {
explicitGatherPeers[numExplicitGatherPeers++] = bestRoot->address();
}
@ -312,7 +312,7 @@ void Multicaster::send(void* tPtr, int64_t now, const SharedPtr<Network>& networ
com->serialize(outp);
}
RR->node->expectReplyTo(outp.packetId());
RR->sw->send(tPtr, outp, true);
RR->sw->send(tPtr, outp, true, network->id(), ZT_QOS_NO_FLOW);
Metrics::pkt_multicast_gather_out++;
}
}