Fix a Windows bug in refactored tap code, and always make sure we have a firewall exception rule on startup.

1 files changed, 37 insertions, 0 deletions

diff --git a/main.cpp b/main.cpp
index f13f6ee2..5b882d0b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -680,6 +680,43 @@ int main(int argc,char **argv)
 #endif // __UNIX_LIKE__
 
 #ifdef __WINDOWS__
+	{
+		char myPath[MAX_PATH];
+		DWORD ps = GetModuleFileNameA(NULL,myPath,sizeof(myPath));
+		if ((ps > 0)&&(ps < (DWORD)sizeof(myPath))) {
+			STARTUPINFOA startupInfo;
+			PROCESS_INFORMATION processInfo;
+			fprintf(stderr,"*** path: %s\n",myPath);
+
+			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)) {
+				WaitForSingleObject(processInfo.hProcess,INFINITE);
+				CloseHandle(processInfo.hProcess);
+				CloseHandle(processInfo.hThread);
+			}
+
+			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)) {
+				WaitForSingleObject(processInfo.hProcess,INFINITE);
+				CloseHandle(processInfo.hProcess);
+				CloseHandle(processInfo.hThread);
+			}
+
+			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)) {
+				WaitForSingleObject(processInfo.hProcess,INFINITE);
+				CloseHandle(processInfo.hProcess);
+				CloseHandle(processInfo.hThread);
+			}
+		}
+	}
+
 	if (winRunFromCommandLine) {
 		// Running in "interactive" mode (mostly for debugging)
 		if (IsCurrentUserLocalAdministrator() != TRUE) {