diff options
| -rw-r--r-- | ext/installfiles/windows/ZeroTier One.aip | 10 | ||||
| -rw-r--r-- | ext/libnatpmp/natpmp.c | 4 | ||||
| -rw-r--r-- | osdep/PortMapper.cpp | 4 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj | 18 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj.filters | 36 |
6 files changed, 56 insertions, 18 deletions
diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip index 147094f9..383ff625 100644 --- a/ext/installfiles/windows/ZeroTier One.aip +++ b/ext/installfiles/windows/ZeroTier One.aip @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<DOCUMENT Type="Advanced Installer" CreateVersion="10.9" version="12.5" Modules="enterprise" RootPath="." Language="en" Id="{DC564647-6BF0-4550-87F4-89C938D0159C}"> +<DOCUMENT Type="Advanced Installer" CreateVersion="10.9" version="12.5.1" Modules="enterprise" RootPath="." Language="en" Id="{DC564647-6BF0-4550-87F4-89C938D0159C}"> <COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent"> <ROW Name="HiddenItems" Value="UpdaterComponent;SerValComponent;AutorunComponent;MultipleInstancesComponent;MsiJavaComponent;MsiRegsComponent;MsiExtComponent;MsiAssemblyComponent;MsiDriverPackagesComponent;AnalyticsComponent;ActSyncAppComponent;MsiMergeModsComponent;MsiThemeComponent;BackgroundImagesComponent;DictionaryComponent;MsiEnvComponent;ScheduledTasksComponent;CPLAppletComponent;GameUxComponent;UserAccountsComponent;MsiClassComponent;WebApplicationsComponent;MsiOdbcDataSrcComponent;SqlConnectionComponent;SharePointSlnComponent;SilverlightSlnComponent;MsiAppSearchComponent"/> </COMPONENT> @@ -26,10 +26,10 @@ <ROW Property="CTRLS" Value="2"/> <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/> <ROW Property="Manufacturer" Value="ZeroTier, Inc."/> - <ROW Property="ProductCode" Value="1033:{E517BA79-1770-4556-B7A4-622434A9982B} " Type="16"/> + <ROW Property="ProductCode" Value="1033:{8C736E22-3E6F-478D-B358-65DD687E9CF3} " Type="16"/> <ROW Property="ProductLanguage" Value="1033"/> <ROW Property="ProductName" Value="ZeroTier One"/> - <ROW Property="ProductVersion" Value="1.1.0" Type="32"/> + <ROW Property="ProductVersion" Value="1.1.2" Type="32"/> <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/> <ROW Property="RUNAPPLICATION" Value="1" Type="4"/> <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/> @@ -59,7 +59,7 @@ <ROW Directory="x86_Dir" Directory_Parent="tapwindows_Dir" DefaultDir="x86"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent"> - <ROW Component="AI_CustomARPName" ComponentId="{CD637A90-1485-4337-ABA6-C58C97157356}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName" Options="1"/> + <ROW Component="AI_CustomARPName" ComponentId="{0F49E5E5-7D43-4204-A667-51FDF0BA9549}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName" Options="1"/> <ROW Component="AI_DisableModify" ComponentId="{020DCABD-5D56-49B9-AF48-F07F0B55E590}" Directory_="APPDIR" Attributes="4" KeyPath="NoModify" Options="1"/> <ROW Component="Newtonsoft.Json.dll" ComponentId="{0B2F229D-5425-42FB-9E28-F6D25AB2B4B5}" Directory_="APPDIR" Attributes="0" KeyPath="Newtonsoft.Json.dll"/> <ROW Component="ProductInformation" ComponentId="{DB078D04-EA8E-4A7C-9001-89BAD932F9D9}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/> @@ -338,7 +338,7 @@ <ROW XmlAttribute="xsischemaLocation" XmlElement="swidsoftware_identification_tag" Name="xsi:schemaLocation" Flags="14" Order="3" Value="http://standards.iso.org/iso/19770/-2/2008/schema.xsd software_identification_tag.xsd"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.XmlElementComponent"> - <ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Condition="1" Order="2" Flags="14" Text="0"/> + <ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Condition="1" Order="2" Flags="14" Text="2"/> <ROW XmlElement="swidentitlement_required_indicator" ParentElement="swidsoftware_identification_tag" Name="swid:entitlement_required_indicator" Condition="1" Order="0" Flags="14" Text="false"/> <ROW XmlElement="swidmajor" ParentElement="swidnumeric" Name="swid:major" Condition="1" Order="0" Flags="14" Text="1"/> <ROW XmlElement="swidminor" ParentElement="swidnumeric" Name="swid:minor" Condition="1" Order="1" Flags="14" Text="1"/> diff --git a/ext/libnatpmp/natpmp.c b/ext/libnatpmp/natpmp.c index 3a498129..9843c41e 100644 --- a/ext/libnatpmp/natpmp.c +++ b/ext/libnatpmp/natpmp.c @@ -39,8 +39,12 @@ POSSIBILITY OF SUCH DAMAGE. #include <winsock2.h> #include <ws2tcpip.h> #include <io.h> +#ifndef EWOULDBLOCK #define EWOULDBLOCK WSAEWOULDBLOCK +#endif +#ifndef ECONNREFUSED #define ECONNREFUSED WSAECONNREFUSED +#endif #include "wingettimeofday.h" #define gettimeofday natpmp_gettimeofday #else diff --git a/osdep/PortMapper.cpp b/osdep/PortMapper.cpp index 87c886c2..03e2648f 100644 --- a/osdep/PortMapper.cpp +++ b/osdep/PortMapper.cpp @@ -40,10 +40,14 @@ #include "OSUtils.hpp" #include "PortMapper.hpp" +// These must be defined to get rid of dynamic export stuff in libminiupnpc and libnatpmp #ifdef __WINDOWS__ #ifndef MINIUPNP_STATICLIB #define MINIUPNP_STATICLIB #endif +#ifndef STATICLIB +#define STATICLIB +#endif #endif #include "../ext/miniupnpc/miniupnpc.h" @@ -41,6 +41,6 @@ /** * Revision */ -#define ZEROTIER_ONE_VERSION_REVISION 1 +#define ZEROTIER_ONE_VERSION_REVISION 2 #endif diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj index 5da01505..19cd9daf 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj @@ -21,6 +21,9 @@ <ItemGroup> <ClCompile Include="..\..\ext\http-parser\http_parser.c" /> <ClCompile Include="..\..\ext\json-parser\json.c" /> + <ClCompile Include="..\..\ext\libnatpmp\getgateway.c" /> + <ClCompile Include="..\..\ext\libnatpmp\natpmp.c" /> + <ClCompile Include="..\..\ext\libnatpmp\wingettimeofday.c" /> <ClCompile Include="..\..\ext\lz4\lz4.c" /> <ClCompile Include="..\..\ext\miniupnpc\connecthostport.c" /> <ClCompile Include="..\..\ext\miniupnpc\igd_desc_parse.c" /> @@ -64,7 +67,7 @@ <ClCompile Include="..\..\osdep\BackgroundResolver.cpp" /> <ClCompile Include="..\..\osdep\Http.cpp" /> <ClCompile Include="..\..\osdep\OSUtils.cpp" /> - <ClCompile Include="..\..\osdep\UPNPClient.cpp" /> + <ClCompile Include="..\..\osdep\PortMapper.cpp" /> <ClCompile Include="..\..\osdep\WindowsEthernetTap.cpp" /> <ClCompile Include="..\..\service\ControlPlane.cpp" /> <ClCompile Include="..\..\service\OneService.cpp" /> @@ -91,6 +94,9 @@ <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnpreplyparse.h" /> <ClInclude Include="..\..\ext\http-parser\http_parser.h" /> <ClInclude Include="..\..\ext\json-parser\json.h" /> + <ClInclude Include="..\..\ext\libnatpmp\getgateway.h" /> + <ClInclude Include="..\..\ext\libnatpmp\natpmp.h" /> + <ClInclude Include="..\..\ext\libnatpmp\wingettimeofday.h" /> <ClInclude Include="..\..\ext\lz4\lz4.h" /> <ClInclude Include="..\..\ext\miniupnpc\codelength.h" /> <ClInclude Include="..\..\ext\miniupnpc\connecthostport.h" /> @@ -154,8 +160,8 @@ <ClInclude Include="..\..\osdep\Http.hpp" /> <ClInclude Include="..\..\osdep\OSUtils.hpp" /> <ClInclude Include="..\..\osdep\Phy.hpp" /> + <ClInclude Include="..\..\osdep\PortMapper.hpp" /> <ClInclude Include="..\..\osdep\Thread.hpp" /> - <ClInclude Include="..\..\osdep\UPNPClient.hpp" /> <ClInclude Include="..\..\osdep\WindowsEthernetTap.hpp" /> <ClInclude Include="..\..\service\ControlPlane.hpp" /> <ClInclude Include="..\..\service\ControlPlaneSubsystem.hpp" /> @@ -243,7 +249,7 @@ <SDLCheck>true</SDLCheck> <AdditionalIncludeDirectories> </AdditionalIncludeDirectories> - <PreprocessorDefinitions>NOMINMAX;ZT_TRACE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;STATICLIB;WIN32;ZT_TRACE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -258,7 +264,7 @@ <SDLCheck>true</SDLCheck> <AdditionalIncludeDirectories> </AdditionalIncludeDirectories> - <PreprocessorDefinitions>NOMINMAX;ZT_TRACE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;STATICLIB;WIN32;ZT_TRACE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MultiProcessorCompilation>false</MultiProcessorCompilation> </ClCompile> <Link> @@ -276,7 +282,7 @@ <SDLCheck>true</SDLCheck> <AdditionalIncludeDirectories> </AdditionalIncludeDirectories> - <PreprocessorDefinitions>ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>STATICLIB;ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <StringPooling>true</StringPooling> @@ -301,7 +307,7 @@ <SDLCheck>true</SDLCheck> <AdditionalIncludeDirectories> </AdditionalIncludeDirectories> - <PreprocessorDefinitions>ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>STATICLIB;ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet> <StringPooling>true</StringPooling> diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters index 6475137c..946464ea 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters @@ -85,6 +85,12 @@ <Filter Include="Source Files\ext\miniupnpc"> <UniqueIdentifier>{56cc3ab8-3336-4a22-9471-c267ee46cd54}</UniqueIdentifier> </Filter> + <Filter Include="Header Files\ext\libnatpmp"> + <UniqueIdentifier>{d7292d0d-72a0-4ed6-b717-21debb120737}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\ext\libnatpmp"> + <UniqueIdentifier>{409ec37e-ff36-4c13-b18d-52d6052e0ca2}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\service\ControlPlane.cpp"> @@ -186,9 +192,6 @@ <ClCompile Include="..\..\osdep\BackgroundResolver.cpp"> <Filter>Source Files\osdep</Filter> </ClCompile> - <ClCompile Include="..\..\osdep\UPNPClient.cpp"> - <Filter>Source Files\osdep</Filter> - </ClCompile> <ClCompile Include="..\..\node\Path.cpp"> <Filter>Source Files\node</Filter> </ClCompile> @@ -237,6 +240,18 @@ <ClCompile Include="..\..\ext\miniupnpc\upnpreplyparse.c"> <Filter>Source Files\ext\miniupnpc</Filter> </ClCompile> + <ClCompile Include="..\..\osdep\PortMapper.cpp"> + <Filter>Source Files\osdep</Filter> + </ClCompile> + <ClCompile Include="..\..\ext\libnatpmp\getgateway.c"> + <Filter>Source Files\ext\libnatpmp</Filter> + </ClCompile> + <ClCompile Include="..\..\ext\libnatpmp\natpmp.c"> + <Filter>Source Files\ext\libnatpmp</Filter> + </ClCompile> + <ClCompile Include="..\..\ext\libnatpmp\wingettimeofday.c"> + <Filter>Source Files\ext\libnatpmp</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="resource.h"> @@ -401,9 +416,6 @@ <ClInclude Include="..\..\osdep\BackgroundResolver.hpp"> <Filter>Header Files\osdep</Filter> </ClInclude> - <ClInclude Include="..\..\osdep\UPNPClient.hpp"> - <Filter>Header Files\osdep</Filter> - </ClInclude> <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\codelength.h"> <Filter>Header Files\ext\bin\miniupnpc\include</Filter> </ClInclude> @@ -515,6 +527,18 @@ <ClInclude Include="..\..\ext\miniupnpc\upnpreplyparse.h"> <Filter>Header Files\ext\miniupnpc</Filter> </ClInclude> + <ClInclude Include="..\..\osdep\PortMapper.hpp"> + <Filter>Header Files\osdep</Filter> + </ClInclude> + <ClInclude Include="..\..\ext\libnatpmp\getgateway.h"> + <Filter>Header Files\ext\libnatpmp</Filter> + </ClInclude> + <ClInclude Include="..\..\ext\libnatpmp\natpmp.h"> + <Filter>Header Files\ext\libnatpmp</Filter> + </ClInclude> + <ClInclude Include="..\..\ext\libnatpmp\wingettimeofday.h"> + <Filter>Header Files\ext\libnatpmp</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="ZeroTierOne.rc"> |