|
|
@@ -766,8 +766,6 @@ static BOOL WINAPI _winConsoleCtrlHandler(DWORD dwCtrlType)
|
|
|
return FALSE;
|
|
|
}
|
|
|
|
|
|
-// Pokes a hole in the Windows firewall (advfirewall) for the running program
|
|
|
-/* -- now done by Advanced Installer
|
|
|
static void _winPokeAHole()
|
|
|
{
|
|
|
char myPath[MAX_PATH];
|
|
|
@@ -779,7 +777,7 @@ static void _winPokeAHole()
|
|
|
startupInfo.cb = sizeof(startupInfo);
|
|
|
memset(&startupInfo,0,sizeof(STARTUPINFOA));
|
|
|
memset(&processInfo,0,sizeof(PROCESS_INFORMATION));
|
|
|
- if (CreateProcessA(NULL,(LPSTR)(std::string("C:\\Windows\\System32\\netsh.exe advfirewall firewall delete rule name=\"ZeroTier One\" program=\"") + myPath + "\"").c_str(),NULL,NULL,FALSE,0,NULL,NULL,&startupInfo,&processInfo)) {
|
|
|
+ if (CreateProcessA(NULL,(LPSTR)(std::string("C:\\Windows\\System32\\netsh.exe advfirewall firewall delete rule name=\"ZeroTier One\" program=\"") + myPath + "\"").c_str(),NULL,NULL,FALSE,CREATE_NO_WINDOW,NULL,NULL,&startupInfo,&processInfo)) {
|
|
|
WaitForSingleObject(processInfo.hProcess,INFINITE);
|
|
|
CloseHandle(processInfo.hProcess);
|
|
|
CloseHandle(processInfo.hThread);
|
|
|
@@ -788,7 +786,7 @@ static void _winPokeAHole()
|
|
|
startupInfo.cb = sizeof(startupInfo);
|
|
|
memset(&startupInfo,0,sizeof(STARTUPINFOA));
|
|
|
memset(&processInfo,0,sizeof(PROCESS_INFORMATION));
|
|
|
- if (CreateProcessA(NULL,(LPSTR)(std::string("C:\\Windows\\System32\\netsh.exe advfirewall firewall add rule name=\"ZeroTier One\" dir=in action=allow program=\"") + myPath + "\" enable=yes").c_str(),NULL,NULL,FALSE,0,NULL,NULL,&startupInfo,&processInfo)) {
|
|
|
+ if (CreateProcessA(NULL,(LPSTR)(std::string("C:\\Windows\\System32\\netsh.exe advfirewall firewall add rule name=\"ZeroTier One\" dir=in action=allow program=\"") + myPath + "\" enable=yes").c_str(),NULL,NULL,FALSE,CREATE_NO_WINDOW,NULL,NULL,&startupInfo,&processInfo)) {
|
|
|
WaitForSingleObject(processInfo.hProcess,INFINITE);
|
|
|
CloseHandle(processInfo.hProcess);
|
|
|
CloseHandle(processInfo.hThread);
|
|
|
@@ -797,14 +795,13 @@ static void _winPokeAHole()
|
|
|
startupInfo.cb = sizeof(startupInfo);
|
|
|
memset(&startupInfo,0,sizeof(STARTUPINFOA));
|
|
|
memset(&processInfo,0,sizeof(PROCESS_INFORMATION));
|
|
|
- if (CreateProcessA(NULL,(LPSTR)(std::string("C:\\Windows\\System32\\netsh.exe advfirewall firewall add rule name=\"ZeroTier One\" dir=out action=allow program=\"") + myPath + "\" enable=yes").c_str(),NULL,NULL,FALSE,0,NULL,NULL,&startupInfo,&processInfo)) {
|
|
|
+ if (CreateProcessA(NULL,(LPSTR)(std::string("C:\\Windows\\System32\\netsh.exe advfirewall firewall add rule name=\"ZeroTier One\" dir=out action=allow program=\"") + myPath + "\" enable=yes").c_str(),NULL,NULL,FALSE,CREATE_NO_WINDOW,NULL,NULL,&startupInfo,&processInfo)) {
|
|
|
WaitForSingleObject(processInfo.hProcess,INFINITE);
|
|
|
CloseHandle(processInfo.hProcess);
|
|
|
CloseHandle(processInfo.hThread);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-*/
|
|
|
|
|
|
// Returns true if this is running as the local administrator
|
|
|
static BOOL IsCurrentUserLocalAdministrator(void)
|
|
|
@@ -1139,13 +1136,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;
|
Adam Ierymenko