summaryrefslogtreecommitdiff
path: root/one.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@zerotier.com>2015-05-19 16:26:41 -0700
committerAdam Ierymenko <adam.ierymenko@zerotier.com>2015-05-19 16:26:41 -0700
commit9682f50b152ca04543d4b87fb405e50429468eeb (patch)
tree47b28e748fb6e03f4383d93d3f42958f8b3d1b06 /one.cpp
parent63cea7d337a55fed8333a3aaf3d1d5bb50a03018 (diff)
downloadinfinitytier-9682f50b152ca04543d4b87fb405e50429468eeb.tar.gz
infinitytier-9682f50b152ca04543d4b87fb405e50429468eeb.zip
Get rid of old _winPokeAHole() hack in one.cpp and use Advanced Installer to configure firewall rules (because we can now).
Diffstat (limited to 'one.cpp')
-rw-r--r--one.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/one.cpp b/one.cpp
index d174d48f..4a0a57e8 100644
--- a/one.cpp
+++ b/one.cpp
@@ -750,6 +750,7 @@ static BOOL WINAPI _winConsoleCtrlHandler(DWORD dwCtrlType)
}
// Pokes a hole in the Windows firewall (advfirewall) for the running program
+/* -- now done by Advanced Installer
static void _winPokeAHole()
{
char myPath[MAX_PATH];
@@ -786,6 +787,7 @@ static void _winPokeAHole()
}
}
}
+*/
// Returns true if this is running as the local administrator
static BOOL IsCurrentUserLocalAdministrator(void)
@@ -1121,13 +1123,13 @@ int main(int argc,char **argv)
return 1;
}
} else {
- _winPokeAHole();
+ //_winPokeAHole();
}
SetConsoleCtrlHandler(&_winConsoleCtrlHandler,TRUE);
// continues on to ordinary command line execution code below...
} else {
// Running from service manager
- _winPokeAHole();
+ //_winPokeAHole();
ZeroTierOneService zt1Service;
if (CServiceBase::Run(zt1Service) == TRUE) {
return 0;