diff options
author | George Kadianakis <desnacked@riseup.net> | 2020-08-12 13:23:33 +0300 |
---|---|---|
committer | George Kadianakis <desnacked@riseup.net> | 2020-08-12 13:23:33 +0300 |
commit | c591a0d2466cdc644fd82519f6f1ec32da764287 (patch) | |
tree | 8ca4a3798b167d056439a3219e0b11f396f0744d /src/core/or/channel.h | |
parent | 2f708079cd912eb70384002ff3ab29ff2d224ed4 (diff) | |
parent | 8e9edb93be7771e44352c539abdf0b269ac56fab (diff) | |
download | tor-c591a0d2466cdc644fd82519f6f1ec32da764287.tar.gz tor-c591a0d2466cdc644fd82519f6f1ec32da764287.zip |
Merge branch 'maint-0.4.4'
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 d52ebdf619..10b80aa7d5 100644 --- a/src/core/or/channel.h +++ b/src/core/or/channel.h @@ -344,12 +344,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 */ @@ -725,7 +723,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); |