diff options
| author | Andrea Shepard <andrea@torproject.org> | 2012-11-10 03:24:41 -0800 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2012-11-10 03:24:41 -0800 |
| commit | 0523c8de7d7f775e9a89134340f88ae00bde158b (patch) | |
| tree | 8a145feaf75ea9f44e03f43dbffbb5e32ebc9b17 /src/or/connection_or.c | |
| parent | 713736a6a738aa371176241e11e2f7e06f63523b (diff) | |
| parent | fc1a9a13cf427ec7a319086c820408847fbc189b (diff) | |
| download | tor-0523c8de7d7f775e9a89134340f88ae00bde158b.tar.gz tor-0523c8de7d7f775e9a89134340f88ae00bde158b.zip | |
Merge branch 'check_for_orconn_on_close_squashed' of ssh://git-rw.torproject.org/user/andrea/tor
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 001b531e7f..a50088d579 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1143,8 +1143,8 @@ connection_or_close_normally(or_connection_t *orconn, int flush) channel_t *chan = NULL; tor_assert(orconn); - if (flush) connection_mark_and_flush(TO_CONN(orconn)); - else connection_mark_for_close(TO_CONN(orconn)); + if (flush) connection_mark_and_flush_internal(TO_CONN(orconn)); + else connection_mark_for_close_internal(TO_CONN(orconn)); if (orconn->chan) { chan = TLS_CHAN_TO_BASE(orconn->chan); /* Don't transition if we're already in closing, closed or error */ @@ -1166,8 +1166,8 @@ connection_or_close_for_error(or_connection_t *orconn, int flush) channel_t *chan = NULL; tor_assert(orconn); - if (flush) connection_mark_and_flush(TO_CONN(orconn)); - else connection_mark_for_close(TO_CONN(orconn)); + if (flush) connection_mark_and_flush_internal(TO_CONN(orconn)); + else connection_mark_for_close_internal(TO_CONN(orconn)); if (orconn->chan) { chan = TLS_CHAN_TO_BASE(orconn->chan); /* Don't transition if we're already in closing, closed or error */ |