From 8a9762331f67f517d57b39ad3bbf9761960bb047 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 12 Apr 2016 12:54:14 -0700 Subject: [PATCH] Fix one more old NetworkConfig bit of code. --- node/Topology.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/node/Topology.cpp b/node/Topology.cpp index 7197dd9b6..21ed78a72 100644 --- a/node/Topology.cpp +++ b/node/Topology.cpp @@ -284,10 +284,9 @@ bool Topology::isUpstream(const Identity &id) const return true; std::vector< SharedPtr > nws(RR->node->allNetworks()); for(std::vector< SharedPtr >::const_iterator nw(nws.begin());nw!=nws.end();++nw) { - SharedPtr nc((*nw)->config2()); - if (nc) { - for(std::vector< std::pair >::const_iterator r(nc->relays().begin());r!=nc->relays().end();++r) { - if (r->first == id.address()) + 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; } }