nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use channel_is_client() accessor in channelpadding.c.

Browse Source 
Also, allow channel_is_client() to take a const channel.
This commit is contained in:
Nick Mathewson 2017-09-06 15:37:09 -04:00
parent d1e0e486e9
commit ceb49c1c5f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/channel.c
View File

@ -4075,7 +4075,7 @@ channel_mark_bad_for_new_circs(channel_t *chan)
*/
int
channel_is_client(channel_t *chan)
channel_is_client(const channel_t *chan)
{
tor_assert(chan);

2
src/or/channel.h
View File

@ -666,7 +666,7 @@ 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);

2
src/or/channelpadding.c
View File

@ -66,7 +66,7 @@ static int consensus_nf_pad_relays;
* its a client, use that. Then finally verify in the consensus).
*/
#define CHANNEL_IS_CLIENT(chan, options) \
(!public_server_mode((options)) || (chan)->is_client || \
(!public_server_mode((options)) || channel_is_client(chan) || \
!connection_or_digest_is_known_relay((chan)->identity_digest))
/**