diff options
Diffstat (limited to 'node/Switch.cpp')
| -rw-r--r-- | node/Switch.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/node/Switch.cpp b/node/Switch.cpp index 0aa0b664..3ac0b920 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -320,8 +320,8 @@ bool Switch::unite(const Address &p1,const Address &p2,bool force) * P2 in randomized order in terms of which gets sent first. This is done * since in a few cases NAT-t can be sensitive to slight timing differences * in terms of when the two peers initiate. Normally this is accounted for - * by the nearly-simultaneous RENDEZVOUS kickoff from the supernode, but - * given that supernodes are hosted on cloud providers this can in some + * by the nearly-simultaneous RENDEZVOUS kickoff from the rootserver, but + * given that rootservers are hosted on cloud providers this can in some * cases have a few ms of latency between packet departures. By randomizing * the order we make each attempted NAT-t favor one or the other going * first, meaning if it doesn't succeed the first time it might the second @@ -565,8 +565,8 @@ void Switch::_handleRemotePacketFragment(const InetAddress &fromAddr,const void // It wouldn't hurt anything, just redundant and unnecessary. SharedPtr<Peer> relayTo = RR->topology->getPeer(destination); if ((!relayTo)||(!relayTo->send(RR,fragment.data(),fragment.size(),RR->node->now()))) { - // Don't know peer or no direct path -- so relay via supernode - relayTo = RR->topology->getBestSupernode(); + // Don't know peer or no direct path -- so relay via rootserver + relayTo = RR->topology->getBestRootserver(); if (relayTo) relayTo->send(RR,fragment.data(),fragment.size(),RR->node->now()); } @@ -641,8 +641,8 @@ void Switch::_handleRemotePacketHead(const InetAddress &fromAddr,const void *dat if ((relayTo)&&((relayTo->send(RR,packet->data(),packet->size(),RR->node->now())))) { unite(source,destination,false); } else { - // Don't know peer or no direct path -- so relay via supernode - relayTo = RR->topology->getBestSupernode(&source,1,true); + // Don't know peer or no direct path -- so relay via rootserver + relayTo = RR->topology->getBestRootserver(&source,1,true); if (relayTo) relayTo->send(RR,packet->data(),packet->size(),RR->node->now()); } @@ -712,13 +712,13 @@ void Switch::_handleBeacon(const InetAddress &fromAddr,const Buffer<ZT_PROTO_BEA Address Switch::_sendWhoisRequest(const Address &addr,const Address *peersAlreadyConsulted,unsigned int numPeersAlreadyConsulted) { - SharedPtr<Peer> supernode(RR->topology->getBestSupernode(peersAlreadyConsulted,numPeersAlreadyConsulted,false)); - if (supernode) { - Packet outp(supernode->address(),RR->identity.address(),Packet::VERB_WHOIS); + SharedPtr<Peer> rootserver(RR->topology->getBestRootserver(peersAlreadyConsulted,numPeersAlreadyConsulted,false)); + if (rootserver) { + Packet outp(rootserver->address(),RR->identity.address(),Packet::VERB_WHOIS); addr.appendTo(outp); - outp.armor(supernode->key(),true); - if (supernode->send(RR,outp.data(),outp.size(),RR->node->now())) - return supernode->address(); + outp.armor(rootserver->key(),true); + if (rootserver->send(RR,outp.data(),outp.size(),RR->node->now())) + return rootserver->address(); } return Address(); } @@ -752,7 +752,7 @@ bool Switch::_trySend(const Packet &packet,bool encrypt,uint64_t nwid) } if (!relay) - relay = RR->topology->getBestSupernode(); + relay = RR->topology->getBestRootserver(); if (!(relay)||(!(viaPath = relay->getBestPath(now)))) return false; |