diff options
| author | George Kadianakis <desnacked@gmail.com> | 2011-09-11 23:51:29 +0200 |
|---|---|---|
| committer | George Kadianakis <desnacked@gmail.com> | 2011-09-11 23:51:29 +0200 |
| commit | d0416ce3ec67ca87448153c8b2416dd7901013c6 (patch) | |
| tree | dbc89ce65edb91bc96d4614a45d53a4a43bd01ea /src/or/circuitbuild.h | |
| parent | e8715b30411062d09832e912d87d526dc203e4f0 (diff) | |
| download | tor-d0416ce3ec67ca87448153c8b2416dd7901013c6.tar.gz tor-d0416ce3ec67ca87448153c8b2416dd7901013c6.zip | |
Don't warn of stray Bridges if managed proxies are still unconfigured.
With managed proxies you would always get the error message:
"You have a Bridge line using the X pluggable transport, but there
doesn't seem to be a corresponding ClientTransportPlugin line."
because the check happened directly after parse_client_transport_line()
when managed proxies were not fully configured and their transports
were not registered.
The fix is to move the validation to run_scheduled_events() and make
sure that all managed proxies are configured first.
Diffstat (limited to 'src/or/circuitbuild.h')
| -rw-r--r-- | src/or/circuitbuild.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index 10e72879e6..dca541d6ff 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -157,7 +157,7 @@ int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, const transport_t **transport); transport_t *transport_get_by_name(const char *name); -void validate_pluggable_transports_config(void); +int validate_pluggable_transports_config(void); #endif |