diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-08-02 16:08:50 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-08-02 16:08:50 -0400 |
| commit | 645eff49ac0c382c8eeb228b31cace885077e5ec (patch) | |
| tree | ce81ca6149ff185df6e14ee4e8e8f5501bc53224 | |
| parent | af5ef98d1b2221ee4da389bb88dfe1c991d42e8d (diff) | |
| parent | e69cf2340be05aaaa2d4df4085f236742696bf86 (diff) | |
| download | tor-645eff49ac0c382c8eeb228b31cace885077e5ec.tar.gz tor-645eff49ac0c382c8eeb228b31cace885077e5ec.zip | |
Merge branch 'maint-0.4.6' into maint-0.4.7
| -rw-r--r-- | changes/ticket40604 | 5 | ||||
| -rw-r--r-- | src/core/or/connection_or.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/ticket40604 b/changes/ticket40604 new file mode 100644 index 0000000000..ec24a46e66 --- /dev/null +++ b/changes/ticket40604 @@ -0,0 +1,5 @@ + o Major bugfixes (relay): + - Remove OR connections btrack subsystem entries when the connections + closes normally. Before this, we would only close it on error and thus + leaking memory for each normal OR connections. Fixes bug 40604; bugfix + on 0.4.0.1-alpha. diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index 0018b1dfd8..0534061e44 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -806,6 +806,10 @@ connection_or_about_to_close(or_connection_t *or_conn) } else if (!tor_digest_is_zero(or_conn->identity_digest)) { connection_or_event_status(or_conn, OR_CONN_EVENT_CLOSED, tls_error_to_orconn_end_reason(or_conn->tls_error)); + } else { + /* Normal close, we notify of a done connection. */ + connection_or_event_status(or_conn, OR_CONN_EVENT_CLOSED, + END_OR_CONN_REASON_DONE); } } |