Skip to content

Commit 7594841

Browse files
committed
update tentacle
Signed-off-by: Eval EXEC <[email protected]>
1 parent 133e6ea commit 7594841

File tree

2 files changed

+30
-139
lines changed

2 files changed

+30
-139
lines changed

Cargo.lock

Lines changed: 19 additions & 131 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

network/src/network.rs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,13 +1035,14 @@ impl NetworkService {
10351035
}
10361036
let proxy_config_enable =
10371037
config.proxy.proxy_url.is_some() || config.onion.onion_server.is_some();
1038-
service_builder =
1039-
service_builder.tcp_proxy_config(config.proxy.proxy_url.clone());
1040-
info!(
1041-
"listen_addresse: {:?}, set tcp_proxy_config: {:?}",
1042-
multi_addr,
1043-
config.proxy.proxy_url.clone(),
1044-
);
1038+
if let Some(proxy_url) = &config.proxy.proxy_url {
1039+
service_builder = service_builder.tcp_proxy_config(proxy_url.to_owned());
1040+
info!(
1041+
"listen_addresse: {:?}, set tcp_proxy_config: {:?}",
1042+
multi_addr,
1043+
config.proxy.proxy_url.clone(),
1044+
);
1045+
};
10451046

10461047
let onion_proxy_url = {
10471048
config.onion.onion_server.clone().map(|onion_server| {
@@ -1052,13 +1053,15 @@ impl NetworkService {
10521053
}
10531054
})
10541055
};
1055-
service_builder = service_builder.tcp_onion_config(onion_proxy_url.clone());
10561056
service_builder = service_builder
10571057
.tcp_onion_random_socks_auth(config.onion.onion_socks_random_auth);
10581058
info!(
10591059
"listen_addresse: {:?}, set tcp_onion_config: {:?}",
10601060
multi_addr, onion_proxy_url
10611061
);
1062+
if let Some(onion_proxy_url) = onion_proxy_url {
1063+
service_builder = service_builder.tcp_onion_config(onion_proxy_url.clone());
1064+
}
10621065

10631066
match find_type(multi_addr) {
10641067
TransportType::Tcp => {

0 commit comments

Comments
 (0)