Browse Source

Windows build fix.

Adam Ierymenko 8 years ago
parent
commit
fe19ad328c

+ 2 - 2
service/ControlPlane.cpp

@@ -142,8 +142,8 @@ static void _moonToJson(nlohmann::json &mj,const World &world)
 	Utils::snprintf(tmp,sizeof(tmp),"%.16llx",world.id());
 	Utils::snprintf(tmp,sizeof(tmp),"%.16llx",world.id());
 	mj["id"] = tmp;
 	mj["id"] = tmp;
 	mj["timestamp"] = world.timestamp();
 	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();
 	nlohmann::json ra = nlohmann::json::array();
 	for(std::vector<World::Root>::const_iterator r(world.roots().begin());r!=world.roots().end();++r) {
 	for(std::vector<World::Root>::const_iterator r(world.roots().begin());r!=world.roots().end();++r) {
 		nlohmann::json rj;
 		nlohmann::json rj;

+ 2 - 0
windows/ZeroTierOne/ZeroTierOne.vcxproj

@@ -41,6 +41,7 @@
     <ClCompile Include="..\..\node\C25519.cpp" />
     <ClCompile Include="..\..\node\C25519.cpp" />
     <ClCompile Include="..\..\node\Capability.cpp" />
     <ClCompile Include="..\..\node\Capability.cpp" />
     <ClCompile Include="..\..\node\CertificateOfMembership.cpp" />
     <ClCompile Include="..\..\node\CertificateOfMembership.cpp" />
+    <ClCompile Include="..\..\node\CertificateOfOwnership.cpp" />
     <ClCompile Include="..\..\node\Cluster.cpp" />
     <ClCompile Include="..\..\node\Cluster.cpp" />
     <ClCompile Include="..\..\node\Identity.cpp" />
     <ClCompile Include="..\..\node\Identity.cpp" />
     <ClCompile Include="..\..\node\IncomingPacket.cpp" />
     <ClCompile Include="..\..\node\IncomingPacket.cpp" />
@@ -109,6 +110,7 @@
     <ClInclude Include="..\..\node\Buffer.hpp" />
     <ClInclude Include="..\..\node\Buffer.hpp" />
     <ClInclude Include="..\..\node\C25519.hpp" />
     <ClInclude Include="..\..\node\C25519.hpp" />
     <ClInclude Include="..\..\node\CertificateOfMembership.hpp" />
     <ClInclude Include="..\..\node\CertificateOfMembership.hpp" />
+    <ClInclude Include="..\..\node\CertificateOfOwnership.hpp" />
     <ClInclude Include="..\..\node\Cluster.hpp" />
     <ClInclude Include="..\..\node\Cluster.hpp" />
     <ClInclude Include="..\..\node\CMWC4096.hpp" />
     <ClInclude Include="..\..\node\CMWC4096.hpp" />
     <ClInclude Include="..\..\node\Constants.hpp" />
     <ClInclude Include="..\..\node\Constants.hpp" />

+ 6 - 0
windows/ZeroTierOne/ZeroTierOne.vcxproj.filters

@@ -246,6 +246,9 @@
     <ClCompile Include="..\..\service\SoftwareUpdater.cpp">
     <ClCompile Include="..\..\service\SoftwareUpdater.cpp">
       <Filter>Source Files\service</Filter>
       <Filter>Source Files\service</Filter>
     </ClCompile>
     </ClCompile>
+    <ClCompile Include="..\..\node\CertificateOfOwnership.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">
     <ClInclude Include="resource.h">
@@ -482,6 +485,9 @@
     <ClInclude Include="..\..\ext\json\json.hpp">
     <ClInclude Include="..\..\ext\json\json.hpp">
       <Filter>Header Files\ext\json</Filter>
       <Filter>Header Files\ext\json</Filter>
     </ClInclude>
     </ClInclude>
+    <ClInclude Include="..\..\node\CertificateOfOwnership.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ZeroTierOne.rc">
     <ResourceCompile Include="ZeroTierOne.rc">