aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/channel.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-08-03 11:25:37 -0400
committerNick Mathewson <nickm@torproject.org>2020-08-03 11:25:37 -0400
commit435f31aed34e9b58d1e8d9f460e6d2e3c6714fbc (patch)
treebc0d12229d6f5928a43c5e9d8da67148ae571727 /src/core/or/channel.h
parentc4742b89b23d58958ee0d5ca324dac5948c94bf6 (diff)
downloadtor-435f31aed34e9b58d1e8d9f460e6d2e3c6714fbc.tar.gz
tor-435f31aed34e9b58d1e8d9f460e6d2e3c6714fbc.zip
Remove channel_is_canonical_is_reliable()
This function once served to let circuits continue to be built over version-1 link connections. But such connections are long-obsolete, and it's time to remove this check. Closes #40081.
Diffstat (limited to 'src/core/or/channel.h')
-rw-r--r--src/core/or/channel.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/or/channel.h b/src/core/or/channel.h
index 97aa000337..78e4d90ea5 100644
--- a/src/core/or/channel.h
+++ b/src/core/or/channel.h
@@ -351,12 +351,10 @@ struct channel_s {
/** Check if the lower layer has queued writes */
int (*has_queued_writes)(channel_t *);
/**
- * If the second param is zero, ask the lower layer if this is
- * 'canonical', for a transport-specific definition of canonical; if
- * it is 1, ask if the answer to the preceding query is safe to rely
- * on.
+ * Ask the lower layer if this is 'canonical', for a transport-specific
+ * definition of canonical.
*/
- int (*is_canonical)(channel_t *, int);
+ int (*is_canonical)(channel_t *);
/** Check if this channel matches a specified extend_info_t */
int (*matches_extend_info)(channel_t *, extend_info_t *);
/** Check if this channel matches a target address when extending */
@@ -733,7 +731,6 @@ int channel_has_queued_writes(channel_t *chan);
int channel_is_bad_for_new_circs(channel_t *chan);
void channel_mark_bad_for_new_circs(channel_t *chan);
int channel_is_canonical(channel_t *chan);
-int channel_is_canonical_is_reliable(channel_t *chan);
int channel_is_client(const channel_t *chan);
int channel_is_local(channel_t *chan);
int channel_is_incoming(channel_t *chan);