hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
open-trade 2022-01-05 15:09:36 +08:00
parent 78097f4006
commit 5631ffac4c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/hbb_common/src/udp.rs
View File

@ -66,8 +66,8 @@ impl FramedSocket {
.await?? .await??
}; };
log::trace!( log::trace!(
"Socks5 udp connected, local addr: {}, target addr: {}", "Socks5 udp connected, local addr: {:?}, target addr: {}",
framed.local_addr().unwrap(), framed.local_addr(),
framed.socks_addr() framed.socks_addr()
); );
Ok(Self::ProxySocks(framed)) Ok(Self::ProxySocks(framed))
@ -80,7 +80,7 @@ impl FramedSocket {
addr: impl IntoTargetAddr<'_>, addr: impl IntoTargetAddr<'_>,
) -> ResultType<()> { ) -> ResultType<()> {
let addr = addr.into_target_addr()?.to_owned(); let addr = addr.into_target_addr()?.to_owned();
let send_data = Bytes::from(msg.write_to_bytes().unwrap()); let send_data = Bytes::from(msg.write_to_bytes()?);
let _ = match self { let _ = match self {
Self::Direct(f) => match addr { Self::Direct(f) => match addr {
TargetAddr::Ip(addr) => f.send((send_data, addr)).await?, TargetAddr::Ip(addr) => f.send((send_data, addr)).await?,
@ -115,7 +115,7 @@ impl FramedSocket {
match self { match self {
Self::Direct(f) => match f.next().await { Self::Direct(f) => match f.next().await {
Some(Ok((data, addr))) => { Some(Ok((data, addr))) => {
Some(Ok((data, addr.into_target_addr().unwrap().to_owned()))) Some(Ok((data, addr.into_target_addr().ok()?.to_owned())))
} }
Some(Err(e)) => Some(Err(anyhow!(e))), Some(Err(e)) => Some(Err(anyhow!(e))),
None => None, None => None,

4
src/common.rs
View File

@ -258,6 +258,8 @@ async fn test_nat_type_() -> ResultType<bool> {
}); });
let mut port1 = 0; let mut port1 = 0;
let mut port2 = 0; let mut port2 = 0;
let server1 = socket_client::get_target_addr(&server1)?;
let server2 = socket_client::get_target_addr(&server2)?;
let mut addr = Config::get_any_listen_addr(); let mut addr = Config::get_any_listen_addr();
for i in 0..2 { for i in 0..2 {
let mut socket = socket_client::connect_tcp( let mut socket = socket_client::connect_tcp(
@ -434,7 +436,7 @@ pub fn check_software_update() {
async fn _check_software_update() -> hbb_common::ResultType<()> { async fn _check_software_update() -> hbb_common::ResultType<()> {
sleep(3.).await; sleep(3.).await;
let rendezvous_server = get_rendezvous_server(1_000).await; let rendezvous_server = socket_client::get_target_addr(&get_rendezvous_server(1_000).await)?;
let mut socket = let mut socket =
socket_client::new_udp(Config::get_any_listen_addr(), RENDEZVOUS_TIMEOUT).await?; socket_client::new_udp(Config::get_any_listen_addr(), RENDEZVOUS_TIMEOUT).await?;