Compare commits

..

1 commit

Author SHA1 Message Date
Adam Ierymenko
8140264cb6
Merge pull request #2363 from zerotier/dev
Some checks failed
/ build_macos (push) Has been cancelled
/ build_windows (push) Has been cancelled
/ build_ubuntu (push) Has been cancelled
1.14.1 merge dev to main
2024-09-12 18:51:36 -04:00
2 changed files with 2 additions and 5 deletions

View file

@ -431,12 +431,10 @@ void BSDEthernetTap::threadMain()
// constructing itself.
Thread::sleep(500);
bool pinning = _pinning;
for (unsigned int i = 0; i < _concurrency; ++i) {
_rxThreads.push_back(std::thread([this, i, pinning] {
_rxThreads.push_back(std::thread([this, i, _pinning] {
if (pinning) {
if (_pinning) {
int pinCore = i % _concurrency;
fprintf(stderr, "Pinning thread %d to core %d\n", i, pinCore);
pthread_t self = pthread_self();

View file

@ -2599,7 +2599,6 @@ public:
fprintf(stderr,"WARNING: using manually-specified secondary and/or tertiary ports. This can cause NAT issues." ZT_EOL_S);
}
_portMappingEnabled = OSUtils::jsonBool(settings["portMappingEnabled"],true);
_node->setLowBandwidthMode(OSUtils::jsonBool(settings["lowBandwidthMode"],false));
#if defined(__LINUX__) || defined(__FreeBSD__)
_multicoreEnabled = OSUtils::jsonBool(settings["multicoreEnabled"],false);
_concurrency = OSUtils::jsonInt(settings["concurrency"],1);