mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-06-05 20:13:44 +02:00
Minor Windows build fixes. Builds on VS2012 again.
This commit is contained in:
parent
bacb53fe8f
commit
54f68280bd
5 changed files with 28 additions and 16 deletions
|
@ -103,7 +103,7 @@ public:
|
||||||
private:
|
private:
|
||||||
unsigned long _idx;
|
unsigned long _idx;
|
||||||
Hashtable *_ht;
|
Hashtable *_ht;
|
||||||
Hashtable::_Bucket *_b;
|
_Bucket *_b;
|
||||||
};
|
};
|
||||||
friend class Hashtable::Iterator;
|
friend class Hashtable::Iterator;
|
||||||
|
|
||||||
|
|
|
@ -168,14 +168,14 @@ void Utils::getSecureRandom(void *buf,unsigned int bytes)
|
||||||
fprintf(stderr,"FATAL ERROR: Utils::getSecureRandom() CryptGenRandom failed!\r\n");
|
fprintf(stderr,"FATAL ERROR: Utils::getSecureRandom() CryptGenRandom failed!\r\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
s20.init(s20key,256,s20key,8);
|
s20.init(s20key,256,s20key);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!CryptGenRandom(cryptProvider,(DWORD)bytes,(BYTE *)buf)) {
|
if (!CryptGenRandom(cryptProvider,(DWORD)bytes,(BYTE *)buf)) {
|
||||||
fprintf(stderr,"FATAL ERROR: Utils::getSecureRandom() CryptGenRandom failed!\r\n");
|
fprintf(stderr,"FATAL ERROR: Utils::getSecureRandom() CryptGenRandom failed!\r\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
s20.encrypt(buf,buf,bytes);
|
s20.encrypt12(buf,buf,bytes);
|
||||||
|
|
||||||
#else // not __WINDOWS__
|
#else // not __WINDOWS__
|
||||||
|
|
||||||
|
|
|
@ -796,7 +796,7 @@ public:
|
||||||
while (ua) {
|
while (ua) {
|
||||||
InetAddress ip(ua->Address.lpSockaddr);
|
InetAddress ip(ua->Address.lpSockaddr);
|
||||||
ip.setPort(_port);
|
ip.setPort(_port);
|
||||||
_node->addLocalInterfaceAddress(reinterpret_cast<const struct sockaddr_storage *>(&ip),0,ZT_LOCAL_INTERFACE_ADDRESS_TRUST_NORMAL);
|
_node->addLocalInterfaceAddress(reinterpret_cast<const struct sockaddr_storage *>(&ip));
|
||||||
ua = ua->Next;
|
ua = ua->Next;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
<ClCompile Include="..\..\ext\lz4\lz4.c" />
|
<ClCompile Include="..\..\ext\lz4\lz4.c" />
|
||||||
<ClCompile Include="..\..\node\C25519.cpp" />
|
<ClCompile Include="..\..\node\C25519.cpp" />
|
||||||
<ClCompile Include="..\..\node\CertificateOfMembership.cpp" />
|
<ClCompile Include="..\..\node\CertificateOfMembership.cpp" />
|
||||||
<ClCompile Include="..\..\node\Defaults.cpp" />
|
<ClCompile Include="..\..\node\DeferredPackets.cpp" />
|
||||||
<ClCompile Include="..\..\node\Dictionary.cpp" />
|
<ClCompile Include="..\..\node\Dictionary.cpp" />
|
||||||
<ClCompile Include="..\..\node\Identity.cpp" />
|
<ClCompile Include="..\..\node\Identity.cpp" />
|
||||||
<ClCompile Include="..\..\node\IncomingPacket.cpp" />
|
<ClCompile Include="..\..\node\IncomingPacket.cpp" />
|
||||||
|
@ -35,6 +35,7 @@
|
||||||
<ClCompile Include="..\..\node\Node.cpp" />
|
<ClCompile Include="..\..\node\Node.cpp" />
|
||||||
<ClCompile Include="..\..\node\OutboundMulticast.cpp" />
|
<ClCompile Include="..\..\node\OutboundMulticast.cpp" />
|
||||||
<ClCompile Include="..\..\node\Packet.cpp" />
|
<ClCompile Include="..\..\node\Packet.cpp" />
|
||||||
|
<ClCompile Include="..\..\node\Path.cpp" />
|
||||||
<ClCompile Include="..\..\node\Peer.cpp" />
|
<ClCompile Include="..\..\node\Peer.cpp" />
|
||||||
<ClCompile Include="..\..\node\Poly1305.cpp" />
|
<ClCompile Include="..\..\node\Poly1305.cpp" />
|
||||||
<ClCompile Include="..\..\node\Salsa20.cpp" />
|
<ClCompile Include="..\..\node\Salsa20.cpp" />
|
||||||
|
@ -87,13 +88,16 @@
|
||||||
<ClInclude Include="..\..\node\Array.hpp" />
|
<ClInclude Include="..\..\node\Array.hpp" />
|
||||||
<ClInclude Include="..\..\node\AtomicCounter.hpp" />
|
<ClInclude Include="..\..\node\AtomicCounter.hpp" />
|
||||||
<ClInclude Include="..\..\node\BandwidthAccount.hpp" />
|
<ClInclude Include="..\..\node\BandwidthAccount.hpp" />
|
||||||
|
<ClInclude Include="..\..\node\BinarySemaphore.hpp" />
|
||||||
<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\Cluster.hpp" />
|
||||||
<ClInclude Include="..\..\node\CMWC4096.hpp" />
|
<ClInclude Include="..\..\node\CMWC4096.hpp" />
|
||||||
<ClInclude Include="..\..\node\Constants.hpp" />
|
<ClInclude Include="..\..\node\Constants.hpp" />
|
||||||
<ClInclude Include="..\..\node\Defaults.hpp" />
|
<ClInclude Include="..\..\node\DeferredPackets.hpp" />
|
||||||
<ClInclude Include="..\..\node\Dictionary.hpp" />
|
<ClInclude Include="..\..\node\Dictionary.hpp" />
|
||||||
|
<ClInclude Include="..\..\node\Hashtable.hpp" />
|
||||||
<ClInclude Include="..\..\node\Identity.hpp" />
|
<ClInclude Include="..\..\node\Identity.hpp" />
|
||||||
<ClInclude Include="..\..\node\IncomingPacket.hpp" />
|
<ClInclude Include="..\..\node\IncomingPacket.hpp" />
|
||||||
<ClInclude Include="..\..\node\InetAddress.hpp" />
|
<ClInclude Include="..\..\node\InetAddress.hpp" />
|
||||||
|
@ -111,7 +115,6 @@
|
||||||
<ClInclude Include="..\..\node\Path.hpp" />
|
<ClInclude Include="..\..\node\Path.hpp" />
|
||||||
<ClInclude Include="..\..\node\Peer.hpp" />
|
<ClInclude Include="..\..\node\Peer.hpp" />
|
||||||
<ClInclude Include="..\..\node\Poly1305.hpp" />
|
<ClInclude Include="..\..\node\Poly1305.hpp" />
|
||||||
<ClInclude Include="..\..\node\RemotePath.hpp" />
|
|
||||||
<ClInclude Include="..\..\node\RuntimeEnvironment.hpp" />
|
<ClInclude Include="..\..\node\RuntimeEnvironment.hpp" />
|
||||||
<ClInclude Include="..\..\node\Salsa20.hpp" />
|
<ClInclude Include="..\..\node\Salsa20.hpp" />
|
||||||
<ClInclude Include="..\..\node\SelfAwareness.hpp" />
|
<ClInclude Include="..\..\node\SelfAwareness.hpp" />
|
||||||
|
|
|
@ -105,9 +105,6 @@
|
||||||
<ClCompile Include="..\..\node\CertificateOfMembership.cpp">
|
<ClCompile Include="..\..\node\CertificateOfMembership.cpp">
|
||||||
<Filter>Source Files\node</Filter>
|
<Filter>Source Files\node</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\node\Defaults.cpp">
|
|
||||||
<Filter>Source Files\node</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\node\Dictionary.cpp">
|
<ClCompile Include="..\..\node\Dictionary.cpp">
|
||||||
<Filter>Source Files\node</Filter>
|
<Filter>Source Files\node</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
@ -189,6 +186,12 @@
|
||||||
<ClCompile Include="..\..\osdep\UPNPClient.cpp">
|
<ClCompile Include="..\..\osdep\UPNPClient.cpp">
|
||||||
<Filter>Source Files\osdep</Filter>
|
<Filter>Source Files\osdep</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\node\Path.cpp">
|
||||||
|
<Filter>Source Files\node</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\node\DeferredPackets.cpp">
|
||||||
|
<Filter>Source Files\node</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="resource.h">
|
<ClInclude Include="resource.h">
|
||||||
|
@ -254,9 +257,6 @@
|
||||||
<ClInclude Include="..\..\node\Constants.hpp">
|
<ClInclude Include="..\..\node\Constants.hpp">
|
||||||
<Filter>Header Files\node</Filter>
|
<Filter>Header Files\node</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="..\..\node\Defaults.hpp">
|
|
||||||
<Filter>Header Files\node</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\..\node\Dictionary.hpp">
|
<ClInclude Include="..\..\node\Dictionary.hpp">
|
||||||
<Filter>Header Files\node</Filter>
|
<Filter>Header Files\node</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
@ -356,9 +356,6 @@
|
||||||
<ClInclude Include="..\..\osdep\BackgroundResolver.hpp">
|
<ClInclude Include="..\..\osdep\BackgroundResolver.hpp">
|
||||||
<Filter>Header Files\osdep</Filter>
|
<Filter>Header Files\osdep</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="..\..\node\RemotePath.hpp">
|
|
||||||
<Filter>Header Files\node</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\..\osdep\UPNPClient.hpp">
|
<ClInclude Include="..\..\osdep\UPNPClient.hpp">
|
||||||
<Filter>Header Files\osdep</Filter>
|
<Filter>Header Files\osdep</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
@ -410,6 +407,18 @@
|
||||||
<ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnpreplyparse.h">
|
<ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnpreplyparse.h">
|
||||||
<Filter>Header Files\ext\bin\miniupnpc\include</Filter>
|
<Filter>Header Files\ext\bin\miniupnpc\include</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\node\BinarySemaphore.hpp">
|
||||||
|
<Filter>Header Files\node</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\node\Cluster.hpp">
|
||||||
|
<Filter>Header Files\node</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\node\Hashtable.hpp">
|
||||||
|
<Filter>Header Files\node</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\node\DeferredPackets.hpp">
|
||||||
|
<Filter>Header Files\node</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ResourceCompile Include="ZeroTierOne.rc">
|
<ResourceCompile Include="ZeroTierOne.rc">
|
||||||
|
|
Loading…
Add table
Reference in a new issue