diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-12-21 14:48:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-12-21 14:48:53 -0500 |
| commit | 1c05dfd0b6ae9303d1f815a4d610655f32c0cc50 (patch) | |
| tree | 62f8f15a06f49024c46eb4defff27c7286f82495 /src/or/circpathbias.c | |
| parent | 647a90b9b3bcec5d6cac766e6b3756d6ff1302ce (diff) | |
| parent | af1469b9a3298382de39dca87b02410e829399a2 (diff) | |
| download | tor-1c05dfd0b6ae9303d1f815a4d610655f32c0cc50.tar.gz tor-1c05dfd0b6ae9303d1f815a4d610655f32c0cc50.zip | |
Merge branch 'ticket7356_squashed'
Diffstat (limited to 'src/or/circpathbias.c')
| -rw-r--r-- | src/or/circpathbias.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |