aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorj-berman <justinberman@protonmail.com>2023-02-03 22:30:32 +0100
committerBotoX <github@botox.bz>2023-02-04 22:03:51 +0100
commit6c73dc742ed55f88dc9817e975fb20307780a0c8 (patch)
tree78d698a6f4c68f2b8541923ba024eae3e80294f3
parentMerge pull request #8675 (diff)
downloadmonero-6c73dc742ed55f88dc9817e975fb20307780a0c8.tar.xz
properly terminate interrupted TCP connection. fixes #8685
-rw-r--r--contrib/epee/include/net/abstract_tcp_server2.inl5
1 files changed, 1 insertions, 4 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index 81aa725d1..d88f18194 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -583,11 +583,8 @@ namespace net_utils
break;
}
}
- else if (ec.value())
- terminate();
else {
- cancel_timer();
- on_interrupted();
+ terminate();
}
};
m_strand.post(