diff options
Diffstat (limited to 'src/or/circuitbuild.h')
| -rw-r--r-- | src/or/circuitbuild.h | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index b1eb5a6cad..eb6fdbaf3f 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -12,6 +12,22 @@ #ifndef _TOR_CIRCUITBUILD_H #define _TOR_CIRCUITBUILD_H +/** + Represents a pluggable transport proxy used by a bridge. */ +typedef struct { + /* SOCKS version */ + int socks_version; + + /* Name of pluggable transport protocol */ + char *name; + + /* Address of proxy */ + tor_addr_t addr; + + /* Port of proxy */ + uint16_t port; +} transport_info_t; + char *circuit_list_path(origin_circuit_t *circ, int verbose); char *circuit_list_path_for_controller(origin_circuit_t *circ); void circuit_log_path(int severity, unsigned int domain, @@ -70,7 +86,8 @@ int node_is_a_configured_bridge(const node_t *node); void learned_router_identity(const tor_addr_t *addr, uint16_t port, const char *digest); void bridge_add_from_config(const tor_addr_t *addr, uint16_t port, - const char *digest); + const char *digest, + const char *transport_name); void retry_bridge_descriptor_fetch_directly(const char *digest); void fetch_bridge_descriptors(or_options_t *options, time_t now); void learned_bridge_descriptor(routerinfo_t *ri, int from_cache); @@ -126,5 +143,10 @@ void circuit_build_times_network_circ_success(circuit_build_times_t *cbt); int circuit_build_times_get_bw_scale(networkstatus_t *ns); + +void clear_transport_list(void); +int match_bridges_with_transports(void); +void transport_add_from_config(const tor_addr_t *addr, uint16_t port, + const char *name, int socks_ver); #endif |