Merge branch 'master' into master

Author: ssrlive

.cargo/config.toml

@@ -2,9 +2,13 @@
 protocol = "sparse"
 
 [build]
+# target = ["aarch64-apple-tvos"]
 # target = ["x86_64-unknown-linux-musl"]
 # target = ["x86_64-unknown-linux-gnu"]
-# target = ["aarch64-linux-android"]
+# target = ["aarch64-linux-android"] # arm64-v8a 
+# target = ["armv7-linux-androideabi"] # armeabi-v7a 
+# target = ["i686-linux-android"] # x86
+# target = ["x86_64-linux-android"] # x86_64
 # target = ["aarch64-apple-ios"]
 # target = ["x86_64-pc-windows-msvc"]
 # target = ["x86_64-apple-darwin"]

.github/workflows/freebsd.yml

@@ -36,6 +36,8 @@ jobs:
                 ARGS="$ARGS --features nightly"
             fi
 
+            rustup show
+
             RUST_BACKTRACE=1 cargo +${{ matrix.toolchain }} fmt --all -- --check
             RUST_BACKTRACE=1 cargo +${{ matrix.toolchain }} clippy --all-features -- -D warnings
             RUST_BACKTRACE=1 cargo +${{ matrix.toolchain }} build --all-features

.github/workflows/rust.yml

@@ -1,7 +1,7 @@
 name: Push or PR
 
 on:
-  [push, pull_request]
+  [push, pull_request, workflow_dispatch]
 
 env:
   CARGO_TERM_COLOR: always
@@ -17,6 +17,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
     - name: rustfmt
       if: ${{ !cancelled() }}
       run: cargo fmt --all -- --check
@@ -43,6 +44,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
     - name: Install cargo ndk and rust compiler for android target
       if: ${{ !cancelled() }}
       run: |
@@ -66,6 +68,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
     - name: Install cargo lipo and rust compiler for ios target
       if: ${{ !cancelled() }}
       run: |
@@ -82,6 +85,29 @@ jobs:
       if: ${{ failure() }}
       run: echo "iOS build job failed" && false
 
+  build_n_test_tvos:
+    strategy:
+      matrix:
+        target: [aarch64-apple-tvos, aarch64-apple-tvos-sim, x86_64-apple-tvos]
+      fail-fast: false
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@nightly
+      with:
+        components: clippy, rust-src
+    - name: clippy
+      if: ${{ !cancelled() }}
+      run: cargo +nightly clippy -Zbuild-std --target ${{matrix.target}} --all-features --features="async tokio/rt-multi-thread" -- -D warnings
+    - name: Build
+      if: ${{ !cancelled() }}
+      run: |
+        cargo +nightly build -Zbuild-std --verbose --target ${{matrix.target}} --all-features --features="async tokio/rt-multi-thread"
+    - name: Abort on error
+      if: ${{ failure() }}
+      run: echo "tvOS build job failed" && false
+
   build_n_test_openharmony:
     strategy:
       matrix:
@@ -91,10 +117,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: openharmony-rs/setup-ohos-sdk@v0.2
+    - uses: openharmony-rs/setup-ohos-sdk@v0.2.1
       id: setup-ohos
       with:
-        version: "5.0"
+        version: "5.0.1"
     - name: Install ohrs and rust compiler for ohos target
       if: ${{ !cancelled() }}
       run: |

Cargo.toml

@@ -1,22 +1,21 @@
 [package]
 name = "tun"
-version = "0.8.0"
-edition = "2021"
+version = "0.7.20"
+edition = "2024"
 authors = ["meh. <meh@schizofreni.co>", "@ssrlive"]
 license = "WTFPL"
 description = "TUN device creation and handling."
 repository = "https://github.com/meh/rust-tun"
 keywords = ["tun", "network", "tunnel", "bindings"]
-rust-version = "1.77"
+# rust-version = "1.85"
 
 [package.metadata.docs.rs]
 all-features = true
 
 [lib]
-crate-type = ["staticlib", "cdylib", "lib"]
+crate-type = ["staticlib", "lib"]
 
 [features]
-default = []
 # default = ["async"]
 async = [
     "tokio",
@@ -40,16 +39,8 @@ tokio = { version = "1", features = [
 ], optional = true }
 tokio-util = { version = "0.7", features = ["codec"], optional = true }
 
-[dev-dependencies]
-ctrlc2 = { version = "3", features = ["tokio", "termination"] }
-env_logger = "0.11"
-futures = "0.3"
-packet = "0.1"
-serde_json = "1"
-tokio = { version = "1", features = ["rt-multi-thread"] }
-
-[target.'cfg(unix)'.dependencies]
-nix = { version = "0.29", features = ["ioctl"] }
+[target.'cfg(any(target_os = "macos", target_os = "freebsd"))'.dependencies]
+ipnet = "2"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 futures = { version = "0.3", optional = true }
@@ -66,10 +57,24 @@ wintun-bindings = { version = "^0.7.7", features = [
     "panic_on_unsent_packets",
     "verify_binary_signature",
     "async",
+    "enable_inner_logging",
+    "winreg",
 ] }
 
-[target.'cfg(any(target_os = "macos", target_os = "freebsd"))'.dependencies]
-ipnet = "2"
+[target.'cfg(unix)'.dependencies]
+nix = { version = "0.30", features = ["ioctl"] }
+
+[dev-dependencies]
+ctrlc2 = { version = "3", features = ["tokio", "termination"] }
+env_logger = "0.11"
+futures = "0.3"
+packet = "0.1"
+serde_json = "1"
+tokio = { version = "1", features = ["rt-multi-thread"] }
+
+[target.'cfg(unix)'.dev-dependencies]
+futures = "0.3"
+nix = { version = "0.30", features = ["ioctl"] }
 
 [[example]]
 name = "read-async"

README.md

@@ -64,6 +64,7 @@ Platforms
 - [x] FreeBSD
 - [x] Android
 - [x] iOS
+- [x] tvOS
 - [x] OpenHarmony
 
 
@@ -154,10 +155,6 @@ async fn setup(fd: i32) {
     rt.block_on(async {
         let mut cfg = tun::Configuration::default();
         cfg.raw_fd(fd);
-        #[cfg(target_os = "ios")]
-        cfg.platform_config(|p_cfg| {
-            p_cfg.packet_information(true);
-        });
         let mut tun = tun::create_as_async(&cfg).unwrap();
         let mut framed = tun.into_framed();
         while let Some(packet) = framed.next().await {

examples/dev-config.rs

@@ -12,7 +12,7 @@
 //
 //  0. You just DO WHAT THE FUCK YOU WANT TO.
 
-use packet::{builder::Builder, icmp, ip, Packet};
+use packet::{Packet, builder::Builder, icmp, ip};
 use std::io::{Read, Write};
 use std::{net::Ipv4Addr, sync::mpsc::Receiver};
 use tun::{AbstractDevice, BoxError};

examples/ping-tun.rs

@@ -13,7 +13,7 @@
 //  0. You just DO WHAT THE FUCK YOU WANT TO.
 
 use futures::{SinkExt, StreamExt};
-use packet::{builder::Builder, icmp, ip, Packet};
+use packet::{Packet, builder::Builder, icmp, ip};
 use tokio::sync::mpsc::Receiver;
 use tun::{self, BoxError, Configuration};
 

examples/read-async-codec.rs

@@ -14,7 +14,7 @@
 
 use bytes::BytesMut;
 use futures::StreamExt;
-use packet::{ip::Packet, Error};
+use packet::{Error, ip::Packet};
 use tokio::sync::mpsc::Receiver;
 use tokio_util::codec::{Decoder, FramedRead};
 use tun::BoxError;

examples/split.rs

@@ -12,7 +12,7 @@
 //
 //  0. You just DO WHAT THE FUCK YOU WANT TO.
 
-use packet::{builder::Builder, icmp, ip, Packet};
+use packet::{Packet, builder::Builder, icmp, ip};
 use std::io::{Read, Write};
 use std::sync::mpsc::Receiver;
 use tun::BoxError;
@@ -56,8 +56,7 @@ fn main_entry(quit: Receiver<()>) -> Result<(), BoxError> {
         loop {
             let size = reader.read(&mut buf)?;
             let pkt = &buf[..size];
-            use std::io::{Error, ErrorKind::Other};
-            tx.send(pkt.to_vec()).map_err(|e| Error::new(Other, e))?;
+            tx.send(pkt.to_vec()).map_err(std::io::Error::other)?;
         }
         #[allow(unreachable_code)]
         Ok::<(), std::io::Error>(())

examples/write.rs

@@ -12,7 +12,7 @@
 //
 //  0. You just DO WHAT THE FUCK YOU WANT TO.
 
-use packet::{builder::Builder, icmp, ip, Packet};
+use packet::{Packet, builder::Builder, icmp, ip};
 use std::io::{Read, Write};
 use std::sync::mpsc::Receiver;
 use tun::BoxError;