Fix one more old NetworkConfig bit of code.

This commit is contained in:
Adam Ierymenko 2016-04-12 12:54:14 -07:00
parent 31db6f8f36
commit 8a9762331f

View file

@ -284,10 +284,9 @@ bool Topology::isUpstream(const Identity &id) const
return true; return true;
std::vector< SharedPtr<Network> > nws(RR->node->allNetworks()); std::vector< SharedPtr<Network> > nws(RR->node->allNetworks());
for(std::vector< SharedPtr<Network> >::const_iterator nw(nws.begin());nw!=nws.end();++nw) { for(std::vector< SharedPtr<Network> >::const_iterator nw(nws.begin());nw!=nws.end();++nw) {
SharedPtr<NetworkConfig> nc((*nw)->config2()); if ((*nw)->hasConfig()) {
if (nc) { for(unsigned int r=0;r<(*nw)->config().staticDeviceCount();++r) {
for(std::vector< std::pair<Address,InetAddress> >::const_iterator r(nc->relays().begin());r!=nc->relays().end();++r) { if ((((*nw)->config().staticDevice(r).flags & ZT_NETWORK_STATIC_DEVICE_IS_RELAY) != 0)&&((*nw)->config().staticDevice(r).address == id.address().toInt()))
if (r->first == id.address())
return true; return true;
} }
} }