diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-10 15:32:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-10 15:32:26 -0400 |
| commit | 6bdfaa8b244ca3e10e57f6d99616af1d5f68fa67 (patch) | |
| tree | a729843d38786f76d0314e14141a359c269cbc97 /src/or/transports.c | |
| parent | 6e467a7a340cdc0267206ebaf8dca54c1a4a7b0a (diff) | |
| parent | 4178642bf83736d154176623ba8dce845a5b412c (diff) | |
| download | tor-6bdfaa8b244ca3e10e57f6d99616af1d5f68fa67.tar.gz tor-6bdfaa8b244ca3e10e57f6d99616af1d5f68fa67.zip | |
Merge remote-tracking branch 'isis-github/bug25425_squashed2'
Diffstat (limited to 'src/or/transports.c')
| -rw-r--r-- | src/or/transports.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/transports.c b/src/or/transports.c index 5cbf1ddbc1..614fc81da8 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -135,7 +135,7 @@ static smartlist_t *transport_list = NULL; /** Returns a transport_t struct for a transport proxy supporting the protocol <b>name</b> listening at <b>addr</b>:<b>port</b> using SOCKS version <b>socks_ver</b>. */ -static transport_t * +STATIC transport_t * transport_new(const tor_addr_t *addr, uint16_t port, const char *name, int socks_ver, const char *extra_info_args) @@ -222,8 +222,8 @@ transport_copy(const transport_t *transport) /** Returns the transport in our transport list that has the name <b>name</b>. * Else returns NULL. */ -transport_t * -transport_get_by_name(const char *name) +MOCK_IMPL(transport_t *, +transport_get_by_name,(const char *name)) { tor_assert(name); |