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

Make tap driver even more defensive... seems to maybe fix the new network problem. Have to test a bit more.

Browse source
This commit is contained in:
Adam Ierymenko 2015-05-19 18:40:34 -07:00
parent c7eb5f0c81
commit dd70188643
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/installfiles/windows/ZeroTier One.aip
View file

@ -23,7 +23,7 @@
<ROW Property="CTRLS" Value="2"/> <ROW Property="CTRLS" Value="2"/>
<ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/> <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
<ROW Property="Manufacturer" Value="ZeroTier, Inc."/> <ROW Property="Manufacturer" Value="ZeroTier, Inc."/>
<ROW Property="ProductCode" Value="1033:{935C8724-0E87-4178-A29A-007508B15436} " Type="16"/> <ROW Property="ProductCode" Value="1033:{F4513A63-407E-447E-A840-FAE83DF26A78} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/> <ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="ZeroTier One"/> <ROW Property="ProductName" Value="ZeroTier One"/>
<ROW Property="ProductVersion" Value="1.0.3" Type="32"/> <ROW Property="ProductVersion" Value="1.0.3" Type="32"/>

8
osdep/WindowsEthernetTap.cpp
View file

@ -578,11 +578,6 @@ void WindowsEthernetTap::threadMain()
HANDLE wait4[3]; HANDLE wait4[3];
char *tapReadBuf = (char *)0; char *tapReadBuf = (char *)0;
if (!_enableTapDevice()) {
_enabled = false;
return; // only happens if devcon is missing or totally fails
}
/* No idea why I did this. I did it a long time ago and there was only a /* No idea why I did this. I did it a long time ago and there was only a
* a snarky comment. But I'd never do crap like this without a reason, so * a snarky comment. But I'd never do crap like this without a reason, so
* I am leaving it alone with a more descriptive snarky comment. */ * I am leaving it alone with a more descriptive snarky comment. */
@ -596,6 +591,9 @@ void WindowsEthernetTap::threadMain()
int prevTapResetStatus = _systemTapResetStatus; int prevTapResetStatus = _systemTapResetStatus;
bool throwOneAway = true; // "Power cycle" the network port once on startup, because Windows... bool throwOneAway = true; // "Power cycle" the network port once on startup, because Windows...
while (_run) { while (_run) {
_disableTapDevice();
Sleep(500);
_enableTapDevice();
Sleep(500); Sleep(500);
_tap = CreateFileA(tapPath,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_SYSTEM|FILE_FLAG_OVERLAPPED,NULL); _tap = CreateFileA(tapPath,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_SYSTEM|FILE_FLAG_OVERLAPPED,NULL);