summaryrefslogtreecommitdiff
path: root/node
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-08-25 09:42:37 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-08-25 09:42:37 -0700
commit5fcef91278fe9acc5ff2c696dc767faad2a62630 (patch)
tree3c25c5804c924c2916a7df203fa809542f296aea /node
parent2aa1b5d9b78c965ced4390292d9ae60a6314ad2a (diff)
downloadinfinitytier-5fcef91278fe9acc5ff2c696dc767faad2a62630.tar.gz
infinitytier-5fcef91278fe9acc5ff2c696dc767faad2a62630.zip
Ignore old root-topology if present -- fix for upgrading on Linux and possibly elsewhere.
Diffstat (limited to 'node')
-rw-r--r--node/Node.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/node/Node.cpp b/node/Node.cpp
index d40ceab9..534c085d 100644
--- a/node/Node.cpp
+++ b/node/Node.cpp
@@ -136,7 +136,7 @@ Node::Node(
if (!Topology::authenticateRootTopology(rt))
rt.clear();
}
- if (!rt.size())
+ if ((!rt.size())||(!rt.contains("rootservers")))
rt.fromString(ZT_DEFAULTS.defaultRootTopology);
}
RR->topology->setRootServers(Dictionary(rt.get("rootservers","")));