diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-01-26 10:21:43 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-01-26 10:21:43 -0800 |
| commit | 22efa1ab53fcd484657161841468810b43ea1d0d (patch) | |
| tree | 466c27b67bb148a6c8c5b37017cbe91addd3e9f6 /node/Topology.cpp | |
| parent | f19d1e253afe690075bb311e708844b8a026fa36 (diff) | |
| download | infinitytier-22efa1ab53fcd484657161841468810b43ea1d0d.tar.gz infinitytier-22efa1ab53fcd484657161841468810b43ea1d0d.zip | |
Windows Installer work, fix 100% CPU bug in EthernetTap on Windows, Windows lockDownFile() implementation that uses 'cacls' utility.
Diffstat (limited to 'node/Topology.cpp')
| -rw-r--r-- | node/Topology.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/node/Topology.cpp b/node/Topology.cpp index 6efde33e..b499063c 100644 --- a/node/Topology.cpp +++ b/node/Topology.cpp @@ -280,17 +280,13 @@ void Topology::_loadPeers() buf.setSize(buf.size() - ptr); } } while (rlen > 0); - fclose(pd); - } else { - fclose(pd); - Utils::rm(pdpath); } } catch ( ... ) { - // Membership cert dump file invalid. We'll re-learn them off the net. _activePeers.clear(); - fclose(pd); - Utils::rm(pdpath); } + + fclose(pd); + Utils::rm(pdpath); } } // namespace ZeroTier |