aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2023-07-06 21:34:41 -0500
committerluigi1111 <luigi1111w@gmail.com>2023-07-06 21:34:41 -0500
commitbd962882d1dc757b379711cdd69944c7da3d1c12 (patch)
tree901f18003699b73a54d55b10572f8e0d2028a1e7 /contrib
parentMerge pull request #8895 (diff)
parentproperly terminate interrupted TCP connection. fixes #8685 (diff)
downloadmonero-bd962882d1dc757b379711cdd69944c7da3d1c12.tar.xz
Merge pull request #8900
438554e properly terminate interrupted TCP connection. fixes #8685 (j-berman)
Diffstat (limited to 'contrib')
-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(