Make connection_or_connect() mockable

This commit is contained in:
Andrea Shepard 2014-01-23 04:54:44 -08:00
parent 3bc7108d2c
commit 3b080230e9
2 changed files with 8 additions and 7 deletions

View File

@ -1174,10 +1174,10 @@ connection_or_notify_error(or_connection_t *conn,
* *
* Return the launched conn, or NULL if it failed. * Return the launched conn, or NULL if it failed.
*/ */
or_connection_t *
connection_or_connect(const tor_addr_t *_addr, uint16_t port, MOCK_IMPL(or_connection_t *,
const char *id_digest, connection_or_connect, (const tor_addr_t *_addr, uint16_t port,
channel_tls_t *chan) const char *id_digest, channel_tls_t *chan))
{ {
or_connection_t *conn; or_connection_t *conn;
const or_options_t *options = get_options(); const or_options_t *options = get_options();

View File

@ -37,9 +37,10 @@ void connection_or_connect_failed(or_connection_t *conn,
int reason, const char *msg); int reason, const char *msg);
void connection_or_notify_error(or_connection_t *conn, void connection_or_notify_error(or_connection_t *conn,
int reason, const char *msg); int reason, const char *msg);
or_connection_t *connection_or_connect(const tor_addr_t *addr, uint16_t port, MOCK_DECL(or_connection_t *,
const char *id_digest, connection_or_connect,
channel_tls_t *chan); (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_normally(or_connection_t *orconn, int flush);
void connection_or_close_for_error(or_connection_t *orconn, int flush); void connection_or_close_for_error(or_connection_t *orconn, int flush);