]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Using CHANNEL_FINISHED macro in connection.c
authorrl1987 <rl1987@sdf.lonestar.org>
Sun, 23 Nov 2014 19:34:41 +0000 (21:34 +0200)
committerNick Mathewson <nickm@torproject.org>
Sun, 21 Dec 2014 19:48:38 +0000 (14:48 -0500)
src/or/connection.c

index c9c371c001a88972cf95c0121169fa6c64c15269..16b359d5edc2d2d34527c3aaddd56171c2473849 100644 (file)
@@ -544,8 +544,7 @@ connection_free_(connection_t *conn)
                or_conn, TLS_CHAN_TO_BASE(or_conn->chan),
                U64_PRINTF_ARG(
                  TLS_CHAN_TO_BASE(or_conn->chan)->global_identifier));
-      if (!(TLS_CHAN_TO_BASE(or_conn->chan)->state == CHANNEL_STATE_CLOSED ||
-            TLS_CHAN_TO_BASE(or_conn->chan)->state == CHANNEL_STATE_ERROR)) {
+      if (!CHANNEL_FINISHED(TLS_CHAN_TO_BASE(or_conn->chan))) {
         channel_close_for_error(TLS_CHAN_TO_BASE(or_conn->chan));
       }