[tor-commits] [tor/master] Use channel_is_client() accessor in channelpadding.c.

[nickm@xxxxxxxxxxxxxx]

commit ceb49c1c5f2556c7fcd5b1ff34d8988344fa2ba7
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Sep 6 15:37:09 2017 -0400

    Use channel_is_client() accessor in channelpadding.c.
    
    Also, allow channel_is_client() to take a const channel.
---
 src/or/channel.c        | 2 +-
 src/or/channel.h        | 2 +-
 src/or/channelpadding.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/channel.c b/src/or/channel.c
index ea113903a..fa704e042 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -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);
 
diff --git a/src/or/channel.h b/src/or/channel.h
index a5a87de13..e913e9749 100644
--- a/src/or/channel.h
+++ b/src/or/channel.h
@@ -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);
diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c
index bed248983..2122602ff 100644
--- a/src/or/channelpadding.c
+++ b/src/or/channelpadding.c
@@ -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))
 
 /**



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits