ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-24 15:16:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More NAT strategy cleanup.

Browse Source
This commit is contained in:
Adam Ierymenko 2015-04-06 15:08:45 -07:00
parent be4683a96d
commit 197d272287
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
node/Switch.cpp
View File

@ -457,30 +457,27 @@ unsigned long Switch::doTimerTasks()
Packet outp(qi->peer->address(),RR->identity.address(),Packet::VERB_NOP); Packet outp(qi->peer->address(),RR->identity.address(),Packet::VERB_NOP);
outp.armor(qi->peer->key(),false); outp.armor(qi->peer->key(),false);
switch(qi->strategyIteration) { switch(qi->strategyIteration++) {
case 0: case 0: {
// First strategy: rifle method: direct packet to known port // First strategy: rifle method: direct packet to known port
++qi->strategyIteration;
RR->node->putPacket(qi->inaddr,outp.data(),outp.size(),qi->currentDesperation); RR->node->putPacket(qi->inaddr,outp.data(),outp.size(),qi->currentDesperation);
break; } break;
case 1: { case 1: {
// Second strategy: shotgun method up: try a few ports above // Second strategy: shotgun method up: try a few ports above
++qi->strategyIteration; InetAddress tmpaddr(qi->inaddr);
int p = (int)qi->inaddr.port(); int p = (int)qi->inaddr.port();
for(int i=0;i<9;++i) { for(int i=0;i<9;++i) {
if (++p > 0xffff) break; if (++p > 0xffff) break;
InetAddress tmpaddr(qi->inaddr);
tmpaddr.setPort((unsigned int)p); tmpaddr.setPort((unsigned int)p);
RR->node->putPacket(tmpaddr,outp.data(),outp.size(),qi->currentDesperation); RR->node->putPacket(tmpaddr,outp.data(),outp.size(),qi->currentDesperation);
} }
} break; } break;
case 2: { case 2: {
// Third strategy: shotgun method down: try a few ports below // Third strategy: shotgun method down: try a few ports below
++qi->strategyIteration; InetAddress tmpaddr(qi->inaddr);
int p = (int)qi->inaddr.port(); int p = (int)qi->inaddr.port();
for(int i=0;i<3;++i) { for(int i=0;i<3;++i) {
if (--p < 1024) break; if (--p < 1024) break;
InetAddress tmpaddr(qi->inaddr);
tmpaddr.setPort((unsigned int)p); tmpaddr.setPort((unsigned int)p);
RR->node->putPacket(tmpaddr,outp.data(),outp.size(),qi->currentDesperation); RR->node->putPacket(tmpaddr,outp.data(),outp.size(),qi->currentDesperation);
} }