diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-08-03 11:49:09 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-08-03 11:49:09 -0400 |
commit | aef9c0f5809d2978f16f08ada1f3e482bd4dbb6f (patch) | |
tree | 515da617c2ac51de39c7d143dd6cc16023319f7b /src/core/or/channel.h | |
parent | 18d2c7c5d7eb0441d891fb7642fbbabde6c53cf2 (diff) | |
parent | 435f31aed34e9b58d1e8d9f460e6d2e3c6714fbc (diff) | |
download | tor-aef9c0f5809d2978f16f08ada1f3e482bd4dbb6f.tar.gz tor-aef9c0f5809d2978f16f08ada1f3e482bd4dbb6f.zip |
Merge branch 'ticket40081_035' into ticket40081_044
Resolves conflicts:
src/core/or/channel.c
src/test/test_channel.c
Diffstat (limited to 'src/core/or/channel.h')
-rw-r--r-- | src/core/or/channel.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/or/channel.h b/src/core/or/channel.h index 4968c8714a..82d89471b4 100644 --- a/src/core/or/channel.h +++ b/src/core/or/channel.h @@ -350,12 +350,10 @@ struct channel_t { /** 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 */ @@ -730,7 +728,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); |