From: rl1987 <rl1987@sdf.lonestar.org>
Date: Sun, 23 Nov 2014 19:12:47 +0000 (+0200)
Subject: Using channel state lookup macros in circuitbias.c.
X-Git-Tag: tor-0.2.6.2-alpha~46^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a7dd44d6e0996f8dec376f049551fd10b4b6b6c;p=thirdparty%2Ftor.git

Using channel state lookup macros in circuitbias.c.
---

diff --git a/src/or/circpathbias.c b/src/or/circpathbias.c
index a6858a3460..e5e3326ca1 100644
--- a/src/or/circpathbias.c
+++ b/src/or/circpathbias.c
@@ -768,8 +768,8 @@ pathbias_send_usable_probe(circuit_t *circ)
 
   /* Can't probe if the channel isn't open */
   if (circ->n_chan == NULL ||
-      (circ->n_chan->state != CHANNEL_STATE_OPEN
-       && circ->n_chan->state != CHANNEL_STATE_MAINT)) {
+      (!CHANNEL_IS_OPEN(circ->n_chan)
+       && !CHANNEL_IS_MAINT(circ->n_chan))) {
     log_info(LD_CIRC,
              "Skipping pathbias probe for circuit %d: Channel is not open.",
              ocirc->global_identifier);