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

refactored

Browse Source
This commit is contained in:
open-trade 2020-03-10 00:24:07 +08:00
parent 69f60499db
commit af2ccf86c6
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hbb_common

@ -1 +1 @@
Subproject commit 4a2f7f1edd9f0e49018ea4989ed8b7c3adffd50b Subproject commit 7814ff3a395bf063300317f28644b92712d501e4

21
src/rendezvous_server.rs
View File

@ -1,6 +1,6 @@
use hbb_common::{ use hbb_common::{
bytes::BytesMut, log, message_proto::*, protobuf::parse_from_bytes, tokio::net::UdpSocket, bytes::BytesMut, log, message_proto::*, protobuf::parse_from_bytes, udp::FramedSocket,
udp::FramedSocket, AddrMangle, ResultType, AddrMangle, ResultType,
}; };
use std::{collections::HashMap, net::SocketAddr}; use std::{collections::HashMap, net::SocketAddr};
@ -16,8 +16,7 @@ pub struct RendezvousServer {
impl RendezvousServer { impl RendezvousServer {
pub async fn start(addr: &str) -> ResultType<()> { pub async fn start(addr: &str) -> ResultType<()> {
let socket = UdpSocket::bind(addr).await?; let mut socket = FramedSocket::new(addr).await?;
let mut socket = FramedSocket::new(socket);
let mut rs = Self { let mut rs = Self {
peer_map: PeerMap::new(), peer_map: PeerMap::new(),
}; };
@ -87,8 +86,8 @@ mod tests {
#[tokio::main] #[tokio::main]
async fn test_rs_async() { async fn test_rs_async() {
let mut port_server: u16 = 0; let mut port_server: u16 = 0;
let socket = UdpSocket::bind("127.0.0.1:0").await.unwrap(); let socket = FramedSocket::new("127.0.0.1:0").await.unwrap();
if let SocketAddr::V4(addr) = socket.local_addr().unwrap() { if let SocketAddr::V4(addr) = socket.get_ref().local_addr().unwrap() {
port_server = addr.port(); port_server = addr.port();
} }
drop(socket); drop(socket);
@ -101,9 +100,8 @@ mod tests {
async fn punch_hole(addr_server: SocketAddr) -> ResultType<()> { async fn punch_hole(addr_server: SocketAddr) -> ResultType<()> {
// B register it to server // B register it to server
let socket_b = UdpSocket::bind("127.0.0.1:0").await?; let mut socket_b = FramedSocket::new("127.0.0.1:0").await?;
let local_addr_b = socket_b.local_addr().unwrap(); let local_addr_b = socket_b.get_ref().local_addr().unwrap();
let mut socket_b = FramedSocket::new(socket_b);
let mut msg_out = Message::new(); let mut msg_out = Message::new();
msg_out.set_register_peer(RegisterPeer { msg_out.set_register_peer(RegisterPeer {
hbb_addr: "123".to_string(), hbb_addr: "123".to_string(),
@ -112,9 +110,8 @@ mod tests {
socket_b.send(&msg_out, addr_server).await?; socket_b.send(&msg_out, addr_server).await?;
// A send punch request to server // A send punch request to server
let socket_a = UdpSocket::bind("127.0.0.1:0").await?; let mut socket_a = FramedSocket::new("127.0.0.1:0").await?;
let local_addr_a = socket_a.local_addr().unwrap(); let local_addr_a = socket_a.get_ref().local_addr().unwrap();
let mut socket_a = FramedSocket::new(socket_a);
msg_out.set_punch_hole_request(PunchHoleRequest { msg_out.set_punch_hole_request(PunchHoleRequest {
hbb_addr: "123".to_string(), hbb_addr: "123".to_string(),
..Default::default() ..Default::default()