diff options
| author | David Goulet <dgoulet@torproject.org> | 2018-01-30 09:33:12 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2018-01-30 09:33:12 -0500 |
| commit | cd81403cc0d73d53cb7f3650b38d49c54100af25 (patch) | |
| tree | 5ea4f0c626ad082fb195a478614f67dff1a7b386 /src/or/channel.h | |
| parent | 03ab24b44cd148263cfb2b801cba35489e3852c1 (diff) | |
| parent | 9aca7d47306222f2870ec16a7291a8215d6c3316 (diff) | |
| download | tor-cd81403cc0d73d53cb7f3650b38d49c54100af25.tar.gz tor-cd81403cc0d73d53cb7f3650b38d49c54100af25.zip | |
Merge branch 'ticket24902_029_05' into ticket24902_033_02
Diffstat (limited to 'src/or/channel.h')
| -rw-r--r-- | src/or/channel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/channel.h b/src/or/channel.h index 4b60b7a7d6..9128403ce7 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -590,7 +590,8 @@ MOCK_DECL(void, channel_dump_statistics, (channel_t *chan, int severity)); void channel_dump_transport_statistics(channel_t *chan, int severity); const char * channel_get_actual_remote_descr(channel_t *chan); const char * channel_get_actual_remote_address(channel_t *chan); -int channel_get_addr_if_possible(channel_t *chan, tor_addr_t *addr_out); +MOCK_DECL(int, channel_get_addr_if_possible, (channel_t *chan, + tor_addr_t *addr_out)); const char * channel_get_canonical_remote_descr(channel_t *chan); int channel_has_queued_writes(channel_t *chan); int channel_is_bad_for_new_circs(channel_t *chan); |