소스 검색

Do not compress frames -- also unrelated to bug.

Adam Ierymenko 2 주 전
부모
커밋
1e62d69762
2개의 변경된 파일9개의 추가작업 그리고 15개의 파일을 삭제
  1. 7 15
      node/Network.cpp
  2. 2 0
      node/Topology.cpp

+ 7 - 15
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<Address>::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);
 		}
 	}

+ 2 - 0
node/Topology.cpp

@@ -146,6 +146,7 @@ SharedPtr<Peer> Topology::getUpstreamPeer(const uint64_t nwid)
 	unsigned int bestq = ~((unsigned int)0);
 	const SharedPtr<Peer>* best = (const SharedPtr<Peer>*)0;
 
+	/*
 	// If this is related to a network, check for a network specific relay.
 	if (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.
 	{