多级代理

tickbh · Jan 25, 2024 · a7aa354 · a7aa354
1 parent fb90973
commit a7aa354
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/control/server.rs b/src/control/server.rs
@@ -168,9 +168,11 @@ impl ControlServer {
             log::info!("控制端口绑定：{:?}，提供中控功能。", value.control);
             match TcpListener::bind(value.control).await {
                 Ok(tcp) =>tcp,
-                Err(e) => {
+                Err(_) => {
                     log::info!("控制端口绑定失败：{}，请配置不同端口。",value.control);
-                    return Err(e.into());
+                    let pending = std::future::pending();
+                    let () = pending.await;
+                    return Ok(());
                 }
             }
         };

diff --git a/src/option.rs b/src/option.rs
@@ -203,6 +203,8 @@ fn default_bind_addr() -> SocketAddr {
 pub struct ProxyConfig {
     /// 代理id
     #[bpaf(
+        fallback(0),
+        display_fallback,
         short('s'),
         long
     )]

diff --git a/src/wmcore.rs b/src/wmcore.rs
@@ -274,7 +274,7 @@ impl WMCore {
                     };
                 }
                 Some((inbound, addr)) = Self::tcp_listen_work(&self.client_listener) => {
-                    log::trace!("代理收到客户端连接: {}->{}", addr, self.center_listener.as_ref().unwrap().local_addr()?);
+                    log::trace!("代理收到客户端连接: {}->{}", addr, self.client_listener.as_ref().unwrap().local_addr()?);
                     let _ = self.deal_client_stream(inbound, addr).await;
                 }
                 Some((inbound, addr)) = Self::tcp_listen_work(&self.map_http_listener) => {