diff --git a/.github/workflows/publish-exe.yml b/.github/workflows/publish-exe.yml index 8125396..6bcb516 100644 --- a/.github/workflows/publish-exe.yml +++ b/.github/workflows/publish-exe.yml @@ -70,6 +70,8 @@ jobs: elif [[ "${{ matrix.host_os }}" == "macos-latest" ]]; then zip -j mypubdir4/tun2proxy-${{ matrix.target }}.zip target/${{ matrix.target }}/release/tun2proxy README.md target/tun2proxy-ffi.h target/${{ matrix.target }}/release/libtun2proxy.dylib if [[ "${{ matrix.target }}" == "x86_64-apple-darwin" ]]; then + ./build-aarch64-apple-ios.sh + zip -r mypubdir4/tun2proxy-aarch64-apple-ios-xcframework.zip ./tun2proxy.xcframework/ ./build-apple.sh zip -r mypubdir4/tun2proxy-apple-xcframework.zip ./tun2proxy.xcframework/ fi diff --git a/Cargo.toml b/Cargo.toml index 1a00cf9..ca23b27 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tun2proxy" -version = "0.2.14" +version = "0.2.15" edition = "2021" license = "MIT" repository = "https://github.com/blechschmidt/tun2proxy" diff --git a/build-apple-debug.sh b/build-aarch64-apple-ios-debug.sh similarity index 93% rename from build-apple-debug.sh rename to build-aarch64-apple-ios-debug.sh index 32c1a97..538865b 100755 --- a/build-apple-debug.sh +++ b/build-aarch64-apple-ios-debug.sh @@ -11,7 +11,7 @@ echo "Generating includes..." mkdir -p target/include/ rm -rf target/include/* cbindgen --config cbindgen.toml -l C -o target/include/tun2proxy.h -cat > target/include/module.modulemap < target/include/tun2proxy.modulemap < target/include/tun2proxy.modulemap < target/include/module.modulemap < target/include/tun2proxy.modulemap < c_int { log::set_max_level(verbosity.into()); - log::set_boxed_logger(Box::::default()).unwrap(); + if let Err(err) = log::set_boxed_logger(Box::::default()) { + log::error!("failed to set logger: {:?}", err); + } let proxy_url = std::ffi::CStr::from_ptr(proxy_url).to_str().unwrap(); let proxy = ArgProxy::from_url(proxy_url).unwrap(); diff --git a/src/desktop_api.rs b/src/desktop_api.rs index f83a081..3d5723e 100644 --- a/src/desktop_api.rs +++ b/src/desktop_api.rs @@ -42,7 +42,9 @@ pub unsafe extern "C" fn tun2proxy_with_name_run( } log::set_max_level(verbosity.into()); - log::set_boxed_logger(Box::::default()).unwrap(); + if let Err(err) = log::set_boxed_logger(Box::::default()) { + log::error!("set logger error: {}", err); + } let proxy_url = std::ffi::CStr::from_ptr(proxy_url).to_str().unwrap(); let proxy = ArgProxy::from_url(proxy_url).unwrap(); diff --git a/src/mobile_api.rs b/src/mobile_api.rs index 645a06e..2750733 100644 --- a/src/mobile_api.rs +++ b/src/mobile_api.rs @@ -41,9 +41,8 @@ pub fn mobile_run(args: Args, tun_mtu: u16, _packet_information: bool) -> c_int config.tun_name(tun); } - #[cfg(unix)] + #[cfg(any(target_os = "ios", target_os = "macos"))] config.platform_config(|config| { - #[allow(deprecated)] config.packet_information(_packet_information); });