diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-08-01 11:52:47 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-08-01 11:52:47 -0700 |
| commit | 0fd6808e21755e55603f99086e28b47fe1348f04 (patch) | |
| tree | b37c08ca4c3073c4c65a9849335d03476501c970 /node/Network.cpp | |
| parent | c9b4028cd32e940a3ccd1c44cb6ebcf850e145d0 (diff) | |
| parent | bf193dd3cfee7c343c5efd7b06df034d8b731d47 (diff) | |
| download | infinitytier-0fd6808e21755e55603f99086e28b47fe1348f04.tar.gz infinitytier-0fd6808e21755e55603f99086e28b47fe1348f04.zip | |
Merge branch 'master' into android-jni
Diffstat (limited to 'node/Network.cpp')
| -rw-r--r-- | node/Network.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node/Network.cpp b/node/Network.cpp index 549219d7..39042fab 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -533,7 +533,7 @@ public: inline void operator()(Topology &t,const SharedPtr<Peer> &p) { - if ( ( (p->hasActiveDirectPath(_now)) && (_network->_isAllowed(p->address())) ) || (std::find(_rootAddresses.begin(),_rootAddresses.end(),p->address()) != _rootAddresses.end()) ) { + if ( ( (p->hasActiveDirectPath(_now)) && ( (_network->_isAllowed(p->address())) || (p->address() == _network->controller()) ) ) || (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) { |