Revert a change to LinuxEthernetTap threading to eliminate out of order packet issues on some systems.

This commit is contained in:
Adam Ierymenko
2021-06-28 17:15:34 -04:00
parent 7b0d11b187
commit 0461b24db3
2 changed files with 77 additions and 143 deletions

View File

@@ -26,7 +26,6 @@
#include <mutex>
#include "../node/MulticastGroup.hpp"
#include "EthernetTap.hpp"
#include "BlockingQueue.hpp"
namespace ZeroTier {
@@ -71,12 +70,7 @@ private:
int _shutdownSignalPipe[2];
std::atomic_bool _enabled;
std::atomic_bool _run;
std::thread _tapReaderThread[2];
std::thread _tapProcessorThread;
std::mutex _buffers_l;
std::mutex _thread_init_l;
std::vector<void *> _buffers;
BlockingQueue< std::pair<void *,int> > _tapq;
std::thread _tapReaderThread;
};
} // namespace ZeroTier