From: Andrea Shepard <andrea@persephoneslair.org>
Date: Thu, 30 Aug 2012 22:27:55 +0000 (-0700)
Subject: Query circuit count from associated channel of or_conn in control.c
X-Git-Tag: tor-0.2.4.4-alpha~37^2~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6cce6241dd4405f6cf21057f9913e07633cf18bb;p=thirdparty%2Ftor.git

Query circuit count from associated channel of or_conn in control.c
---

diff --git a/src/or/control.c b/src/or/control.c
index 74c6acc000..5c05fe159d 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -12,6 +12,8 @@
 
 #include "or.h"
 #include "buffers.h"
+#include "channel.h"
+#include "channeltls.h"
 #include "circuitbuild.h"
 #include "circuitlist.h"
 #include "circuituse.h"
@@ -3822,7 +3824,11 @@ control_event_or_conn_status(or_connection_t *conn, or_conn_status_event_t tp,
       log_warn(LD_BUG, "Unrecognized status code %d", (int)tp);
       return 0;
     }
-  ncircs = circuit_count_pending_on_or_conn(conn);
+  if (conn->chan) {
+    ncircs = circuit_count_pending_on_channel(TLS_CHAN_TO_BASE(conn->chan));
+  } else {
+    ncircs = 0;
+  }
   ncircs += conn->n_circuits;
   if (ncircs && (tp == OR_CONN_EVENT_FAILED || tp == OR_CONN_EVENT_CLOSED)) {
     tor_snprintf(ncircs_buf, sizeof(ncircs_buf), "%sNCIRCS=%d",