Browse Source

Revert... no luck with any of that.

Adam Ierymenko 10 years ago
parent
commit
4564dd95ff
1 changed files with 2 additions and 8 deletions
  1. 2 8
      node/Switch.cpp

+ 2 - 8
node/Switch.cpp

@@ -390,16 +390,10 @@ void Switch::rendezvous(const SharedPtr<Peer> &peer,const InetAddress &atAddr)
 {
 {
 	TRACE("sending NAT-t message to %s(%s)",peer->address().toString().c_str(),atAddr.toString().c_str());
 	TRACE("sending NAT-t message to %s(%s)",peer->address().toString().c_str(),atAddr.toString().c_str());
 	const uint64_t now = RR->node->now();
 	const uint64_t now = RR->node->now();
-
-	if ((atAddr.ss_family == AF_INET)&&(RR->sa->areGlobalIPv4PortsRandomized())) {
-		peer->attemptToContactAt(RR,atAddr,now);
-	} else {
-		TRACE("behind randomizing symmetric NAT -- delaying initial message to %s(%s)",peer->address().toString().c_str(),atAddr.toString().c_str());
-	}
-
+	peer->attemptToContactAt(RR,atAddr,now);
 	{
 	{
 		Mutex::Lock _l(_contactQueue_m);
 		Mutex::Lock _l(_contactQueue_m);
-		_contactQueue.push_back(ContactQueueEntry(peer,now + (ZT_NAT_T_TACTICAL_ESCALATION_DELAY / 2),atAddr));
+		_contactQueue.push_back(ContactQueueEntry(peer,now + ZT_NAT_T_TACTICAL_ESCALATION_DELAY,atAddr));
 	}
 	}
 }
 }