Merge branch 'bug22805_v2_squashed'

1 files changed, 15 insertions, 1 deletions

diff --git a/src/or/channel.c b/src/or/channel.c
index faece55981..0b5a7fde90 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -4090,7 +4090,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);
 
@@ -4112,6 +4112,20 @@ channel_mark_client(channel_t *chan)
 }
 
 /**
+ * Clear the client flag
+ *
+ * Mark a channel as being _not_ from a client
+ */
+
+void
+channel_clear_client(channel_t *chan)
+{
+  tor_assert(chan);
+
+  chan->is_client = 0;
+}
+
+/**
  * Get the canonical flag for a channel
  *
  * This returns the is_canonical for a channel; this flag is determined by