diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-07-14 14:08:55 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-07-16 09:02:10 -0400 |
commit | db21e91f4bda5860dea2d817c1f707f57119abee (patch) | |
tree | 87c80d62b2579d3eea5c41143cac8de61ad39e7d /src/core/or/channel.h | |
parent | 0ccdf05dc54bf956348b0647414732b6a497d17a (diff) | |
download | tor-db21e91f4bda5860dea2d817c1f707f57119abee.tar.gz tor-db21e91f4bda5860dea2d817c1f707f57119abee.zip |
Remove "ADDR_ONLY" mode from channel_get_*_remote_descr.
This mode was only used in one place, and it caused a dangerous
mingling of functionality. The method is supposed to _describe_ the
peer's address, not give its actual address. We already had a
function to get the actual address.
Diffstat (limited to 'src/core/or/channel.h')
-rw-r--r-- | src/core/or/channel.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/or/channel.h b/src/core/or/channel.h index 9aa59da2cb..f047d24f66 100644 --- a/src/core/or/channel.h +++ b/src/core/or/channel.h @@ -337,12 +337,10 @@ struct channel_t { int (*get_transport_name)(channel_t *chan, char **transport_out); #define GRD_FLAG_ORIGINAL 1 -#define GRD_FLAG_ADDR_ONLY 2 /** * Get a text description of the remote endpoint; canonicalized if the flag * GRD_FLAG_ORIGINAL is not set, or the one we originally connected - * to/received from if it is. If GRD_FLAG_ADDR_ONLY is set, we return only - * the original address. + * to/received from if it is. */ const char * (*get_remote_descr)(channel_t *, int); /** Check if the lower layer has queued writes */ @@ -723,7 +721,6 @@ const char * channel_describe_transport(channel_t *chan); 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); MOCK_DECL(int, channel_get_addr_if_possible, (const channel_t *chan, tor_addr_t *addr_out)); MOCK_DECL(const char *, channel_get_canonical_remote_descr,(channel_t *chan)); |