void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Windows compile error.

Browse source
This commit is contained in:
Adam Ierymenko 2018-01-30 16:07:41 -08:00
parent 4878d8ec15
commit d6e8a5f3ca
4 changed files with 923 additions and 926 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
osdep/WindowsEthernetTap.cpp
View file

@ -795,8 +795,9 @@ void WindowsEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherTyp
return; return;
Mutex::Lock _l(_injectPending_m); Mutex::Lock _l(_injectPending_m);
_injectPending.push( std::pair<Array<char,ZT_MAX_MTU + 32>,unsigned int>(Array<char,ZT_MAX_MTU + 32>(),len + 14) ); _injectPending.emplace();
char *d = _injectPending.back().first.data; _injectPending.back().len = len + 14;
char *const d = _injectPending.back().data;
to.copyTo(d,6); to.copyTo(d,6);
from.copyTo(d + 6,6); from.copyTo(d + 6,6);
d[12] = (char)((etherType >> 8) & 0xff); d[12] = (char)((etherType >> 8) & 0xff);
@ -1100,7 +1101,7 @@ void WindowsEthernetTap::threadMain()
} else _injectPending_m.lock(); } else _injectPending_m.lock();
if (!_injectPending.empty()) { if (!_injectPending.empty()) {
WriteFile(_tap,_injectPending.front().first.data,_injectPending.front().second,NULL,&tapOvlWrite); WriteFile(_tap,_injectPending.front().data,_injectPending.front().len,NULL,&tapOvlWrite);
writeInProgress = true; writeInProgress = true;
} }

8
osdep/WindowsEthernetTap.hpp
View file

@ -38,7 +38,6 @@
#include "../node/Constants.hpp" #include "../node/Constants.hpp"
#include "../node/Mutex.hpp" #include "../node/Mutex.hpp"
#include "../node/Array.hpp"
#include "../node/MulticastGroup.hpp" #include "../node/MulticastGroup.hpp"
#include "../node/InetAddress.hpp" #include "../node/InetAddress.hpp"
#include "../osdep/Thread.hpp" #include "../osdep/Thread.hpp"
@ -150,7 +149,12 @@ private:
std::vector<MulticastGroup> _multicastGroups; std::vector<MulticastGroup> _multicastGroups;
std::queue< std::pair< Array<char,ZT_MAX_MTU + 32>,unsigned int > > _injectPending; struct _InjectPending
{
unsigned int len;
char data[ZT_MAX_MTU + 32];
};
std::queue<_InjectPending> _injectPending;
Mutex _injectPending_m; Mutex _injectPending_m;
std::string _pathToHelpers; std::string _pathToHelpers;

2
windows/ZeroTierOne/ZeroTierOne.vcxproj
View file

@ -130,7 +130,6 @@
<ClInclude Include="..\..\ext\x64-salsa2012-asm\salsa2012.h" /> <ClInclude Include="..\..\ext\x64-salsa2012-asm\salsa2012.h" />
<ClInclude Include="..\..\include\ZeroTierOne.h" /> <ClInclude Include="..\..\include\ZeroTierOne.h" />
<ClInclude Include="..\..\node\Address.hpp" /> <ClInclude Include="..\..\node\Address.hpp" />
<ClInclude Include="..\..\node\Array.hpp" />
<ClInclude Include="..\..\node\AtomicCounter.hpp" /> <ClInclude Include="..\..\node\AtomicCounter.hpp" />
<ClInclude Include="..\..\node\Buffer.hpp" /> <ClInclude Include="..\..\node\Buffer.hpp" />
<ClInclude Include="..\..\node\C25519.hpp" /> <ClInclude Include="..\..\node\C25519.hpp" />
@ -151,7 +150,6 @@
<ClInclude Include="..\..\node\NetworkConfig.hpp" /> <ClInclude Include="..\..\node\NetworkConfig.hpp" />
<ClInclude Include="..\..\node\NetworkController.hpp" /> <ClInclude Include="..\..\node\NetworkController.hpp" />
<ClInclude Include="..\..\node\Node.hpp" /> <ClInclude Include="..\..\node\Node.hpp" />
<ClInclude Include="..\..\node\NonCopyable.hpp" />
<ClInclude Include="..\..\node\OutboundMulticast.hpp" /> <ClInclude Include="..\..\node\OutboundMulticast.hpp" />
<ClInclude Include="..\..\node\Packet.hpp" /> <ClInclude Include="..\..\node\Packet.hpp" />
<ClInclude Include="..\..\node\Path.hpp" /> <ClInclude Include="..\..\node\Path.hpp" />

6
windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
View file

@ -293,9 +293,6 @@
<ClInclude Include="..\..\node\Address.hpp"> <ClInclude Include="..\..\node\Address.hpp">
<Filter>Header Files\node</Filter> <Filter>Header Files\node</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\node\Array.hpp">
<Filter>Header Files\node</Filter>
</ClInclude>
<ClInclude Include="..\..\node\AtomicCounter.hpp"> <ClInclude Include="..\..\node\AtomicCounter.hpp">
<Filter>Header Files\node</Filter> <Filter>Header Files\node</Filter>
</ClInclude> </ClInclude>
@ -347,9 +344,6 @@
<ClInclude Include="..\..\node\Node.hpp"> <ClInclude Include="..\..\node\Node.hpp">
<Filter>Header Files\node</Filter> <Filter>Header Files\node</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\node\NonCopyable.hpp">
<Filter>Header Files\node</Filter>
</ClInclude>
<ClInclude Include="..\..\node\OutboundMulticast.hpp"> <ClInclude Include="..\..\node\OutboundMulticast.hpp">
<Filter>Header Files\node</Filter> <Filter>Header Files\node</Filter>
</ClInclude> </ClInclude>