diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-22 08:58:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-22 08:58:17 -0400 |
| commit | 91467e04b18afce9af2189116ad0e160fef53e49 (patch) | |
| tree | 4ddc095a95cecec1b431899841b73e2b5a388bf7 /src/or/channel.h | |
| parent | 512c57cff97c0533bbb56e6c41a1e3dca5fd9064 (diff) | |
| parent | 95a7e7e9254bc70db9e1d967d0db3deb658a2be3 (diff) | |
| download | tor-91467e04b18afce9af2189116ad0e160fef53e49.tar.gz tor-91467e04b18afce9af2189116ad0e160fef53e49.zip | |
Merge branch 'bug22805_v2_squashed'
Diffstat (limited to 'src/or/channel.h')
| -rw-r--r-- | src/or/channel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/channel.h b/src/or/channel.h index 204b244293..32336fe1d2 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -666,11 +666,12 @@ 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(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); int channel_is_outgoing(channel_t *chan); void channel_mark_client(channel_t *chan); +void channel_clear_client(channel_t *chan); int channel_matches_extend_info(channel_t *chan, extend_info_t *extend_info); int channel_matches_target_addr_for_extend(channel_t *chan, const tor_addr_t *target); |