summaryrefslogtreecommitdiff
path: root/src/or/hibernate.c
diff options
context:
space:
mode:
authorteor <teor2345@gmail.com>2017-09-19 14:17:35 +1000
committerNick Mathewson <nickm@torproject.org>2017-10-31 11:58:34 -0400
commite57604183cf5a0fb9e99522cbd7f1548784d63a8 (patch)
treedb75ccab4ceb1d2568eaeba6efb7b4eeab43797c /src/or/hibernate.c
parentd6568bad5e12af0e202f82c3ca86ae9aaeb443e4 (diff)
downloadtor-e57604183cf5a0fb9e99522cbd7f1548784d63a8.tar.gz
tor-e57604183cf5a0fb9e99522cbd7f1548784d63a8.zip
When hibernating, close connections normally and allow them to flush
Bugfix on 7267 in 0.2.4.7-alpha
Diffstat (limited to 'src/or/hibernate.c')
-rw-r--r--src/or/hibernate.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 8c48a6f47d..e60306a736 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -34,6 +34,7 @@ hibernating, phase 2:
#include "config.h"
#include "connection.h"
#include "connection_edge.h"
+#include "connection_or.h"
#include "control.h"
#include "hibernate.h"
#include "main.h"
@@ -914,7 +915,7 @@ hibernate_go_dormant(time_t now)
END_STREAM_REASON_HIBERNATING);
else if (conn->type == CONN_TYPE_OR) {
if (TO_OR_CONN(conn)->chan) {
- channel_mark_for_close(TLS_CHAN_TO_BASE(TO_OR_CONN(conn)->chan));
+ connection_or_close_normally(TO_OR_CONN(conn), 0);
} else {
connection_mark_for_close(conn);
}