diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2017-02-23 12:40:21 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2017-02-23 12:40:21 -0800 |
| commit | fe19ad328cf247a9d1114d7692deb4a368a91bb7 (patch) | |
| tree | 7653684e79334b0169031ed889277a7bdf8105ce | |
| parent | 010dbc8b2b48902c385f8ae9f1411ff34f898774 (diff) | |
| download | infinitytier-fe19ad328cf247a9d1114d7692deb4a368a91bb7.tar.gz infinitytier-fe19ad328cf247a9d1114d7692deb4a368a91bb7.zip | |
Windows build fix.
| -rw-r--r-- | service/ControlPlane.cpp | 4 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj | 2 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj.filters | 6 |
3 files changed, 10 insertions, 2 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp index 8f59b0d2..9ba001ea 100644 --- a/service/ControlPlane.cpp +++ b/service/ControlPlane.cpp @@ -142,8 +142,8 @@ static void _moonToJson(nlohmann::json &mj,const World &world) Utils::snprintf(tmp,sizeof(tmp),"%.16llx",world.id()); mj["id"] = tmp; mj["timestamp"] = world.timestamp(); - mj["signature"] = Utils::hex(world.signature().data,world.signature().size()); - mj["updatesMustBeSignedBy"] = Utils::hex(world.updatesMustBeSignedBy().data,world.updatesMustBeSignedBy().size()); + mj["signature"] = Utils::hex(world.signature().data,(unsigned int)world.signature().size()); + mj["updatesMustBeSignedBy"] = Utils::hex(world.updatesMustBeSignedBy().data,(unsigned int)world.updatesMustBeSignedBy().size()); nlohmann::json ra = nlohmann::json::array(); for(std::vector<World::Root>::const_iterator r(world.roots().begin());r!=world.roots().end();++r) { nlohmann::json rj; diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj index 7afdfb17..d0b027fa 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj @@ -41,6 +41,7 @@ <ClCompile Include="..\..\node\C25519.cpp" /> <ClCompile Include="..\..\node\Capability.cpp" /> <ClCompile Include="..\..\node\CertificateOfMembership.cpp" /> + <ClCompile Include="..\..\node\CertificateOfOwnership.cpp" /> <ClCompile Include="..\..\node\Cluster.cpp" /> <ClCompile Include="..\..\node\Identity.cpp" /> <ClCompile Include="..\..\node\IncomingPacket.cpp" /> @@ -109,6 +110,7 @@ <ClInclude Include="..\..\node\Buffer.hpp" /> <ClInclude Include="..\..\node\C25519.hpp" /> <ClInclude Include="..\..\node\CertificateOfMembership.hpp" /> + <ClInclude Include="..\..\node\CertificateOfOwnership.hpp" /> <ClInclude Include="..\..\node\Cluster.hpp" /> <ClInclude Include="..\..\node\CMWC4096.hpp" /> <ClInclude Include="..\..\node\Constants.hpp" /> diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters index da673f61..1b7b469d 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters @@ -246,6 +246,9 @@ <ClCompile Include="..\..\service\SoftwareUpdater.cpp"> <Filter>Source Files\service</Filter> </ClCompile> + <ClCompile Include="..\..\node\CertificateOfOwnership.cpp"> + <Filter>Source Files\node</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="resource.h"> @@ -482,6 +485,9 @@ <ClInclude Include="..\..\ext\json\json.hpp"> <Filter>Header Files\ext\json</Filter> </ClInclude> + <ClInclude Include="..\..\node\CertificateOfOwnership.hpp"> + <Filter>Header Files\node</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="ZeroTierOne.rc"> |