diff options
| author | George Kadianakis <desnacked@gmail.com> | 2011-06-22 23:28:11 +0200 |
|---|---|---|
| committer | George Kadianakis <desnacked@gmail.com> | 2011-06-22 23:28:11 +0200 |
| commit | 1fe8bee6562956e1725f8c4feaac32c8e21b84b3 (patch) | |
| tree | 194038be7a1ceb558e890140dcfc84b5262e2918 /src/or/circuitbuild.h | |
| parent | 5a05deb574a7178e752ce22d754d0d6fc1fa2141 (diff) | |
| download | tor-1fe8bee6562956e1725f8c4feaac32c8e21b84b3.tar tor-1fe8bee6562956e1725f8c4feaac32c8e21b84b3.tar.gz | |
Revised how we handle ClientTransportPlugin and Bridge lines.
Multiple Bridge lines can point to the same one ClientTransportPlugin
line, and we can have multiple ClientTransportPlugin lines in our
configuration file that don't match with a bridge. We also issue a
warning when we have a Bridge line with a pluggable transport but we
can't match it to a ClientTransportPlugin line.
Diffstat (limited to 'src/or/circuitbuild.h')
| -rw-r--r-- | src/or/circuitbuild.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index 83eb7ba2e..71ea6080e 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -142,8 +142,9 @@ int circuit_build_times_get_bw_scale(networkstatus_t *ns); void clear_transport_list(void); int transport_add_from_config(const tor_addr_t *addr, uint16_t port, const char *name, int socks_ver); -transport_t * -find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port); +int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, + transport_t **transport); +void validate_pluggable_transports_config(void); #endif |