diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-19 10:23:25 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-19 10:23:25 -0700 |
| commit | 7bae95836c8824a76e0299df776a708eb3e58576 (patch) | |
| tree | 67fd37bb38b209fffcc7e480004dbd298a507d10 /node/Network.cpp | |
| parent | 07f84a99b4458b3ddf5c14b9ce9b7c1dc5e2763e (diff) | |
| download | infinitytier-7bae95836c8824a76e0299df776a708eb3e58576.tar.gz infinitytier-7bae95836c8824a76e0299df776a708eb3e58576.zip | |
Root server terminology cleanup, and tighten up a security check by checking full identity of peers instead of just address.
Diffstat (limited to 'node/Network.cpp')
| -rw-r--r-- | node/Network.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node/Network.cpp b/node/Network.cpp index 60262cd5..a217595a 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -518,13 +518,13 @@ public: RR(renv), _now(renv->node->now()), _network(nw), - _rootserverAddresses(renv->topology->rootserverAddresses()), + _rootAddresses(renv->topology->rootAddresses()), _allMulticastGroups(nw->_allMulticastGroups()) {} inline void operator()(Topology &t,const SharedPtr<Peer> &p) { - if ( ( (p->hasActiveDirectPath(_now)) && (_network->_isAllowed(p->address())) ) || (std::find(_rootserverAddresses.begin(),_rootserverAddresses.end(),p->address()) != _rootserverAddresses.end()) ) { + if ( ( (p->hasActiveDirectPath(_now)) && (_network->_isAllowed(p->address())) ) || (std::find(_rootAddresses.begin(),_rootAddresses.end(),p->address()) != _rootAddresses.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> _rootserverAddresses; + std::vector<Address> _rootAddresses; std::vector<MulticastGroup> _allMulticastGroups; }; |