mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-08-07 04:59:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: guard macos-ne feature with target_os = "macos" in cfg expressions (#1962)

Browse Source 
All 13 occurrences of `any(target_os = "ios", feature = "macos-ne")` are
replaced with `any(target_os = "ios", all(target_os = "macos", feature = "macos-ne"))`.

Previously, enabling `macos-ne` on non-macOS platforms (e.g. `--all-features`
on Linux) would incorrectly compile macOS/mobile-specific code paths, causing
build failures or wrong runtime behavior.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
KKRainbow
2026-03-05 00:06:21 +08:00
committed by GitHub
parent 5f31583a84
commit 22b4c4be2c
5 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier/src/instance/virtual_nic.rs
+7 -4
View File
@@ -577,7 +577,7 @@ impl VirtualNic {
#[cfg(any(
target_os = "android",
any(target_os = "ios", feature = "macos-ne"),
any(target_os = "ios", all(target_os = "macos", feature = "macos-ne")),
target_env = "ohos"
))]
pub async fn create_dev_for_mobile(
@@ -588,7 +588,7 @@ impl VirtualNic {
let mut config = Configuration::default();
config.layer(Layer::L3);
#[cfg(any(target_os = "ios", feature = "macos-ne"))]
#[cfg(any(target_os = "ios", all(target_os = "macos", feature = "macos-ne")))]
config.platform_config(|config| {
// disable packet information so we can process the header by ourselves, see tun2 impl for more details
config.packet_information(false);
@@ -598,7 +598,10 @@ impl VirtualNic {
config.close_fd_on_drop(false);
config.up();
let has_packet_info = cfg!(any(target_os = "ios", feature = "macos-ne"));
let has_packet_info = cfg!(any(
target_os = "ios",
all(target_os = "macos", feature = "macos-ne")
));
let dev = tun::create(&config)?;
let dev = AsyncDevice::new(dev)?;
let (a, b) = BiLock::new(dev);
@@ -1174,7 +1177,7 @@ impl NicCtx {
#[cfg(any(
target_os = "android",
any(target_os = "ios", feature = "macos-ne"),
any(target_os = "ios", all(target_os = "macos", feature = "macos-ne")),
target_env = "ohos"
))]
pub async fn run_for_mobile(&mut self, tun_fd: std::os::fd::RawFd) -> Result<(), Error> {