append socks5:// before onion_server

nervosnetwork · Feb 18, 2025 · 9930a65 · 9930a65
1 parent 8f58f26
commit 9930a65
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/network/src/network.rs b/network/src/network.rs
@@ -1025,9 +1025,28 @@ impl NetworkService {
                     }
                     let proxy_config_enable =
                         config.proxy.proxy_url.is_some() || config.onion.onion_server.is_some();
-                    service_builder = service_builder
-                        .tcp_proxy_config(config.proxy.proxy_url.clone())
-                        .tcp_onion_config(config.onion.onion_server.clone());
+                    service_builder =
+                        service_builder.tcp_proxy_config(config.proxy.proxy_url.clone());
+                    info!(
+                        "listen_addresse: {:?}, set tcp_proxy_config: {:?}",
+                        multi_addr,
+                        config.proxy.proxy_url.clone(),
+                    );
+
+                    let onion_proxy_url = {
+                        config.onion.onion_server.clone().map(|onion_server| {
+                            if onion_server.starts_with("socks5://") {
+                                format!("socks5://{}", onion_server)
+                            } else {
+                                onion_server
+                            }
+                        })
+                    };
+                    service_builder = service_builder.tcp_onion_config(onion_proxy_url.clone());
+                    info!(
+                        "listen_addresse: {:?}, set tcp_onion_config: {:?}",
+                        multi_addr, onion_proxy_url
+                    );
 
                     match find_type(multi_addr) {
                         TransportType::Tcp => {