rustdesk/rustdesk-server
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk-server.git synced 2025-07-01 23:35:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure_update in testnatresponse

Browse Source
This commit is contained in:
open-trade 2020-10-31 11:25:53 +08:00
parent 1acec93fdb
commit 75dcbe47b7
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.rs
View File

@ -1,3 +1,3 @@
fn main() { fn main() {
hbb_common::gen_version(); hbb_common::gen_version();
} }

2
libs/hbb_common

@ -1 +1 @@
Subproject commit be1f253e874c6df065c1d9ce22a5ab9e4ebd498a Subproject commit 3f862eaa423823b6a4c9a62e6b36f3b692cfd06f

2
src/lib.rs
View File

@ -1,6 +1,6 @@
mod rendezvous_server; mod rendezvous_server;
mod sled_async; mod sled_async;
use sled_async::*;
pub use rendezvous_server::*; pub use rendezvous_server::*;
use sled_async::*;
mod version; mod version;
pub use version::*; pub use version::*;

15
src/rendezvous_server.rs
View File

@ -7,7 +7,7 @@ use hbb_common::{
stream::{SplitSink, StreamExt}, stream::{SplitSink, StreamExt},
}, },
log, log,
protobuf::Message as _, protobuf::{Message as _, MessageField},
rendezvous_proto::*, rendezvous_proto::*,
tcp::{new_listener, FramedStream}, tcp::{new_listener, FramedStream},
timeout, timeout,
@ -236,12 +236,19 @@ impl RendezvousServer {
allow_err!(rs.handle_local_addr(la, addr, None).await); allow_err!(rs.handle_local_addr(la, addr, None).await);
break; break;
} }
Some(rendezvous_message::Union::test_nat_request(_)) => { Some(rendezvous_message::Union::test_nat_request(tar)) => {
let mut msg_out = RendezvousMessage::new(); let mut msg_out = RendezvousMessage::new();
msg_out.set_test_nat_response(TestNatResponse { let mut res = TestNatResponse {
port: addr.port() as _, port: addr.port() as _,
..Default::default() ..Default::default()
}); }
if rs.serial > tar.serial {
let mut cu = ConfigUpdate::new();
cu.serial = rs.serial;
cu.rendezvous_servers = rs.rendezvous_servers.clone();
res.cu = MessageField::from_option(Some(cu));
}
msg_out.set_test_nat_response(res);
if let Some(tcp) = sender.as_mut() { if let Some(tcp) = sender.as_mut() {
if let Ok(bytes) = msg_out.write_to_bytes() { if let Ok(bytes) = msg_out.write_to_bytes() {
allow_err!(tcp.send(Bytes::from(bytes)).await); allow_err!(tcp.send(Bytes::from(bytes)).await);