luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-06-20 16:10:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Use pipe for exiting

Browse source
This commit is contained in:
B. Blechschmidt 2023-04-27 22:41:54 +02:00
parent 034417f525
commit 5e218c2130
3 changed files with 46 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/android.rs
View file

@ -1,12 +1,15 @@
#![cfg(target_os = "android")]
use crate::{error::Error, main_entry, shutdown, NetworkInterface, Options, Proxy};
use crate::tun2proxy::TunToProxy;
use crate::{error::Error, tun_to_proxy, NetworkInterface, Options, Proxy};
use jni::{
objects::{JClass, JString},
sys::{jboolean, jint},
JNIEnv,
};
static mut TUN_TO_PROXY: Option<TunToProxy> = None;
/// # Safety
///
/// Running tun2proxy
@ -42,7 +45,11 @@ pub unsafe extern "C" fn Java_com_github_shadowsocks_bg_Tun2proxy_run(
let options = Options::new().with_virtual_dns().with_mtu(tun_mtu as usize);
let interface = NetworkInterface::Fd(tun_fd);
_ = main_entry(&interface, &proxy, options)?;
let tun2proxy = tun_to_proxy(&interface, &proxy, options)?;
TUN_TO_PROXY = Some(tun2proxy);
if let Some(tun2proxy) = &mut TUN_TO_PROXY {
tun2proxy.run()?;
}
Ok::<(), Error>(())
};
if let Err(error) = block() {
@ -59,11 +66,19 @@ pub unsafe extern "C" fn Java_com_github_shadowsocks_bg_Tun2proxy_stop(
_env: JNIEnv,
_clazz: JClass,
) -> jint {
if let Err(e) = shutdown() {
log::error!("failed to shutdown tun2proxy with error: {:?}", e);
1
} else {
0
match &mut TUN_TO_PROXY {
None => {
log::error!("tun2proxy not started");
1
}
Some(tun2proxy) => {
if let Err(e) = tun2proxy.shutdown() {
log::error!("failed to shutdown tun2proxy with error: {:?}", e);
1
} else {
0
}
}
}
}