diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-04-26 18:02:57 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-04-26 18:02:57 +0200 |
| commit | 0fb0e7701b7184e277b23eb78b638c90b9d43e44 (patch) | |
| tree | c156823a3c86aa6cdbdb2314ac2d57d4902a45b3 /src | |
| parent | Merge pull request #811 (diff) | |
| parent | abstract_tcp_server2: fix send queue limit warning spam (diff) | |
| download | monero-0fb0e7701b7184e277b23eb78b638c90b9d43e44.tar.xz | |
Merge pull request #812
3102feb abstract_tcp_server2: fix send queue limit warning spam (moneromooo-monero)
6bca9a8 abstract_tcp_server2: avoid deadlock waiting for send queue to drain (moneromooo-monero)
7450656 net_node: fix connection leak when ping fails with bad response (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/p2p/net_node.inl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 6278db891..0fab40322 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -1319,6 +1319,7 @@ namespace nodetool if(rsp.status != PING_OK_RESPONSE_STATUS_TEXT || pr != rsp.peer_id) { LOG_PRINT_CC_L2(ping_context, "back ping invoke wrong response \"" << rsp.status << "\" from" << ip << ":" << port << ", hsh_peer_id=" << pr_ << ", rsp.peer_id=" << rsp.peer_id); + m_net_server.get_config_object().close(ping_context.m_connection_id); return; } m_net_server.get_config_object().close(ping_context.m_connection_id); |