From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 6 Sep 2017 19:37:09 +0000 (-0400)
Subject: Use channel_is_client() accessor in channelpadding.c.
X-Git-Tag: tor-0.3.2.2-alpha~50^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ceb49c1c5f2556c7fcd5b1ff34d8988344fa2ba7;p=thirdparty%2Ftor.git

Use channel_is_client() accessor in channelpadding.c.

Also, allow channel_is_client() to take a const channel.
---

diff --git a/src/or/channel.c b/src/or/channel.c
index ea113903af..fa704e0426 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 a5a87de136..e913e9749e 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 bed2489837..2122602ffd 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))
 
 /**