diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-04 09:49:35 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-04 09:52:04 -0500 |
| commit | 9619c395ac7e2a8c2e57f55cd1885fe5f8e5f8b5 (patch) | |
| tree | 5741dcdf0bf425712470554a0dfb63cd54f4a2a1 /src/or/transports.h | |
| parent | b1ca05d273eaef7477528c059ab0d1deb0dc9dab (diff) | |
| parent | 2d4241d58482c919984f163323efb96c6f365a2d (diff) | |
| download | tor-9619c395ac7e2a8c2e57f55cd1885fe5f8e5f8b5.tar.gz tor-9619c395ac7e2a8c2e57f55cd1885fe5f8e5f8b5.zip | |
Merge remote-tracking branch 'andrea/ticket6456'
Somewhat tricky conflicts:
src/or/config.c
Also, s/test_assert/tt_assert in test_config.c
Diffstat (limited to 'src/or/transports.h')
| -rw-r--r-- | src/or/transports.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/or/transports.h b/src/or/transports.h index 6393a4e172..2958d5e187 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -32,14 +32,16 @@ typedef struct transport_t { void mark_transport_list(void); void sweep_transport_list(void); -int transport_add_from_config(const tor_addr_t *addr, uint16_t port, - const char *name, int socks_ver); +MOCK_DECL(int, transport_add_from_config, + (const tor_addr_t *addr, uint16_t port, + const char *name, int socks_ver)); void transport_free(transport_t *transport); transport_t *transport_get_by_name(const char *name); -void pt_kickstart_proxy(const smartlist_t *transport_list, char **proxy_argv, - int is_server); +MOCK_DECL(void, pt_kickstart_proxy, + (const smartlist_t *transport_list, char **proxy_argv, + int is_server)); #define pt_kickstart_client_proxy(tl, pa) \ pt_kickstart_proxy(tl, pa, 0) |