Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build fix for OpenBSD - See ticket #2397 #2405

Merged
merged 3 commits into from
Nov 13, 2024
Merged

Build fix for OpenBSD - See ticket #2397 #2405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75a5b44
Build fix for OpenBSD - See ticket #2397
joseph-henry Nov 12, 2024
969c0ee
Omit CPU pinning code on OpenBSD
joseph-henry Nov 12, 2024
82c6454
Fix broken ifdef on OpenBSD
joseph-henry Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions osdep/BSDEthernetTap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,7 @@ void BSDEthernetTap::threadMain()
// constructing itself.
Thread::sleep(500);

#ifndef __OpenBSD__
bool pinning = _pinning;

for (unsigned int i = 0; i < _concurrency; ++i) {
Expand All @@ -451,6 +452,7 @@ void BSDEthernetTap::threadMain()
exit(1);
}
}
#endif // __OpenBSD__

uint8_t b[ZT_TAP_BUF_SIZE];
MAC to, from;
Expand Down Expand Up @@ -497,8 +499,10 @@ void BSDEthernetTap::threadMain()
}
}
}
#ifndef __OpenBSD__
}));
}
#endif // __OpenBSD__
}

} // namespace ZeroTier
2 changes: 1 addition & 1 deletion osdep/EthernetTap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ std::shared_ptr<EthernetTap> EthernetTap::newInstance(
#endif // __NetBSD__

#ifdef __OpenBSD__
return std::shared_ptr<EthernetTap>(new BSDEthernetTap(homePath,mac,mtu,metric,nwid,friendlyName,handler,arg));
return std::shared_ptr<EthernetTap>(new BSDEthernetTap(homePath,concurrency,pinning,mac,mtu,metric,nwid,friendlyName,handler,arg));
#endif // __OpenBSD__

#endif // ZT_SDK?
Expand Down
Loading