summaryrefslogtreecommitdiff
path: root/windows/ZeroTierOne
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@zerotier.com>2014-04-08 12:00:21 -0700
committerAdam Ierymenko <adam.ierymenko@zerotier.com>2014-04-08 12:00:21 -0700
commit5abfb11813d0db9a85903712db2b3389c7c34d6e (patch)
tree8bd6c240dd69f519a22147d54f308fefabe0f67c /windows/ZeroTierOne
parent0b8d6c7f4a9c7753e5da255bd213ef8fde59bb1e (diff)
downloadinfinitytier-5abfb11813d0db9a85903712db2b3389c7c34d6e.tar.gz
infinitytier-5abfb11813d0db9a85903712db2b3389c7c34d6e.zip
Some installer stuff, complete refactoring of Windows side of newly split tap driver. Seems to work. Now to see if the cleanup we did here gets rid of the zombie tap device issue on Windows.
Diffstat (limited to 'windows/ZeroTierOne')
-rw-r--r--windows/ZeroTierOne/ZeroTierOne.vcxproj3
-rw-r--r--windows/ZeroTierOne/ZeroTierOne.vcxproj.filters9
2 files changed, 8 insertions, 4 deletions
diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj
index c682aeee..714896a6 100644
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj
@@ -25,7 +25,6 @@
<ClCompile Include="..\..\node\C25519.cpp" />
<ClCompile Include="..\..\node\CertificateOfMembership.cpp" />
<ClCompile Include="..\..\node\Defaults.cpp" />
- <ClCompile Include="..\..\node\EthernetTap.cpp" />
<ClCompile Include="..\..\node\HttpClient.cpp" />
<ClCompile Include="..\..\node\Identity.cpp" />
<ClCompile Include="..\..\node\InetAddress.cpp" />
@@ -52,6 +51,7 @@
<ClCompile Include="..\..\node\Topology.cpp" />
<ClCompile Include="..\..\node\UdpSocket.cpp" />
<ClCompile Include="..\..\node\Utils.cpp" />
+ <ClCompile Include="..\..\node\WindowsEthernetTap.cpp" />
<ClCompile Include="ServiceBase.cpp" />
<ClCompile Include="ServiceInstaller.cpp" />
<ClCompile Include="ZeroTierOneService.cpp" />
@@ -107,6 +107,7 @@
<ClInclude Include="..\..\node\Topology.hpp" />
<ClInclude Include="..\..\node\UdpSocket.hpp" />
<ClInclude Include="..\..\node\Utils.hpp" />
+ <ClInclude Include="..\..\node\WindowsEthernetTap.hpp" />
<ClInclude Include="resource.h" />
<ClInclude Include="ServiceBase.h" />
<ClInclude Include="ServiceInstaller.h" />
diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
index 03a119fe..a58b54bb 100644
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
@@ -30,9 +30,6 @@
<ClCompile Include="..\..\node\Defaults.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\node\EthernetTap.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\node\HttpClient.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -123,6 +120,9 @@
<ClCompile Include="..\..\node\TcpSocket.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\node\WindowsEthernetTap.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\ext\lz4\lz4.h">
@@ -287,6 +287,9 @@
<ClInclude Include="..\..\node\TcpSocket.hpp">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\node\WindowsEthernetTap.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ZeroTierOne.rc">