Skip to content

fix: listen drop with upgrade mode #413

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

Merged
zhangsoledad merged 1 commit into from
Jun 17, 2025
Merged

fix: listen drop with upgrade mode #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tentacle/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ thiserror = "1.0"
nohash-hasher = "0.2"

parking_lot = { version = "0.12", optional = true }
tokio-tungstenite = { version = "0.26", optional = true }
tokio-tungstenite = { version = "0.27", optional = true }
httparse = { version = "1.9", optional = true }
futures-timer = { version = "3.0.2", optional = true }

Expand Down
8 changes: 2 additions & 6 deletions tentacle/src/runtime/tokio_runtime/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ async fn connect_by_proxy(
socks5::connect(proxy_server_url.clone(), target_addr.clone(), target_port)
.await
.map_err(|err| {
io::Error::new(
io::ErrorKind::Other,
io::Error::other(
format!(
"socks5_connect to target_addr: {}, target_port: {} by proxy_server: {} failed, err: {}",
target_addr, target_port, proxy_server_url, err
Expand Down Expand Up @@ -196,10 +195,7 @@ pub(crate) async fn connect(
)
.await
.map_err(|err| {
io::Error::new(
io::ErrorKind::Other,
format!("connect_by_proxy: {}, error: {}", proxy_url, err),
)
io::Error::other(format!("connect_by_proxy: {}, error: {}", proxy_url, err))
}),
None => connect_direct(target_addr, socket_transformer).await,
}
Expand Down
37 changes: 34 additions & 3 deletions tentacle/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,17 @@ where
if let Some(client) = inner.igd_client.as_mut() {
client.register(&listen_address)
}
inner.listens.insert(listen_address.clone());
let clear_addr = listen_address
.into_iter()
.map(|p| {
if let Protocol::Tls(_) = p {
Protocol::Tls(Default::default())
} else {
p
}
})
.collect::<Multiaddr>();
inner.listens.insert(clear_addr);

if !matches!(incoming, MultiIncoming::TcpUpgrade) {
inner.spawn_listener(incoming, listen_address);
Expand Down Expand Up @@ -312,6 +322,7 @@ where
timeout: self.config.timeout,
listen_addr: listen_address,
future_task_sender: self.future_task_sender.clone(),
listens_upgrade_modes: self.multi_transport.listens_upgrade_modes.clone(),
};
let mut sender = self.future_task_sender.clone();
crate::runtime::spawn(async move {
Expand Down Expand Up @@ -1071,7 +1082,17 @@ where
.into(),
)
.await;
self.listens.insert(listen_address.clone());
let clear_addr = listen_address
.into_iter()
.map(|p| {
if let Protocol::Tls(_) = p {
Protocol::Tls(Default::default())
} else {
p
}
})
.collect::<Multiaddr>();
self.listens.insert(clear_addr);
self.state.decrease();
self.try_update_listens().await;
#[cfg(feature = "upnp")]
Expand Down Expand Up @@ -1136,7 +1157,17 @@ where
}
}
ServiceTask::Listen { address } => {
if !self.listens.contains(&address) {
let clear_addr = address
.into_iter()
.map(|p| {
if let Protocol::Tls(_) = p {
Protocol::Tls(Default::default())
} else {
p
}
})
.collect::<Multiaddr>();
if !self.listens.contains(&clear_addr) {
if let Err(e) = self.listen_inner(address.clone()) {
let _ignore = self
.handle_sender
Expand Down
207 changes: 199 additions & 8 deletions tentacle/src/service/helper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,14 @@ pub struct Listener<K> {
pub(crate) timeout: Duration,
pub(crate) listen_addr: Multiaddr,
pub(crate) future_task_sender: mpsc::Sender<BoxedFutureTask>,
pub(crate) listens_upgrade_modes: std::sync::Arc<
crate::lock::Mutex<
std::collections::HashMap<
std::net::SocketAddr,
crate::transports::tcp_base_listen::UpgradeMode,
>,
>,
>,
}

#[cfg(not(target_family = "wasm"))]
Expand All @@ -174,15 +182,198 @@ where
let mut event_sender = self.event_sender.clone();
let mut future_sender = self.future_task_sender.clone();
let address = self.listen_addr.clone();
let mode = {
use crate::utils::multiaddr_to_socketaddr;

let global = self.listens_upgrade_modes.lock();
match multiaddr_to_socketaddr(&address) {
Some(net_addr) => global.get(&net_addr).map(|u| u.to_enum()),
None => None,
}
};
#[cfg(any(feature = "ws", feature = "tls"))]
use crate::multiaddr::Protocol;
use crate::transports::tcp_base_listen::UpgradeModeEnum;
let report_task = async move {
if let Err(err) = event_sender
.send(SessionEvent::ListenError {
address,
error: TransportErrorKind::Io(io_err),
})
.await
{
error!("Listen address result send back error: {:?}", err);
match mode {
None => {
if let Err(err) = event_sender
.send(SessionEvent::ListenError {
address,
error: TransportErrorKind::Io(io_err),
})
.await
{
error!("Listen address result send back error: {:?}", err);
}
}
Some(UpgradeModeEnum::OnlyTcp) => {
if let Err(err) = event_sender
.send(SessionEvent::ListenError {
address,
error: TransportErrorKind::Io(io_err),
})
.await
{
error!("Listen address result send back error: {:?}", err);
}
}
#[cfg(feature = "ws")]
Some(UpgradeModeEnum::OnlyWs) => {
if let Err(err) = event_sender
.send(SessionEvent::ListenError {
address,
error: TransportErrorKind::Io(io_err),
})
.await
{
error!("Listen address result send back error: {:?}", err);
}
}
#[cfg(feature = "tls")]
Some(UpgradeModeEnum::OnlyTls) => {
let clear_addr = address
.into_iter()
.map(|p| {
if let Protocol::Tls(_) = p {
Protocol::Tls(Default::default())
} else {
p
}
})
.collect::<Multiaddr>();
if let Err(err) = event_sender
.send(SessionEvent::ListenError {
address: clear_addr,
error: TransportErrorKind::Io(io_err),
})
.await
{
error!("Listen address result send back error: {:?}", err);
}
}
#[cfg(feature = "tls")]
Some(UpgradeModeEnum::TcpAndTls) => {
let base_net: Multiaddr = address
.iter()
.filter_map(|p| {
if matches!(p, Protocol::Tls(_)) {
None
} else {
Some(p)
}
})
.collect();
let mut tls_net = base_net.clone();
tls_net.push(Protocol::Tls(Default::default()));
if let Err(err) = event_sender
.send(SessionEvent::ListenError {
address: base_net,
error: TransportErrorKind::Io(std::io::Error::new(
io_err.kind(),
io_err.to_string(),
)),
})
.await
{
error!("Listen address result send back error: {:?}", err);
}
if let Err(err) = event_sender
.send(SessionEvent::ListenError {
address: tls_net,
error: TransportErrorKind::Io(io_err),
})
.await
{
error!("Listen address result send back error: {:?}", err);
}
}
#[cfg(feature = "ws")]
Some(UpgradeModeEnum::TcpAndWs) => {
let base_net: Multiaddr = address
.iter()
.filter_map(|p| {
if matches!(p, Protocol::Ws) {
None
} else {
Some(p)
}
})
.collect();
let mut ws_net = base_net.clone();
ws_net.push(Protocol::Ws);
if let Err(err) = event_sender
.send(SessionEvent::ListenError {
address: base_net,
error: TransportErrorKind::Io(std::io::Error::new(
io_err.kind(),
io_err.to_string(),
)),
})
.await
{
error!("Listen address result send back error: {:?}", err);
}
if let Err(err) = event_sender
.send(SessionEvent::ListenError {
address: ws_net,
error: TransportErrorKind::Io(io_err),
})
.await
{
error!("Listen address result send back error: {:?}", err);
}
}
#[cfg(all(feature = "ws", feature = "tls"))]
Some(UpgradeModeEnum::All) => {
let base_net: Multiaddr = address
.iter()
.filter_map(|p| {
if matches!(p, Protocol::Ws | Protocol::Tls(_)) {
None
} else {
Some(p)
}
})
.collect();
let mut ws_net = base_net.clone();
let mut tls_net = base_net.clone();
ws_net.push(Protocol::Ws);
tls_net.push(Protocol::Tls(Default::default()));
if let Err(err) = event_sender
.send(SessionEvent::ListenError {
address: base_net,
error: TransportErrorKind::Io(std::io::Error::new(
io_err.kind(),
io_err.to_string(),
)),
})
.await
{
error!("Listen address result send back error: {:?}", err);
}
if let Err(err) = event_sender
.send(SessionEvent::ListenError {
address: ws_net,
error: TransportErrorKind::Io(std::io::Error::new(
io_err.kind(),
io_err.to_string(),
)),
})
.await
{
error!("Listen address result send back error: {:?}", err);
}
if let Err(err) = event_sender
.send(SessionEvent::ListenError {
address: tls_net,
error: TransportErrorKind::Io(io_err),
})
.await
{
error!("Listen address result send back error: {:?}", err);
}
}
}
};
crate::runtime::spawn(async move {
Expand Down
2 changes: 1 addition & 1 deletion tentacle/src/transports/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ mod onion;
#[cfg(not(target_family = "wasm"))]
mod tcp;
#[cfg(not(target_family = "wasm"))]
mod tcp_base_listen;
pub(crate) mod tcp_base_listen;
#[cfg(all(feature = "tls", not(target_family = "wasm")))]
mod tls;
#[cfg(all(feature = "ws", not(target_family = "wasm")))]
Expand Down