dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bunch more refactoring for an even more compact NetworkConfig representation, especially rules.

Browse source
This commit is contained in:
Adam Ierymenko 2016-04-26 17:11:25 -07:00
parent 25a5275921
commit b9dba97fdb
7 changed files with 524 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

7
node/Topology.cpp
View file

@ -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;