Windows build fixes.
This commit is contained in:
Adam Ierymenko
parent
2eeb3dee9e
commit
74f36f5dc0
9 changed files with 163 additions and 83 deletions
|
|
@ -19,12 +19,16 @@
|
|||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\control\IpcConnection.cpp" />
|
||||
<ClCompile Include="..\..\control\IpcListener.cpp" />
|
||||
<ClCompile Include="..\..\control\NodeControlClient.cpp" />
|
||||
<ClCompile Include="..\..\control\NodeControlService.cpp" />
|
||||
<ClCompile Include="..\..\ext\lz4\lz4.c" />
|
||||
<ClCompile Include="..\..\main.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\node\C25519.cpp" />
|
||||
<ClCompile Include="..\..\node\CertificateOfMembership.cpp" />
|
||||
|
|
@ -32,17 +36,16 @@
|
|||
<ClCompile Include="..\..\node\Dictionary.cpp" />
|
||||
<ClCompile Include="..\..\node\HttpClient.cpp" />
|
||||
<ClCompile Include="..\..\node\Identity.cpp" />
|
||||
<ClCompile Include="..\..\node\IncomingPacket.cpp" />
|
||||
<ClCompile Include="..\..\node\InetAddress.cpp" />
|
||||
<ClCompile Include="..\..\node\IpcConnection.cpp" />
|
||||
<ClCompile Include="..\..\node\IpcListener.cpp" />
|
||||
<ClCompile Include="..\..\node\Logger.cpp" />
|
||||
<ClCompile Include="..\..\node\Multicaster.cpp" />
|
||||
<ClCompile Include="..\..\node\Network.cpp" />
|
||||
<ClCompile Include="..\..\node\NetworkConfig.cpp" />
|
||||
<ClCompile Include="..\..\node\Node.cpp" />
|
||||
<ClCompile Include="..\..\node\NodeConfig.cpp" />
|
||||
<ClCompile Include="..\..\node\OutboundMulticast.cpp" />
|
||||
<ClCompile Include="..\..\node\Packet.cpp" />
|
||||
<ClCompile Include="..\..\node\PacketDecoder.cpp" />
|
||||
<ClCompile Include="..\..\node\Peer.cpp" />
|
||||
<ClCompile Include="..\..\node\Poly1305.cpp" />
|
||||
<ClCompile Include="..\..\node\RoutingTable.cpp" />
|
||||
|
|
@ -60,17 +63,25 @@
|
|||
<ClCompile Include="..\..\osnet\WindowsEthernetTapFactory.cpp" />
|
||||
<ClCompile Include="..\..\osnet\WindowsRoutingTable.cpp" />
|
||||
<ClCompile Include="..\..\selftest.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\testnet\TestEthernetTap.cpp" />
|
||||
<ClCompile Include="..\..\testnet\TestEthernetTapFactory.cpp" />
|
||||
<ClCompile Include="..\..\testnet\TestRoutingTable.cpp" />
|
||||
<ClCompile Include="ServiceBase.cpp" />
|
||||
<ClCompile Include="ServiceInstaller.cpp" />
|
||||
<ClCompile Include="ZeroTierOneService.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\control\IpcConnection.hpp" />
|
||||
<ClInclude Include="..\..\control\IpcListener.hpp" />
|
||||
<ClInclude Include="..\..\control\NodeControlClient.hpp" />
|
||||
<ClInclude Include="..\..\control\NodeControlService.hpp" />
|
||||
<ClInclude Include="..\..\ext\lz4\lz4.h" />
|
||||
<ClInclude Include="..\..\include\ZeroTierOne.h" />
|
||||
<ClInclude Include="..\..\node\Address.hpp" />
|
||||
<ClInclude Include="..\..\node\AntiRecursion.hpp" />
|
||||
<ClInclude Include="..\..\node\Array.hpp" />
|
||||
|
|
@ -87,9 +98,8 @@
|
|||
<ClInclude Include="..\..\node\EthernetTap.hpp" />
|
||||
<ClInclude Include="..\..\node\HttpClient.hpp" />
|
||||
<ClInclude Include="..\..\node\Identity.hpp" />
|
||||
<ClInclude Include="..\..\node\IncomingPacket.hpp" />
|
||||
<ClInclude Include="..\..\node\InetAddress.hpp" />
|
||||
<ClInclude Include="..\..\node\IpcConnection.hpp" />
|
||||
<ClInclude Include="..\..\node\IpcListener.hpp" />
|
||||
<ClInclude Include="..\..\node\Logger.hpp" />
|
||||
<ClInclude Include="..\..\node\MAC.hpp" />
|
||||
<ClInclude Include="..\..\node\Multicaster.hpp" />
|
||||
|
|
@ -100,8 +110,8 @@
|
|||
<ClInclude Include="..\..\node\Node.hpp" />
|
||||
<ClInclude Include="..\..\node\NodeConfig.hpp" />
|
||||
<ClInclude Include="..\..\node\NonCopyable.hpp" />
|
||||
<ClInclude Include="..\..\node\OutboundMulticast.hpp" />
|
||||
<ClInclude Include="..\..\node\Packet.hpp" />
|
||||
<ClInclude Include="..\..\node\PacketDecoder.hpp" />
|
||||
<ClInclude Include="..\..\node\Path.hpp" />
|
||||
<ClInclude Include="..\..\node\Peer.hpp" />
|
||||
<ClInclude Include="..\..\node\Poly1305.hpp" />
|
||||
|
|
@ -123,6 +133,9 @@
|
|||
<ClInclude Include="..\..\osnet\WindowsEthernetTap.hpp" />
|
||||
<ClInclude Include="..\..\osnet\WindowsEthernetTapFactory.hpp" />
|
||||
<ClInclude Include="..\..\osnet\WindowsRoutingTable.hpp" />
|
||||
<ClInclude Include="..\..\testnet\TestEthernetTap.hpp" />
|
||||
<ClInclude Include="..\..\testnet\TestEthernetTapFactory.hpp" />
|
||||
<ClInclude Include="..\..\testnet\TestRoutingTable.hpp" />
|
||||
<ClInclude Include="..\..\version.h" />
|
||||
<ClInclude Include="resource.h" />
|
||||
<ClInclude Include="ServiceBase.h" />
|
||||
|
|
|
|||
|
|
@ -57,9 +57,6 @@
|
|||
<ClCompile Include="..\..\node\Packet.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\node\PacketDecoder.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\node\Peer.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -99,12 +96,6 @@
|
|||
<ClCompile Include="ZeroTierOneService.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\node\IpcConnection.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\node\IpcListener.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\node\SocketManager.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -132,6 +123,33 @@
|
|||
<ClCompile Include="..\..\selftest.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\control\IpcConnection.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\control\IpcListener.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\control\NodeControlClient.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\control\NodeControlService.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\testnet\TestEthernetTap.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\testnet\TestEthernetTapFactory.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\testnet\TestRoutingTable.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\node\IncomingPacket.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\node\OutboundMulticast.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\ext\lz4\lz4.h">
|
||||
|
|
@ -218,9 +236,6 @@
|
|||
<ClInclude Include="..\..\node\Packet.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\node\PacketDecoder.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\node\Peer.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -272,12 +287,6 @@
|
|||
<ClInclude Include="ZeroTierOneService.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\node\IpcConnection.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\node\IpcListener.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\node\Path.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -308,6 +317,36 @@
|
|||
<ClInclude Include="..\..\osnet\WindowsRoutingTable.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\control\IpcConnection.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\control\IpcListener.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\control\NodeControlClient.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\control\NodeControlService.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\testnet\TestEthernetTap.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\testnet\TestEthernetTapFactory.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\testnet\TestRoutingTable.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\node\IncomingPacket.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\ZeroTierOne.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\node\OutboundMulticast.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="ZeroTierOne.rc">
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ restart_node:
|
|||
// Get upgrade path, which will be its reason for termination
|
||||
std::string msiPath;
|
||||
if (n) {
|
||||
const char *msiPathTmp = n->reasonForTermination();
|
||||
const char *msiPathTmp = n->terminationMessage();
|
||||
if (msiPathTmp)
|
||||
msiPath = msiPathTmp;
|
||||
}
|
||||
|
|
@ -131,7 +131,7 @@ restart_node:
|
|||
|
||||
case ZeroTier::Node::NODE_UNRECOVERABLE_ERROR: {
|
||||
std::string err("ZeroTier node encountered an unrecoverable error: ");
|
||||
const char *r = _node->reasonForTermination();
|
||||
const char *r = _node->terminationMessage();
|
||||
if (r)
|
||||
err.append(r);
|
||||
else err.append("(unknown error)");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue