ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-02 07:20:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows build fixes, Software update fix, warning removal.

Browse Source
This commit is contained in:
Adam Ierymenko 2017-01-13 14:22:36 -08:00
parent 54f25b14ee
commit 1346e31a8e
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/Multicaster.hpp
View File

@ -220,7 +220,7 @@ private:
{ {
_GatherAuthKey() : member(0),networkId(0) {} _GatherAuthKey() : member(0),networkId(0) {}
_GatherAuthKey(const uint64_t nwid,const Address &a) : member(a.toInt()),networkId(nwid) {} _GatherAuthKey(const uint64_t nwid,const Address &a) : member(a.toInt()),networkId(nwid) {}
inline unsigned long hashCode() const { return (member ^ networkId); } inline unsigned long hashCode() const { return (unsigned long)(member ^ networkId); }
inline bool operator==(const _GatherAuthKey &k) const { return ((member == k.member)&&(networkId == k.networkId)); } inline bool operator==(const _GatherAuthKey &k) const { return ((member == k.member)&&(networkId == k.networkId)); }
uint64_t member; uint64_t member;
uint64_t networkId; uint64_t networkId;

4
one.cpp
View File

@ -495,7 +495,7 @@ static int cli(int argc,char **argv)
(std::string("/network/") + arg1).c_str(), (std::string("/network/") + arg1).c_str(),
requestHeaders, requestHeaders,
jsons, jsons,
strlen(jsons), (unsigned long)strlen(jsons),
responseHeaders, responseHeaders,
responseBody); responseBody);
if (scode == 200) { if (scode == 200) {
@ -572,7 +572,7 @@ static int idtool(int argc,char **argv)
int vanityBits = 0; int vanityBits = 0;
if (argc >= 5) { if (argc >= 5) {
vanity = Utils::hexStrToU64(argv[4]) & 0xffffffffffULL; vanity = Utils::hexStrToU64(argv[4]) & 0xffffffffffULL;
vanityBits = 4 * strlen(argv[4]); vanityBits = 4 * (int)strlen(argv[4]);
if (vanityBits > 40) if (vanityBits > 40)
vanityBits = 40; vanityBits = 40;
} }

8
service/SoftwareUpdater.cpp
View File

@ -21,6 +21,9 @@
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include "../node/Constants.hpp"
#include "../version.h"
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#include <WinSock2.h> #include <WinSock2.h>
#include <Windows.h> #include <Windows.h>
@ -37,9 +40,6 @@
#include "SoftwareUpdater.hpp" #include "SoftwareUpdater.hpp"
#include "../version.h"
#include "../node/Constants.hpp"
#include "../node/Utils.hpp" #include "../node/Utils.hpp"
#include "../node/SHA512.hpp" #include "../node/SHA512.hpp"
#include "../node/Buffer.hpp" #include "../node/Buffer.hpp"
@ -369,7 +369,7 @@ void SoftwareUpdater::apply()
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
memset(&si,0,sizeof(si)); memset(&si,0,sizeof(si));
memset(&pi,0,sizeof(pi)); memset(&pi,0,sizeof(pi));
CreateProcessA(NULL,updatePath.c_str(),NULL,NULL,FALSE,CREATE_NO_WINDOW|CREATE_NEW_PROCESS_GROUP,NULL,NULL,&si,&pi); CreateProcessA(NULL,const_cast<LPSTR>(updatePath.c_str()),NULL,NULL,FALSE,CREATE_NO_WINDOW|CREATE_NEW_PROCESS_GROUP,NULL,NULL,&si,&pi);
#else #else
char *argv[256]; char *argv[256];
unsigned long ac = 0; unsigned long ac = 0;

8
windows/ZeroTierOne/ZeroTierOne.vcxproj
View File

@ -255,7 +255,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories> <AdditionalIncludeDirectories>
</AdditionalIncludeDirectories> </AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;STATICLIB;WIN32;ZT_TRACE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NOMINMAX;STATICLIB;WIN32;ZT_TRACE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="disable";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4996</DisableSpecificWarnings> <DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
@ -271,7 +271,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories> <AdditionalIncludeDirectories>
</AdditionalIncludeDirectories> </AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;STATICLIB;WIN32;ZT_TRACE;ZT_RULES_ENGINE_DEBUGGING;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NOMINMAX;STATICLIB;WIN32;ZT_TRACE;ZT_RULES_ENGINE_DEBUGGING;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="disable";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>false</MultiProcessorCompilation> <MultiProcessorCompilation>false</MultiProcessorCompilation>
<DisableSpecificWarnings>4996</DisableSpecificWarnings> <DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile> </ClCompile>
@ -291,7 +291,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories> <AdditionalIncludeDirectories>
</AdditionalIncludeDirectories> </AdditionalIncludeDirectories>
<PreprocessorDefinitions>STATICLIB;ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>STATICLIB;ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;ZT_SOFTWARE_UPDATE_DEFAULT="apply";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
@ -317,7 +317,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories> <AdditionalIncludeDirectories>
</AdditionalIncludeDirectories> </AdditionalIncludeDirectories>
<PreprocessorDefinitions>STATICLIB;ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="apply";ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet> <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>

9
windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
View File

@ -264,6 +264,9 @@
<ClCompile Include="..\..\controller\JSONDB.cpp"> <ClCompile Include="..\..\controller\JSONDB.cpp">
<Filter>Source Files\controller</Filter> <Filter>Source Files\controller</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\service\SoftwareUpdater.cpp">
<Filter>Source Files\service</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="resource.h"> <ClInclude Include="resource.h">
@ -293,9 +296,6 @@
<ClInclude Include="..\..\service\ControlPlane.hpp"> <ClInclude Include="..\..\service\ControlPlane.hpp">
<Filter>Header Files\service</Filter> <Filter>Header Files\service</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\service\ControlPlaneSubsystem.hpp">
<Filter>Header Files\service</Filter>
</ClInclude>
<ClInclude Include="..\..\service\OneService.hpp"> <ClInclude Include="..\..\service\OneService.hpp">
<Filter>Header Files\service</Filter> <Filter>Header Files\service</Filter>
</ClInclude> </ClInclude>
@ -554,6 +554,9 @@
<ClInclude Include="..\..\osdep\ManagedRoute.hpp"> <ClInclude Include="..\..\osdep\ManagedRoute.hpp">
<Filter>Header Files\osdep</Filter> <Filter>Header Files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\service\SoftwareUpdater.hpp">
<Filter>Header Files\service</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="ZeroTierOne.rc"> <ResourceCompile Include="ZeroTierOne.rc">