gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore old root-topology if present -- fix for upgrading on Linux and possibly elsewhere.

Browse Source
This commit is contained in:
Adam Ierymenko
2015-08-25 09:42:37 -07:00
parent 2aa1b5d9b7
commit 5fcef91278
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node/Node.cpp
View File

@@ -136,7 +136,7 @@ Node::Node(
if (!Topology::authenticateRootTopology(rt)) if (!Topology::authenticateRootTopology(rt))
rt.clear(); rt.clear();
} }
if (!rt.size()) if ((!rt.size())||(!rt.contains("rootservers")))
rt.fromString(ZT_DEFAULTS.defaultRootTopology); rt.fromString(ZT_DEFAULTS.defaultRootTopology);
} }
RR->topology->setRootServers(Dictionary(rt.get("rootservers",""))); RR->topology->setRootServers(Dictionary(rt.get("rootservers","")));