Bunch more refactoring for an even more compact NetworkConfig representation, especially rules.
This commit is contained in:
parent
25a5275921
commit
b9dba97fdb
7 changed files with 524 additions and 248 deletions
|
@ -284,11 +284,8 @@ bool Topology::isUpstream(const Identity &id) const
|
|||
return true;
|
||||
std::vector< SharedPtr<Network> > nws(RR->node->allNetworks());
|
||||
for(std::vector< SharedPtr<Network> >::const_iterator nw(nws.begin());nw!=nws.end();++nw) {
|
||||
if ((*nw)->hasConfig()) {
|
||||
for(unsigned int r=0;r<(*nw)->config().staticDeviceCount();++r) {
|
||||
if ((((*nw)->config().staticDevice(r).flags & ZT_NETWORK_STATIC_DEVICE_IS_RELAY) != 0)&&((*nw)->config().staticDevice(r).address == id.address().toInt()))
|
||||
return true;
|
||||
}
|
||||
if ((*nw)->config().isRelay(id.address())) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue