ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-16 22:28:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More Windows service work... it builds! Now to do a new installer and test. Also fix a Windows compile warning in Switch.cpp.

Browse Source
This commit is contained in:
Adam Ierymenko
2014-02-06 23:12:12 -08:00
parent 8a7486577a
commit 5b97bb247e
6 changed files with 54 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main.cpp
View File

@ -628,6 +628,7 @@ int main(int argc,char **argv)
if (!winRunFromCommandLine) {
ZeroTierOneService zt1Service;
if (CServiceBase::Run(zt1Service) == TRUE) {
// Normal termination of service process
return 0;
} else {
fprintf(stderr,"%s: unable to start service (try -h for help)"ZT_EOL_S,argv[0]);
@ -637,7 +638,6 @@ int main(int argc,char **argv)
#endif
{
int exitCode = 0;
try {
node = new Node(homeDir,port,controlPort);
switch(node->run()) {
@ -669,11 +669,9 @@ int main(int argc,char **argv)
fprintf(stderr,"%s: unexpected exception!"ZT_EOL_S,argv[0]);
exitCode = 3;
}
#ifdef __UNIX_LIKE__
Utils::rm((std::string(homeDir)+"/zerotier-one.pid").c_str());
#endif
return exitCode;
}
}