rustdesk/rustdesk-server
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk-server.git synced 2025-08-16 16:35:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix command line buffer and test addr

Browse Source
This commit is contained in:
rustdesk 2023-03-16 00:53:58 +08:00
parent dc81956d42
commit 675bf3c1f5
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/relay_server.rs
View File

@ -379,7 +379,7 @@ async fn handle_connection(
let limiter = limiter.clone(); let limiter = limiter.clone();
tokio::spawn(async move { tokio::spawn(async move {
let mut stream = stream; let mut stream = stream;
let mut buffer = [0; 64]; let mut buffer = [0; 1024];
if let Ok(Ok(n)) = timeout(1000, stream.read(&mut buffer[..])).await { if let Ok(Ok(n)) = timeout(1000, stream.read(&mut buffer[..])).await {
if let Ok(data) = std::str::from_utf8(&buffer[..n]) { if let Ok(data) = std::str::from_utf8(&buffer[..n]) {
let res = check_cmd(data, limiter).await; let res = check_cmd(data, limiter).await;

17
src/rendezvous_server.rs
View File

@ -38,7 +38,6 @@ use std::{
sync::Arc, sync::Arc,
time::Instant, time::Instant,
}; };
const ADDR_127: IpAddr = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
enum Data { enum Data {
@ -93,7 +92,6 @@ impl RendezvousServer {
#[tokio::main(flavor = "multi_thread")] #[tokio::main(flavor = "multi_thread")]
pub async fn start(port: i32, serial: i32, key: &str, rmem: usize) -> ResultType<()> { pub async fn start(port: i32, serial: i32, key: &str, rmem: usize) -> ResultType<()> {
let (key, sk) = Self::get_server_sk(key); let (key, sk) = Self::get_server_sk(key);
let addr = format!("0.0.0.0:{port}");
let nat_port = port - 1; let nat_port = port - 1;
let ws_port = port + 2; let ws_port = port + 2;
let pm = PeerMap::new().await?; let pm = PeerMap::new().await?;
@ -162,12 +160,11 @@ impl RendezvousServer {
} }
); );
if test_addr.to_lowercase() != "no" { if test_addr.to_lowercase() != "no" {
let test_addr = (if test_addr.is_empty() { let test_addr = if test_addr.is_empty() {
addr.replace("0.0.0.0", "127.0.0.1") listener.local_addr()?
} else { } else {
test_addr test_addr.parse()?
}) };
.parse::<SocketAddr>()?;
tokio::spawn(async move { tokio::spawn(async move {
allow_err!(test_hbbs(test_addr).await); allow_err!(test_hbbs(test_addr).await);
}); });
@ -427,7 +424,7 @@ impl RendezvousServer {
self.handle_local_addr(la, addr, Some(socket)).await?; self.handle_local_addr(la, addr, Some(socket)).await?;
} }
Some(rendezvous_message::Union::ConfigureUpdate(mut cu)) => { Some(rendezvous_message::Union::ConfigureUpdate(mut cu)) => {
if addr.ip() == ADDR_127 && cu.serial > self.inner.serial { if addr.ip().is_loopback() && cu.serial > self.inner.serial {
let mut inner: Inner = (*self.inner).clone(); let mut inner: Inner = (*self.inner).clone();
inner.serial = cu.serial; inner.serial = cu.serial;
self.inner = Arc::new(inner); self.inner = Arc::new(inner);
@ -566,7 +563,7 @@ impl RendezvousServer {
ip != old.socket_addr.ip() ip != old.socket_addr.ip()
} else { } else {
ip.to_string() != old.info.ip ip.to_string() != old.info.ip
} && ip != ADDR_127; } && !ip.is_loopback();
let request_pk = old.pk.is_empty() || ip_change; let request_pk = old.pk.is_empty() || ip_change;
if !request_pk { if !request_pk {
old.socket_addr = socket_addr; old.socket_addr = socket_addr;
@ -1053,7 +1050,7 @@ impl RendezvousServer {
if addr.ip().is_loopback() { if addr.ip().is_loopback() {
tokio::spawn(async move { tokio::spawn(async move {
let mut stream = stream; let mut stream = stream;
let mut buffer = [0; 64]; let mut buffer = [0; 1024];
if let Ok(Ok(n)) = timeout(1000, stream.read(&mut buffer[..])).await { if let Ok(Ok(n)) = timeout(1000, stream.read(&mut buffer[..])).await {
if let Ok(data) = std::str::from_utf8(&buffer[..n]) { if let Ok(data) = std::str::from_utf8(&buffer[..n]) {
let res = rs.check_cmd(data).await; let res = rs.check_cmd(data).await;