diff options
author | Nick Mathewson <nickm@torproject.org> | 2021-01-21 13:19:49 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2021-01-21 13:19:49 -0500 |
commit | 2243fc3ad1bb33ca5f4a37952bb474d8314d5325 (patch) | |
tree | 92a41ba6c4b83e0256c079ba3b043eba02fe1c85 /src/app | |
parent | 8a2786072008f18ccd5bace4f014057d06345af0 (diff) | |
parent | 71fd30b75ad028dfce69563792547f06fdf9d3c2 (diff) | |
download | tor-2243fc3ad1bb33ca5f4a37952bb474d8314d5325.tar.gz tor-2243fc3ad1bb33ca5f4a37952bb474d8314d5325.zip |
Merge branch 'maint-0.4.5'
Diffstat (limited to 'src/app')
-rw-r--r-- | src/app/config/config.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 4c0c57af47..b5be148895 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2189,23 +2189,6 @@ options_act,(const or_options_t *old_options)) } } - /* Validate that we actually have a configured transport for a Bridge line - * that has one. This is done here because we require the bridge and - * transport to be added to the global list before doing the validation. - * - * In an ideal world, pt_parse_transport_line() would actually return a - * transport_t object so we could inspect it and thus do this step at - * 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) && - !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; - } - } SMARTLIST_FOREACH_END(bi); - if (options_act_server_transport(old_options) < 0) return -1; |