Browse Source

Fix Windows slowness on API query bug.

Adam Ierymenko 4 years ago
parent
commit
958420ee44
2 changed files with 0 additions and 130 deletions
  1. 0 1
      service/OneService.cpp
  2. 0 129
      windows/ZeroTierOne.sln

+ 0 - 1
service/OneService.cpp

@@ -2644,7 +2644,6 @@ public:
 			case ZT_STATE_OBJECT_NETWORK_CONFIG:
 			case ZT_STATE_OBJECT_NETWORK_CONFIG:
 				OSUtils::ztsnprintf(dirname,sizeof(dirname),"%s" ZT_PATH_SEPARATOR_S "networks.d",_homePath.c_str());
 				OSUtils::ztsnprintf(dirname,sizeof(dirname),"%s" ZT_PATH_SEPARATOR_S "networks.d",_homePath.c_str());
 				OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "%.16llx.conf",dirname,(unsigned long long)id[0]);
 				OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "%.16llx.conf",dirname,(unsigned long long)id[0]);
-				secure = true;
 				break;
 				break;
 			case ZT_STATE_OBJECT_PEER:
 			case ZT_STATE_OBJECT_PEER:
 				OSUtils::ztsnprintf(dirname,sizeof(dirname),"%s" ZT_PATH_SEPARATOR_S "peers.d",_homePath.c_str());
 				OSUtils::ztsnprintf(dirname,sizeof(dirname),"%s" ZT_PATH_SEPARATOR_S "peers.d",_homePath.c_str());

+ 0 - 129
windows/ZeroTierOne.sln

@@ -7,11 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroTierOne", "ZeroTierOne\
 EndProject
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver6", "TapDriver6\TapDriver6.vcxproj", "{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}"
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver6", "TapDriver6\TapDriver6.vcxproj", "{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}"
 EndProject
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI", "WinUI\WinUI.csproj", "{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6D27214A-087B-4484-B898-AD2A13FA3B9E} = {6D27214A-087B-4484-B898-AD2A13FA3B9E}
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "copyutil", "copyutil\copyutil.csproj", "{6D27214A-087B-4484-B898-AD2A13FA3B9E}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "copyutil", "copyutil\copyutil.csproj", "{6D27214A-087B-4484-B898-AD2A13FA3B9E}"
 EndProject
 EndProject
 Global
 Global
@@ -398,130 +393,6 @@ Global
 		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|x64.ActiveCfg = Win8 Release|x64
 		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|x64.ActiveCfg = Win8 Release|x64
 		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|x64.Build.0 = Win8 Release|x64
 		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|x64.Build.0 = Win8 Release|x64
 		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|x64.Deploy.0 = Win8 Release|x64
 		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|x64.Deploy.0 = Win8 Release|x64
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|ARM.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|ARM.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|ARM64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|ARM64.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|Mixed Platforms.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|Win32.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|x64.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|ARM.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|ARM.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|ARM.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|ARM64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|ARM64.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|Win32.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|x64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Profile|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Profile|Any CPU.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Profile|ARM.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Profile|ARM.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Profile|ARM64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Profile|ARM64.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Profile|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Profile|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Profile|Win32.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Profile|Win32.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Profile|x64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Profile|x64.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|ARM.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|ARM.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|ARM64.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|Win32.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|x64.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|Any CPU.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|ARM.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|ARM.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|ARM64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|ARM64.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|Mixed Platforms.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|Win32.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|x64.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|ARM.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|ARM.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|ARM64.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|Win32.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|x64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|Any CPU.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|ARM.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|ARM.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|ARM64.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|ARM64.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|Win32.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|x64.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|ARM.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|ARM.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|ARM64.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|Win32.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|x64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|x64.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|Any CPU.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|ARM.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|ARM.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|ARM64.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|ARM64.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|Win32.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|x64.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|x64.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|ARM.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|ARM.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|ARM64.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|Win32.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|x64.ActiveCfg = Debug|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|Any CPU.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|ARM.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|ARM.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|ARM64.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|ARM64.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|Win32.ActiveCfg = Release|Any CPU
-		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|x64.ActiveCfg = Release|Any CPU
 		{6D27214A-087B-4484-B898-AD2A13FA3B9E}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
 		{6D27214A-087B-4484-B898-AD2A13FA3B9E}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
 		{6D27214A-087B-4484-B898-AD2A13FA3B9E}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
 		{6D27214A-087B-4484-B898-AD2A13FA3B9E}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
 		{6D27214A-087B-4484-B898-AD2A13FA3B9E}.CD_ROM|ARM.ActiveCfg = Debug|Any CPU
 		{6D27214A-087B-4484-B898-AD2A13FA3B9E}.CD_ROM|ARM.ActiveCfg = Debug|Any CPU