aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/connection_edge.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-02-01 14:10:06 -0500
committerDavid Goulet <dgoulet@torproject.org>2021-02-01 14:10:06 -0500
commit6bde42b4de3fd1a3d7c8385a66f8e40b954e60f8 (patch)
tree12cefed0b35b64ed5201e615fe79e9e17ad1dee2 /src/core/or/connection_edge.c
parent385fda038fdf53694926729d4b6f078a4b259410 (diff)
parented373eaa8de41f22c28b5c203b85342e0fc48bee (diff)
downloadtor-6bde42b4de3fd1a3d7c8385a66f8e40b954e60f8.tar.gz
tor-6bde42b4de3fd1a3d7c8385a66f8e40b954e60f8.zip
Merge branch 'maint-0.4.5'
Diffstat (limited to 'src/core/or/connection_edge.c')
-rw-r--r--src/core/or/connection_edge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
index 92f8e3a7b7..8adfd73e81 100644
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -4290,10 +4290,10 @@ connection_exit_connect(edge_connection_t *edge_conn)
* case of an attack so this is a small price to pay. */
if (!connection_edge_is_rendezvous_stream(edge_conn) &&
!network_reentry_is_allowed() &&
- nodelist_reentry_probably_contains(&conn->addr, conn->port)) {
+ nodelist_reentry_contains(&conn->addr, conn->port)) {
log_info(LD_EXIT, "%s tried to connect back to a known relay address. "
"Closing.", connection_describe(conn));
- connection_edge_end(edge_conn, END_STREAM_REASON_TORPROTOCOL);
+ connection_edge_end(edge_conn, END_STREAM_REASON_CONNECTREFUSED);
circuit_detach_stream(circuit_get_by_edge_conn(edge_conn), edge_conn);
connection_free(conn);
return;