Skip to content

tokio_util::sync::CancellationToken usage in local-tun #1923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

tokio_util::sync::CancellationToken usage in local-tun #1923

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21844cc
tokio_util::sync::CancellationToken usage in local-tun
ssrlive Mar 22, 2025
91b9ad9
Merge branch 'shadowsocks:master' into master
ssrlive Mar 25, 2025
54fe3e6
AsyncDrop not exist yet. so we sleep a while.
ssrlive Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/shadowsocks-service/src/local/tun/tcp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,9 @@ impl Drop for TcpTun {
self.manager_running.cancel();
self.manager_notify.notify_one();
if let Some(handle) = self.manager_handle.take() {
if let Err(e) = tokio::runtime::Handle::current().block_on(handle) {
log::error!("TcpTun smoltcp-poll error: {:?}", e);
}
log::debug!("TcpTun::drop, waiting for manager thread to exit");
std::thread::sleep(std::time::Duration::from_millis(100));
Copy link
Collaborator

@zonyitoo zonyitoo Mar 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There must be another way to make it work gracefully.

Copy link
Author

@ssrlive ssrlive Mar 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I'm researching it.

handle.abort();
}
}
}
Expand Down