diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-01-26 10:21:43 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-01-26 10:21:43 -0800 |
| commit | 22efa1ab53fcd484657161841468810b43ea1d0d (patch) | |
| tree | 466c27b67bb148a6c8c5b37017cbe91addd3e9f6 /node/EthernetTap.cpp | |
| parent | f19d1e253afe690075bb311e708844b8a026fa36 (diff) | |
| download | infinitytier-22efa1ab53fcd484657161841468810b43ea1d0d.tar.gz infinitytier-22efa1ab53fcd484657161841468810b43ea1d0d.zip | |
Windows Installer work, fix 100% CPU bug in EthernetTap on Windows, Windows lockDownFile() implementation that uses 'cacls' utility.
Diffstat (limited to 'node/EthernetTap.cpp')
| -rw-r--r-- | node/EthernetTap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node/EthernetTap.cpp b/node/EthernetTap.cpp index 87482537..fce30b61 100644 --- a/node/EthernetTap.cpp +++ b/node/EthernetTap.cpp @@ -1465,7 +1465,7 @@ void EthernetTap::threadMain() for(;;) { if (!_run) break; - WaitForMultipleObjectsEx(3,wait4,FALSE,INFINITE,TRUE); + DWORD r = WaitForMultipleObjectsEx(writeInProgress ? 3 : 2,wait4,FALSE,INFINITE,TRUE); if (!_run) break; if (HasOverlappedIoCompleted(&_tapOvlRead)) { |