aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_edge.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-02 13:38:50 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-02 15:38:00 -0400
commitda908a593fded0c4774c6cdfb6b5e51c87f65d88 (patch)
tree4bce2b353cc03c648403170b213e84b573864f37 /src/or/connection_edge.h
parent4215c801ffc11f19949be3da2d46158664f0bf97 (diff)
downloadtor-da908a593fded0c4774c6cdfb6b5e51c87f65d88.tar
tor-da908a593fded0c4774c6cdfb6b5e51c87f65d88.tar.gz
Unit tests for connection_edge_process_resolved_cell
Also rename a function to be more accurate (resolve->resolved)
Diffstat (limited to 'src/or/connection_edge.h')
-rw-r--r--src/or/connection_edge.h24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h
index cbca31a21..3c0e30a97 100644
--- a/src/or/connection_edge.h
+++ b/src/or/connection_edge.h
@@ -17,8 +17,9 @@
#define connection_mark_unattached_ap(conn, endreason) \
connection_mark_unattached_ap_((conn), (endreason), __LINE__, SHORT_FILE__)
-void connection_mark_unattached_ap_(entry_connection_t *conn, int endreason,
- int line, const char *file);
+MOCK_DECL(void,connection_mark_unattached_ap_,
+ (entry_connection_t *conn, int endreason,
+ int line, const char *file));
int connection_edge_reached_eof(edge_connection_t *conn);
int connection_edge_process_inbuf(edge_connection_t *conn,
int package_partial);
@@ -44,16 +45,17 @@ entry_connection_t *connection_ap_make_link(connection_t *partner,
void connection_ap_handshake_socks_reply(entry_connection_t *conn, char *reply,
size_t replylen,
int endreason);
-void connection_ap_handshake_socks_resolved(entry_connection_t *conn,
- int answer_type,
- size_t answer_len,
- const uint8_t *answer,
- int ttl,
- time_t expires);
+MOCK_DECL(void,connection_ap_handshake_socks_resolved,
+ (entry_connection_t *conn,
+ int answer_type,
+ size_t answer_len,
+ const uint8_t *answer,
+ int ttl,
+ time_t expires));
void connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn,
- const tor_addr_t *answer,
- int ttl,
- time_t expires);
+ const tor_addr_t *answer,
+ int ttl,
+ time_t expires);
int connection_exit_begin_conn(cell_t *cell, circuit_t *circ);
int connection_exit_begin_resolve(cell_t *cell, or_circuit_t *circ);