aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/channel.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-07-14 14:26:24 -0400
committerNick Mathewson <nickm@torproject.org>2020-07-16 09:02:10 -0400
commit4f4785a8c113806d00c6a31154956edb86c1639f (patch)
treea4f33dada8ef81fd7b1942da72fe86882f233898 /src/core/or/channel.h
parentf9aafcd64e69d602eb4284e530fe9b8973cf7406 (diff)
downloadtor-4f4785a8c113806d00c6a31154956edb86c1639f.tar.gz
tor-4f4785a8c113806d00c6a31154956edb86c1639f.zip
Refactor channel description internals.
Now that we've clarified that these functions only need to describe the peer in a human-readable way, we can have them delegate to connection_describe_peer().
Diffstat (limited to 'src/core/or/channel.h')
-rw-r--r--src/core/or/channel.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/or/channel.h b/src/core/or/channel.h
index f047d24f66..917941a0b6 100644
--- a/src/core/or/channel.h
+++ b/src/core/or/channel.h
@@ -336,13 +336,11 @@ struct channel_t {
int (*get_remote_addr)(const channel_t *, tor_addr_t *);
int (*get_transport_name)(channel_t *chan, char **transport_out);
-#define GRD_FLAG_ORIGINAL 1
/**
- * 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.
+ * Get a human-readable text description of the remote endpoint, for
+ * logging.
*/
- const char * (*get_remote_descr)(channel_t *, int);
+ const char * (*describe_peer)(const channel_t *);
/** Check if the lower layer has queued writes */
int (*has_queued_writes)(channel_t *);
/**