From 47d2937c4537010f9f5cf3b64de11a43758a3750 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sat, 27 Aug 2022 00:33:22 +0800 Subject: [PATCH] feat: update client&server --- src/client.rs | 6 +----- src/server.rs | 7 +++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/client.rs b/src/client.rs index 5810b7f..9502221 100644 --- a/src/client.rs +++ b/src/client.rs @@ -106,10 +106,7 @@ pub async fn run(listen_config: &ListenConfig) -> XResult<()> { } } -fn make_client_endpoint( - bind_addr: SocketAddr, - server_certs: &[&[u8]], -) -> Result> { +fn make_client_endpoint(bind_addr: SocketAddr, server_certs: &[&[u8]]) -> Result> { let client_cfg = configure_client(server_certs)?; let mut endpoint = Endpoint::client(bind_addr)?; endpoint.set_default_client_config(client_cfg); @@ -121,6 +118,5 @@ fn configure_client(server_certs: &[&[u8]]) -> Result XResult<()> { let cert_chain = vec![rustls::Certificate(cert_bytes)]; let mut server_config = opt_result!(ServerConfig::with_single_cert(cert_chain, priv_key), "Create server config failed: {}"); - Arc::get_mut(&mut server_config.transport) - .unwrap() + Arc::get_mut(&mut server_config.transport).unwrap() .max_concurrent_uni_streams(0_u8.into()); information!("Listen: {}", &listen_config.listen); let listen_addr: SocketAddr = opt_result!(listen_config.listen.parse(), "Parse listen address: {} failed: {}", &listen_config.listen); @@ -45,7 +44,7 @@ pub async fn run(listen_config: &ListenConfig) -> XResult<()> { let connection = match connection.await { Ok(connection) => connection, Err(e) => { - warning!("Create connection failed: {}", e); + warning!("Create connection failed: {:?}", e); sleep(Duration::from_secs(3)).await; continue; } @@ -67,7 +66,7 @@ pub async fn run(listen_config: &ListenConfig) -> XResult<()> { break; } Some(Err(e)) => { - information!("Connection ended: {}", e); + information!("Connection ended: {:?}", e); break; } Some(Ok((send, recv))) => {