From 8d09c37140ef589d9e23993e20a080936b90a7aa Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 31 Jul 2015 09:37:13 -0700 Subject: Remove a bit of redundant logic, and also announce MULTICAST_LIKEs to controllers (for future use). --- node/Network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'node/Network.cpp') diff --git a/node/Network.cpp b/node/Network.cpp index 549219d7..8922483d 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -533,7 +533,7 @@ public: inline void operator()(Topology &t,const SharedPtr &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::iterator mg(_allMulticastGroups.begin());mg!=_allMulticastGroups.end();++mg) { -- cgit v1.2.3