summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2020-12-08 10:01:23 -0500
committerAlexander Færøy <ahf@torproject.org>2020-12-16 20:37:57 +0000
commitee6ad0e592c9b6239066697ae8aff83136edc2ed (patch)
tree0f5bdf6971eefbb498f66b47676132046601d675 /src/app
parentc618c4f27986825df2026fb22b8ee222edd1afa1 (diff)
downloadtor-ee6ad0e592c9b6239066697ae8aff83136edc2ed.tar.gz
tor-ee6ad0e592c9b6239066697ae8aff83136edc2ed.zip
config: Catch missing Bridge for ClientTransportPlugin
When making sure we have a Bridge line with a ClientTransportPlugin, we now check in the managed proxy list and so we can catch any missing ClientTransportPlugin for a Bridge line. Fixes #40106 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/app')
-rw-r--r--src/app/config/config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 79b67e7a90..d8bc5f6025 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -2198,7 +2198,8 @@ options_act,(const or_options_t *old_options))
* validation time. */
SMARTLIST_FOREACH_BEGIN(bridge_list_get(), const bridge_info_t *, bi) {
const char *bi_transport_name = bridget_get_transport_name(bi);
- if (bi_transport_name && !transport_get_by_name(bi_transport_name)) {
+ if (bi_transport_name && (!transport_get_by_name(bi_transport_name) &&
+ !managed_proxy_has_transport(bi_transport_name))) {
log_warn(LD_CONFIG, "Bridge line with transport %s is missing a "
"ClientTransportPlugin line", bi_transport_name);
return -1;