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

Do not compress frames -- also unrelated to bug.

Browse source
This commit is contained in:
Adam Ierymenko 2025-08-25 11:47:50 -07:00
parent bed6557a6d
commit 1e62d69762
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
2 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
node/Network.cpp
View file

@ -801,7 +801,6 @@ bool Network::filterOutgoingPacket(
macSource.appendTo(outp); macSource.appendTo(outp);
outp.append((uint16_t)etherType); outp.append((uint16_t)etherType);
outp.append(frameData, ccLength2); outp.append(frameData, ccLength2);
outp.compress();
RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW); RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW);
} }
@ -839,7 +838,6 @@ bool Network::filterOutgoingPacket(
macSource.appendTo(outp); macSource.appendTo(outp);
outp.append((uint16_t)etherType); outp.append((uint16_t)etherType);
outp.append(frameData, ccLength); outp.append(frameData, ccLength);
outp.compress();
RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW); RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW);
} }
@ -851,7 +849,6 @@ bool Network::filterOutgoingPacket(
macSource.appendTo(outp); macSource.appendTo(outp);
outp.append((uint16_t)etherType); outp.append((uint16_t)etherType);
outp.append(frameData, frameLen); outp.append(frameData, frameLen);
outp.compress();
RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW); RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW);
if (_config.remoteTraceTarget) { if (_config.remoteTraceTarget) {
@ -978,7 +975,6 @@ int Network::filterIncomingPacket(
macSource.appendTo(outp); macSource.appendTo(outp);
outp.append((uint16_t)etherType); outp.append((uint16_t)etherType);
outp.append(frameData, ccLength2); outp.append(frameData, ccLength2);
outp.compress();
RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW); RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW);
} }
break; break;
@ -1011,7 +1007,6 @@ int Network::filterIncomingPacket(
macSource.appendTo(outp); macSource.appendTo(outp);
outp.append((uint16_t)etherType); outp.append((uint16_t)etherType);
outp.append(frameData, ccLength); outp.append(frameData, ccLength);
outp.compress();
RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW); RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW);
} }
@ -1023,7 +1018,6 @@ int Network::filterIncomingPacket(
macSource.appendTo(outp); macSource.appendTo(outp);
outp.append((uint16_t)etherType); outp.append((uint16_t)etherType);
outp.append(frameData, frameLen); outp.append(frameData, frameLen);
outp.compress();
RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW); RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW);
if (_config.remoteTraceTarget) { if (_config.remoteTraceTarget) {
@ -1752,19 +1746,17 @@ void Network::_sendUpdatesToMembers(void* tPtr, const MulticastGroup* const newM
std::sort(alwaysAnnounceTo.begin(), alwaysAnnounceTo.end()); std::sort(alwaysAnnounceTo.begin(), alwaysAnnounceTo.end());
for (std::vector<Address>::const_iterator a(alwaysAnnounceTo.begin()); a != alwaysAnnounceTo.end(); ++a) { for (std::vector<Address>::const_iterator a(alwaysAnnounceTo.begin()); a != alwaysAnnounceTo.end(); ++a) {
/*
// push COM to non-members so they can do multicast request auth // push COM to non-members so they can do multicast request auth
if ( (_config.com) && (!_memberships.contains(*a)) && (*a != RR->identity.address()) ) { if ((_config.com) && (! _memberships.contains(*a)) && (*a != RR->identity.address())) {
Packet outp(*a,RR->identity.address(),Packet::VERB_NETWORK_CREDENTIALS); Packet outp(*a, RR->identity.address(), Packet::VERB_NETWORK_CREDENTIALS);
_config.com.serialize(outp); _config.com.serialize(outp);
outp.append((uint8_t)0x00); outp.append((uint8_t)0x00);
outp.append((uint16_t)0); // no capabilities outp.append((uint16_t)0); // no capabilities
outp.append((uint16_t)0); // no tags outp.append((uint16_t)0); // no tags
outp.append((uint16_t)0); // no revocations outp.append((uint16_t)0); // no revocations
outp.append((uint16_t)0); // no certificates of ownership outp.append((uint16_t)0); // no certificates of ownership
RR->sw->send(tPtr,outp,true); RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW);
} }
*/
_announceMulticastGroupsTo(tPtr, *a, groups); _announceMulticastGroupsTo(tPtr, *a, groups);
} }
} }

2
node/Topology.cpp
View file

@ -146,6 +146,7 @@ SharedPtr<Peer> Topology::getUpstreamPeer(const uint64_t nwid)
unsigned int bestq = ~((unsigned int)0); unsigned int bestq = ~((unsigned int)0);
const SharedPtr<Peer>* best = (const SharedPtr<Peer>*)0; const SharedPtr<Peer>* best = (const SharedPtr<Peer>*)0;
/*
// If this is related to a network, check for a network specific relay. // If this is related to a network, check for a network specific relay.
if (nwid) { if (nwid) {
SharedPtr<Network> network = RR->node->network(nwid); SharedPtr<Network> network = RR->node->network(nwid);
@ -153,6 +154,7 @@ SharedPtr<Peer> Topology::getUpstreamPeer(const uint64_t nwid)
// //
} }
} }
*/
// If this is unrelated to a network OR there is no network-specific relay, send via a root. // If this is unrelated to a network OR there is no network-specific relay, send via a root.
{ {