rustdesk/hbb_common
1
0
Fork 0
mirror of https://github.com/rustdesk/hbb_common.git synced 2026-02-16 10:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[enhance] websocket

Browse Source
This commit is contained in:
YinMo19
2025-04-17 11:42:58 +08:00
parent 81b932b7bf
commit c156d2eef7
4 changed files with 261 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/socket_client.rs
View File

@@ -2,7 +2,7 @@ use crate::{
config::{Config, NetworkType},
tcp::FramedStream,
udp::FramedSocket,
ResultType,
websocket, ResultType,
};
use anyhow::Context;
use std::net::SocketAddr;
@@ -102,7 +102,7 @@ pub async fn connect_tcp<
>(
target: T,
ms_timeout: u64,
) -> ResultType<FramedStream> {
) -> ResultType<crate::Stream> {
connect_tcp_local(target, None, ms_timeout).await
}
@@ -113,19 +113,27 @@ pub async fn connect_tcp_local<
target: T,
local: Option<SocketAddr>,
ms_timeout: u64,
) -> ResultType<FramedStream> {
if let Some(conf) = Config::get_socks() {
return FramedStream::connect(target, local, &conf, ms_timeout).await;
) -> ResultType<crate::Stream> {
#[cfg(feature = "websocket")]
{
let url = format!("ws://{}", target);
websocket::WsFramedStream::new(url, local, None, ms_timeout).await
}
if let Some(target) = target.resolve() {
if let Some(local) = local {
if local.is_ipv6() && target.is_ipv4() {
let target = query_nip_io(target).await?;
return FramedStream::new(target, Some(local), ms_timeout).await;
#[cfg(not(feature = "websocket"))]
{
if let Some(conf) = Config::get_socks() {
return tcp::FramedStream::connect(target, local, &conf, ms_timeout).await;
}
if let Some(target) = target.resolve() {
if let Some(local) = local {
if local.is_ipv6() && target.is_ipv4() {
let target = query_nip_io(target).await?;
return tcp::FramedStream::new(target, Some(local), ms_timeout).await;
}
}
}
tcp::FramedStream::new(target, local, ms_timeout).await
}
FramedStream::new(target, local, ms_timeout).await
}
#[inline]