diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-06 14:37:17 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-06 14:37:17 -0800 |
| commit | 5f39d5b7ea202ca39cef46779b5406e35e0dcb3e (patch) | |
| tree | 55ab5bce49ab997afd65e9057b040eb3dcad4e12 /node/Switch.cpp | |
| parent | 9490b1f13696d6719c61453a9d2013a315da4dd1 (diff) | |
| download | infinitytier-5f39d5b7ea202ca39cef46779b5406e35e0dcb3e.tar.gz infinitytier-5f39d5b7ea202ca39cef46779b5406e35e0dcb3e.zip | |
Further pare down Cluster messaging and rename some stuff.
Diffstat (limited to 'node/Switch.cpp')
| -rw-r--r-- | node/Switch.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node/Switch.cpp b/node/Switch.cpp index 8d3c12f5..4d6dacff 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -435,7 +435,7 @@ void Switch::rendezvous(const SharedPtr<Peer> &peer,const InetAddress &localAddr { TRACE("sending NAT-t message to %s(%s)",peer->address().toString().c_str(),atAddr.toString().c_str()); const uint64_t now = RR->node->now(); - peer->attemptToContactAt(RR,localAddr,atAddr,now); + peer->sendHELLO(RR,localAddr,atAddr,now); { Mutex::Lock _l(_contactQueue_m); _contactQueue.push_back(ContactQueueEntry(peer,now + ZT_NAT_T_TACTICAL_ESCALATION_DELAY,localAddr,atAddr)); @@ -508,14 +508,14 @@ unsigned long Switch::doTimerTasks(uint64_t now) } else { if (qi->strategyIteration == 0) { // First strategy: send packet directly to destination - qi->peer->attemptToContactAt(RR,qi->localAddr,qi->inaddr,now); + qi->peer->sendHELLO(RR,qi->localAddr,qi->inaddr,now); } else if (qi->strategyIteration <= 4) { // Strategies 1-4: try escalating ports for symmetric NATs that remap sequentially InetAddress tmpaddr(qi->inaddr); int p = (int)qi->inaddr.port() + qi->strategyIteration; if (p < 0xffff) { tmpaddr.setPort((unsigned int)p); - qi->peer->attemptToContactAt(RR,qi->localAddr,tmpaddr,now); + qi->peer->sendHELLO(RR,qi->localAddr,tmpaddr,now); } else qi->strategyIteration = 5; } else { // All strategies tried, expire entry |