From 9682f50b152ca04543d4b87fb405e50429468eeb Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 19 May 2015 16:26:41 -0700 Subject: Get rid of old _winPokeAHole() hack in one.cpp and use Advanced Installer to configure firewall rules (because we can now). --- ext/installfiles/windows/ZeroTier One.aip | 43 ++++++++++++++++++++++++------- one.cpp | 6 +++-- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip index bab72e04..9a3b83a2 100644 --- a/ext/installfiles/windows/ZeroTier One.aip +++ b/ext/installfiles/windows/ZeroTier One.aip @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -33,12 +33,12 @@ - + - - - + + + @@ -121,6 +121,12 @@ + + + + + + @@ -135,6 +141,11 @@ + + + + + @@ -144,6 +155,7 @@ + @@ -194,9 +206,16 @@ + + + + + + + @@ -243,8 +262,8 @@ - - + + @@ -252,6 +271,10 @@ + + + + @@ -262,8 +285,8 @@ - - + + 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; -- cgit v1.2.3