diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-02 13:38:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-02 15:38:00 -0400 |
| commit | da908a593fded0c4774c6cdfb6b5e51c87f65d88 (patch) | |
| tree | 4bce2b353cc03c648403170b213e84b573864f37 /src/or/relay.c | |
| parent | 4215c801ffc11f19949be3da2d46158664f0bf97 (diff) | |
| download | tor-da908a593fded0c4774c6cdfb6b5e51c87f65d88.tar.gz tor-da908a593fded0c4774c6cdfb6b5e51c87f65d88.zip | |
Unit tests for connection_edge_process_resolved_cell
Also rename a function to be more accurate (resolve->resolved)
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index ed24397f59..f8b0deedb9 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1121,10 +1121,10 @@ resolved_cell_parse(const cell_t *cell, const relay_header_t *rh, /** Helper for connection_edge_process_resolved_cell: given an error code, * an entry_connection, and a list of address_ttl_t *, report the best answer * to the entry_connection. */ -STATIC void -connection_ap_handshake_socks_got_resolve_cell(entry_connection_t *conn, - int error_code, - smartlist_t *results) +static void +connection_ap_handshake_socks_got_resolved_cell(entry_connection_t *conn, + int error_code, + smartlist_t *results) { address_ttl_t *addr_ipv4 = NULL; address_ttl_t *addr_ipv6 = NULL; @@ -1195,7 +1195,7 @@ connection_ap_handshake_socks_got_resolve_cell(entry_connection_t *conn, /** Handle a RELAY_COMMAND_RESOLVED cell that we received on a non-open AP * stream. */ -static int +STATIC int connection_edge_process_resolved_cell(edge_connection_t *conn, const cell_t *cell, const relay_header_t *rh) @@ -1242,9 +1242,9 @@ connection_edge_process_resolved_cell(edge_connection_t *conn, } } - connection_ap_handshake_socks_got_resolve_cell(entry_conn, - errcode, - resolved_addresses); + connection_ap_handshake_socks_got_resolved_cell(entry_conn, + errcode, + resolved_addresses); connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_DONE | |