summaryrefslogtreecommitdiff
path: root/node/Network.cpp
diff options
context:
space:
mode:
authorGrant Limberg <glimberg@gmail.com>2015-06-17 18:42:23 -0700
committerGrant Limberg <glimberg@gmail.com>2015-06-17 18:42:23 -0700
commitdfdd46db80331104366747e336323095aba2c886 (patch)
tree9d7d65a6fcee14f59b9e07dca248a9ae3e180e4e /node/Network.cpp
parentc59c74dddab862ade65938e630dc0f561fcb0c2f (diff)
parent87bb0086deadf3663c3e0ec1308e0d71a6473362 (diff)
downloadinfinitytier-dfdd46db80331104366747e336323095aba2c886.tar.gz
infinitytier-dfdd46db80331104366747e336323095aba2c886.zip
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/Network.cpp')
-rw-r--r--node/Network.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/node/Network.cpp b/node/Network.cpp
index e513f43f..60262cd5 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -518,13 +518,13 @@ public:
RR(renv),
_now(renv->node->now()),
_network(nw),
- _supernodeAddresses(renv->topology->supernodeAddresses()),
+ _rootserverAddresses(renv->topology->rootserverAddresses()),
_allMulticastGroups(nw->_allMulticastGroups())
{}
inline void operator()(Topology &t,const SharedPtr<Peer> &p)
{
- if ( ( (p->hasActiveDirectPath(_now)) && (_network->_isAllowed(p->address())) ) || (std::find(_supernodeAddresses.begin(),_supernodeAddresses.end(),p->address()) != _supernodeAddresses.end()) ) {
+ if ( ( (p->hasActiveDirectPath(_now)) && (_network->_isAllowed(p->address())) ) || (std::find(_rootserverAddresses.begin(),_rootserverAddresses.end(),p->address()) != _rootserverAddresses.end()) ) {
Packet outp(p->address(),RR->identity.address(),Packet::VERB_MULTICAST_LIKE);
for(std::vector<MulticastGroup>::iterator mg(_allMulticastGroups.begin());mg!=_allMulticastGroups.end();++mg) {
@@ -551,7 +551,7 @@ private:
const RuntimeEnvironment *RR;
uint64_t _now;
Network *_network;
- std::vector<Address> _supernodeAddresses;
+ std::vector<Address> _rootserverAddresses;
std::vector<MulticastGroup> _allMulticastGroups;
};