summaryrefslogtreecommitdiff
path: root/src/or/channeltls.c
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2012-10-08 20:14:04 -0700
committerAndrea Shepard <andrea@torproject.org>2012-10-08 20:14:04 -0700
commitd61e58e1ba594c57afdb4bf49169f59b0a56a7f4 (patch)
tree3f0c6ac896fb786b78e0dd34f24d4552254a652d /src/or/channeltls.c
parent8a41dd20cb43b16548b49f9eff581dba0ed9a9a1 (diff)
downloadtor-d61e58e1ba594c57afdb4bf49169f59b0a56a7f4.tar.gz
tor-d61e58e1ba594c57afdb4bf49169f59b0a56a7f4.zip
s/channel_request_close()/channel_mark_for_close()/g for consistency
Diffstat (limited to 'src/or/channeltls.c')
-rw-r--r--src/or/channeltls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index 883aef15f9..bb6ef9b4d5 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -224,7 +224,7 @@ channel_tls_free_all(void)
if (channel_tls_listener) {
base = TLS_CHAN_TO_BASE(channel_tls_listener);
channel_unregister(base);
- channel_request_close(base);
+ channel_mark_for_close(base);
channel_free(base);
channel_tls_listener = NULL;
}
@@ -316,7 +316,7 @@ channel_tls_close_method(channel_t *chan)
if (chan->u.listener.incoming_list) {
SMARTLIST_FOREACH_BEGIN(chan->u.listener.incoming_list,
channel_t *, ichan) {
- channel_request_close(ichan);
+ channel_mark_for_close(ichan);
} SMARTLIST_FOREACH_END(ichan);
smartlist_free(chan->u.listener.incoming_list);