luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-04-18 13:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix #144

Browse source
This commit is contained in:
ssrlive 2024-09-14 16:08:54 +08:00
parent c167f45a5e
commit 1e6c6f4f66
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -4,6 +4,7 @@ tun2proxy.xcframework/
.env .env
project.xcworkspace/ project.xcworkspace/
xcuserdata/ xcuserdata/
.vs/
.vscode/ .vscode/
.VSCodeCounter/ .VSCodeCounter/
build/ build/

12
src/win_svc.rs
View file

@ -68,8 +68,9 @@ fn run_service(_arguments: Vec<std::ffi::OsString>) -> Result<(), crate::BoxErro
let default = format!("{:?},trust_dns_proto=warn", args.verbosity); let default = format!("{:?},trust_dns_proto=warn", args.verbosity);
env_logger::Builder::from_env(env_logger::Env::default().default_filter_or(default)).init(); env_logger::Builder::from_env(env_logger::Env::default().default_filter_or(default)).init();
let join_handle = tokio::spawn({ let rt = tokio::runtime::Builder::new_multi_thread().enable_all().build()?;
async move { rt.block_on(async {
{
unsafe extern "C" fn traffic_cb(status: *const crate::TrafficStatus, _: *mut std::ffi::c_void) { unsafe extern "C" fn traffic_cb(status: *const crate::TrafficStatus, _: *mut std::ffi::c_void) {
let status = &*status; let status = &*status;
log::debug!("Traffic: ▲ {} : ▼ {}", status.tx, status.rx); log::debug!("Traffic: ▲ {} : ▼ {}", status.tx, status.rx);
@ -80,13 +81,6 @@ fn run_service(_arguments: Vec<std::ffi::OsString>) -> Result<(), crate::BoxErro
log::error!("main loop error: {}", err); log::error!("main loop error: {}", err);
} }
} }
});
let rt = tokio::runtime::Builder::new_multi_thread().enable_all().build()?;
rt.block_on(async {
if let Err(err) = join_handle.await {
log::error!("main_entry error {}", err);
}
Ok::<(), crate::Error>(()) Ok::<(), crate::Error>(())
})?; })?;