diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-28 12:00:50 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-28 12:00:50 -0700 |
| commit | 4564dd95ffa287b3752a59378137c59773d51ef9 (patch) | |
| tree | 550131c35b17eb2f5f59cf01300d41c9e83d2320 /node | |
| parent | d2bfdfa6e79e54ba1d5127a75a56f7ec57415cf9 (diff) | |
| download | infinitytier-4564dd95ffa287b3752a59378137c59773d51ef9.tar.gz infinitytier-4564dd95ffa287b3752a59378137c59773d51ef9.zip | |
Revert... no luck with any of that.
Diffstat (limited to 'node')
| -rw-r--r-- | node/Switch.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/node/Switch.cpp b/node/Switch.cpp index 247b2d18..bf9308b0 100644 --- a/node/Switch.cpp +++ b/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()); 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); - _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)); } } |