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

Windows build fixes.

Browse Source
This commit is contained in:
Adam Ierymenko
2014-10-19 12:56:39 -07:00
parent 2eeb3dee9e
commit 74f36f5dc0
9 changed files with 163 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
windows/ZeroTierOne/ZeroTierOneService.cpp
View File

@@ -106,7 +106,7 @@ restart_node:
// Get upgrade path, which will be its reason for termination
std::string msiPath;
if (n) {
const char *msiPathTmp = n->reasonForTermination();
const char *msiPathTmp = n->terminationMessage();
if (msiPathTmp)
msiPath = msiPathTmp;
}
@@ -131,7 +131,7 @@ restart_node:
case ZeroTier::Node::NODE_UNRECOVERABLE_ERROR: {
std::string err("ZeroTier node encountered an unrecoverable error: ");
const char *r = _node->reasonForTermination();
const char *r = _node->terminationMessage();
if (r)
err.append(r);
else err.append("(unknown error)");