diff options
author | Andrea Shepard <andrea@torproject.org> | 2014-01-23 04:54:44 -0800 |
---|---|---|
committer | Andrea Shepard <andrea@torproject.org> | 2014-09-30 23:14:24 -0700 |
commit | 3b080230e9fda4befda17739d202b9bc59006add (patch) | |
tree | 32cb90e0844b919b4fdafd3dba8bbb26619bba9c | |
parent | 3bc7108d2cfb6795f1beb0f5dbb3ab66fe1601d3 (diff) | |
download | tor-3b080230e9fda4befda17739d202b9bc59006add.tar.gz tor-3b080230e9fda4befda17739d202b9bc59006add.zip |
Make connection_or_connect() mockable
-rw-r--r-- | src/or/connection_or.c | 8 | ||||
-rw-r--r-- | src/or/connection_or.h | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 445335b43a..52f417d9dd 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1174,10 +1174,10 @@ connection_or_notify_error(or_connection_t *conn, * * Return the launched conn, or NULL if it failed. */ -or_connection_t * -connection_or_connect(const tor_addr_t *_addr, uint16_t port, - const char *id_digest, - channel_tls_t *chan) + +MOCK_IMPL(or_connection_t *, +connection_or_connect, (const tor_addr_t *_addr, uint16_t port, + const char *id_digest, channel_tls_t *chan)) { or_connection_t *conn; const or_options_t *options = get_options(); diff --git a/src/or/connection_or.h b/src/or/connection_or.h index 7b46d7d111..c922fb5d52 100644 --- a/src/or/connection_or.h +++ b/src/or/connection_or.h @@ -37,9 +37,10 @@ void connection_or_connect_failed(or_connection_t *conn, int reason, const char *msg); void connection_or_notify_error(or_connection_t *conn, int reason, const char *msg); -or_connection_t *connection_or_connect(const tor_addr_t *addr, uint16_t port, - const char *id_digest, - channel_tls_t *chan); +MOCK_DECL(or_connection_t *, + connection_or_connect, + (const tor_addr_t *addr, uint16_t port, + const char *id_digest, channel_tls_t *chan)); void connection_or_close_normally(or_connection_t *orconn, int flush); void connection_or_close_for_error(or_connection_t *orconn, int flush); |