ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-07 11:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev

Browse Source
This commit is contained in:
Grant Limberg 2020-09-10 12:50:30 -07:00
commit d8f041a484
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -33,7 +33,6 @@ Thumbs.db
/ext/installfiles/windows/Prerequisites /ext/installfiles/windows/Prerequisites
/ext/installfiles/windows/*-cache /ext/installfiles/windows/*-cache
/ZeroTier One.msi /ZeroTier One.msi
/windows/.vs
*.vcxproj.backup *.vcxproj.backup
/windows/TapDriver6/Win7Debug /windows/TapDriver6/Win7Debug
/windows/TapDriver6/win7Release /windows/TapDriver6/win7Release
@ -42,6 +41,7 @@ Thumbs.db
enc_temp_folder enc_temp_folder
/windows/copyutil/bin /windows/copyutil/bin
/windows/copyutil/obj /windows/copyutil/obj
.vs/
# *nix/Mac build droppings # *nix/Mac build droppings
/build-* /build-*

12
one.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c)2019 ZeroTier, Inc. * Copyright (c)2020 ZeroTier, Inc.
* *
* Use of this software is governed by the Business Source License included * Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file in the project's root directory. * in the LICENSE.TXT file in the project's root directory.
@ -85,7 +85,7 @@ using namespace ZeroTier;
static OneService *volatile zt1Service = (OneService *)0; static OneService *volatile zt1Service = (OneService *)0;
#define PROGRAM_NAME "ZeroTier One" #define PROGRAM_NAME "ZeroTier One"
#define COPYRIGHT_NOTICE "Copyright (c) 2019 ZeroTier, Inc." #define COPYRIGHT_NOTICE "Copyright (c) 2020 ZeroTier, Inc."
#define LICENSE_GRANT "Licensed under the ZeroTier BSL 1.1 (see LICENSE.txt)" #define LICENSE_GRANT "Licensed under the ZeroTier BSL 1.1 (see LICENSE.txt)"
/****************************************************************************/ /****************************************************************************/
@ -232,9 +232,12 @@ static int cli(int argc,char **argv)
if (!homeDir.length()) if (!homeDir.length())
homeDir = OneService::platformDefaultHomePath(); homeDir = OneService::platformDefaultHomePath();
// TODO: cleanup this logic
// A lot of generic CLI errors land here; missing admin rights cause a bit of this.
if ((!port)||(!authToken.length())) { if ((!port)||(!authToken.length())) {
if (!homeDir.length()) { if (!homeDir.length()) {
fprintf(stderr,"%s: missing port or authentication token and no home directory specified to auto-detect" ZT_EOL_S,argv[0]); fprintf(stderr,"%s: missing port or authentication token and no home directory specified to auto-detect" ZT_EOL_S,argv[0]);
fprintf(stderr, "If you did not, please run this command as an Administrator / sudo / Root user. Thanks!");
return 2; return 2;
} }
@ -244,6 +247,7 @@ static int cli(int argc,char **argv)
port = Utils::strToUInt(portStr.c_str()); port = Utils::strToUInt(portStr.c_str());
if ((port == 0)||(port > 0xffff)) { if ((port == 0)||(port > 0xffff)) {
fprintf(stderr,"%s: missing port and zerotier-one.port not found in %s" ZT_EOL_S,argv[0],homeDir.c_str()); fprintf(stderr,"%s: missing port and zerotier-one.port not found in %s" ZT_EOL_S,argv[0],homeDir.c_str());
fprintf(stderr, "If you did not, please run this command as an Administrator / sudo / Root user. Thanks!");
return 2; return 2;
} }
} }
@ -266,6 +270,7 @@ static int cli(int argc,char **argv)
#endif #endif
if (!authToken.length()) { if (!authToken.length()) {
fprintf(stderr,"%s: missing authentication token and authtoken.secret not found (or readable) in %s" ZT_EOL_S,argv[0],homeDir.c_str()); fprintf(stderr,"%s: missing authentication token and authtoken.secret not found (or readable) in %s" ZT_EOL_S,argv[0],homeDir.c_str());
fprintf(stderr, "If you did not, please run this command as an Administrator / sudo / Root user. Thanks!");
return 2; return 2;
} }
} }
@ -1316,6 +1321,7 @@ static BOOL WINAPI _winConsoleCtrlHandler(DWORD dwCtrlType)
return FALSE; return FALSE;
} }
// TODO: revisit this with https://support.microsoft.com/en-us/help/947709/how-to-use-the-netsh-advfirewall-firewall-context-instead-of-the-netsh
static void _winPokeAHole() static void _winPokeAHole()
{ {
char myPath[MAX_PATH]; char myPath[MAX_PATH];
@ -1690,7 +1696,7 @@ int main(int argc,char **argv)
ptmp.append(*pi); ptmp.append(*pi);
if ((*pi != ".")&&(*pi != "..")) { if ((*pi != ".")&&(*pi != "..")) {
if (!OSUtils::mkdir(ptmp)) if (!OSUtils::mkdir(ptmp))
throw std::runtime_error("home path does not exist, and could not create"); throw std::runtime_error("home path does not exist, and could not create. Please verify local system permissions.");
} }
} }
} }