From e879599e6bd8e5c8dbe54ce0b3f2d6811fe20537 Mon Sep 17 00:00:00 2001
From: ssrlive <30760636+ssrlive@users.noreply.github.com>
Date: Sat, 20 Jul 2024 12:28:52 +0800
Subject: [PATCH] close_fd_on_drop issues

---
 src/android.rs | 19 ++++++++++++++++---
 src/apple.rs   |  8 +++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/android.rs b/src/android.rs
index d41bb74..cca174c 100644
--- a/src/android.rs
+++ b/src/android.rs
@@ -7,19 +7,27 @@ use crate::{
 };
 use jni::{
     objects::{JClass, JString},
-    sys::{jchar, jint},
+    sys::{jboolean, jchar, jint},
     JNIEnv,
 };
 
 /// # Safety
 ///
-/// Running tun2proxy
+/// Running tun2proxy with some arguments
+/// Parameters:
+/// - proxy_url: the proxy url, e.g. "socks5://127.0.0.1:1080"
+/// - tun_fd: the tun file descriptor, it will be owned by tun2proxy
+/// - close_fd_on_drop: whether close the tun_fd on drop
+/// - tun_mtu: the tun mtu
+/// - dns_strategy: the dns strategy, see ArgDns enum
+/// - verbosity: the verbosity level, see ArgVerbosity enum
 #[no_mangle]
 pub unsafe extern "C" fn Java_com_github_shadowsocks_bg_Tun2proxy_run(
     mut env: JNIEnv,
     _clazz: JClass,
     proxy_url: JString,
     tun_fd: jint,
+    close_fd_on_drop: jboolean,
     tun_mtu: jchar,
     verbosity: jint,
     dns_strategy: jint,
@@ -36,9 +44,14 @@ pub unsafe extern "C" fn Java_com_github_shadowsocks_bg_Tun2proxy_run(
     );
     let proxy_url = get_java_string(&mut env, &proxy_url).unwrap();
     let proxy = ArgProxy::try_from(proxy_url.as_str()).unwrap();
+    let close_fd_on_drop = close_fd_on_drop != 0;
 
     let mut args = Args::default();
-    args.proxy(proxy).tun_fd(Some(tun_fd)).dns(dns).verbosity(verbosity);
+    args.proxy(proxy)
+        .tun_fd(Some(tun_fd))
+        .close_fd_on_drop(close_fd_on_drop)
+        .dns(dns)
+        .verbosity(verbosity);
     crate::mobile_api::mobile_run(args, tun_mtu, false)
 }
 
diff --git a/src/apple.rs b/src/apple.rs
index 3776306..155b101 100644
--- a/src/apple.rs
+++ b/src/apple.rs
@@ -12,6 +12,7 @@ use std::os::raw::{c_char, c_int, c_ushort};
 /// Parameters:
 /// - proxy_url: the proxy url, e.g. "socks5://127.0.0.1:1080"
 /// - tun_fd: the tun file descriptor, it will be owned by tun2proxy
+/// - close_fd_on_drop: whether close the tun_fd on drop
 /// - packet_information: whether exists packet information in tun_fd
 /// - tun_mtu: the tun mtu
 /// - dns_strategy: the dns strategy, see ArgDns enum
@@ -20,6 +21,7 @@ use std::os::raw::{c_char, c_int, c_ushort};
 pub unsafe extern "C" fn tun2proxy_with_fd_run(
     proxy_url: *const c_char,
     tun_fd: c_int,
+    close_fd_on_drop: bool,
     packet_information: bool,
     tun_mtu: c_ushort,
     dns_strategy: ArgDns,
@@ -34,7 +36,11 @@ pub unsafe extern "C" fn tun2proxy_with_fd_run(
     let proxy = ArgProxy::try_from(proxy_url).unwrap();
 
     let mut args = Args::default();
-    args.proxy(proxy).tun_fd(Some(tun_fd)).dns(dns_strategy).verbosity(verbosity);
+    args.proxy(proxy)
+        .tun_fd(Some(tun_fd))
+        .close_fd_on_drop(close_fd_on_drop)
+        .dns(dns_strategy)
+        .verbosity(verbosity);
 
     crate::mobile_api::mobile_run(args, tun_mtu, packet_information)
 }