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 ea113903afa2ce7e59a9aaca3ae7e7b5d8ba8d32..fa704e04261a5a31cfb42e9f3166dd38a910bcbf 100644 (file)
--- 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 a5a87de1367b8385cfc085c25251014fd0ff33a7..e913e9749e928d5ffb8a907c09666b3cc1f2a1be 100644 (file)
--- 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 bed24898375b85609dd37bbeb7dc7d7f09b5b7f3..2122602ffdda71ed441d91b524d1745ddd4947fc 100644 (file)
--- 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))
 
 /**