From 1e62d697629ca5d24794b379df2bda8e4158aa1b Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 25 Aug 2025 11:47:50 -0700 Subject: [PATCH] Do not compress frames -- also unrelated to bug. --- node/Network.cpp | 22 +++++++--------------- node/Topology.cpp | 2 ++ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/node/Network.cpp b/node/Network.cpp index 85c930998..425941f00 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -801,7 +801,6 @@ bool Network::filterOutgoingPacket( macSource.appendTo(outp); outp.append((uint16_t)etherType); outp.append(frameData, ccLength2); - outp.compress(); RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW); } @@ -839,7 +838,6 @@ bool Network::filterOutgoingPacket( macSource.appendTo(outp); outp.append((uint16_t)etherType); outp.append(frameData, ccLength); - outp.compress(); RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW); } @@ -851,7 +849,6 @@ bool Network::filterOutgoingPacket( macSource.appendTo(outp); outp.append((uint16_t)etherType); outp.append(frameData, frameLen); - outp.compress(); RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW); if (_config.remoteTraceTarget) { @@ -978,7 +975,6 @@ int Network::filterIncomingPacket( macSource.appendTo(outp); outp.append((uint16_t)etherType); outp.append(frameData, ccLength2); - outp.compress(); RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW); } break; @@ -1011,7 +1007,6 @@ int Network::filterIncomingPacket( macSource.appendTo(outp); outp.append((uint16_t)etherType); outp.append(frameData, ccLength); - outp.compress(); RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW); } @@ -1023,7 +1018,6 @@ int Network::filterIncomingPacket( macSource.appendTo(outp); outp.append((uint16_t)etherType); outp.append(frameData, frameLen); - outp.compress(); RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW); if (_config.remoteTraceTarget) { @@ -1752,19 +1746,17 @@ void Network::_sendUpdatesToMembers(void* tPtr, const MulticastGroup* const newM std::sort(alwaysAnnounceTo.begin(), alwaysAnnounceTo.end()); for (std::vector
::const_iterator a(alwaysAnnounceTo.begin()); a != alwaysAnnounceTo.end(); ++a) { - /* // push COM to non-members so they can do multicast request auth - if ( (_config.com) && (!_memberships.contains(*a)) && (*a != RR->identity.address()) ) { - Packet outp(*a,RR->identity.address(),Packet::VERB_NETWORK_CREDENTIALS); + if ((_config.com) && (! _memberships.contains(*a)) && (*a != RR->identity.address())) { + Packet outp(*a, RR->identity.address(), Packet::VERB_NETWORK_CREDENTIALS); _config.com.serialize(outp); outp.append((uint8_t)0x00); - outp.append((uint16_t)0); // no capabilities - outp.append((uint16_t)0); // no tags - outp.append((uint16_t)0); // no revocations - outp.append((uint16_t)0); // no certificates of ownership - RR->sw->send(tPtr,outp,true); + outp.append((uint16_t)0); // no capabilities + outp.append((uint16_t)0); // no tags + outp.append((uint16_t)0); // no revocations + outp.append((uint16_t)0); // no certificates of ownership + RR->sw->send(tPtr, outp, true, _id, ZT_QOS_NO_FLOW); } - */ _announceMulticastGroupsTo(tPtr, *a, groups); } } diff --git a/node/Topology.cpp b/node/Topology.cpp index 306710562..6959ac858 100644 --- a/node/Topology.cpp +++ b/node/Topology.cpp @@ -146,6 +146,7 @@ SharedPtr Topology::getUpstreamPeer(const uint64_t nwid) unsigned int bestq = ~((unsigned int)0); const SharedPtr* best = (const SharedPtr*)0; + /* // If this is related to a network, check for a network specific relay. if (nwid) { SharedPtr network = RR->node->network(nwid); @@ -153,6 +154,7 @@ SharedPtr Topology::getUpstreamPeer(const uint64_t nwid) // } } + */ // If this is unrelated to a network OR there is no network-specific relay, send via a root. {