Archives
/
i2pd
mirror of https://github.com/PurpleI2P/i2pd
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

don't print error message if operation cancelled

Browse Source
pull/2016/head
orignal 4 months ago
parent 0ae7931a6f
commit b07530a8a1
1 changed files with 51 additions and 37 deletions
Show Stats Download Patch File Download Diff File

88
libi2pd_client/I2PService.cpp
Unescape Escape View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2023, The PurpleI2P Project * Copyright (c) 2013-2024, The PurpleI2P Project
* *
* This file is part of Purple i2pd project and licensed under BSD3 * This file is part of Purple i2pd project and licensed under BSD3
* *
@ -240,54 +240,68 @@ namespace client
void TCPIPPipe::HandleDownstreamReceived(const boost::system::error_code & ecode, std::size_t bytes_transfered) void TCPIPPipe::HandleDownstreamReceived(const boost::system::error_code & ecode, std::size_t bytes_transfered)
{ {
LogPrint(eLogDebug, "TCPIPPipe: Downstream: ", (int) bytes_transfered, " bytes received"); if (ecode != boost::asio::error::operation_aborted)
if (ecode) {
{ LogPrint(eLogDebug, "TCPIPPipe: Downstream: ", (int) bytes_transfered, " bytes received");
LogPrint(eLogError, "TCPIPPipe: Downstream read error:" , ecode.message()); if (ecode)
if (ecode != boost::asio::error::operation_aborted) {
LogPrint(eLogWarning, "TCPIPPipe: Downstream read error:" , ecode.message());
Terminate(); Terminate();
} else { }
if (bytes_transfered > 0 ) else
memcpy(m_upstream_buf, m_downstream_to_up_buf, bytes_transfered); {
UpstreamWrite(bytes_transfered); if (bytes_transfered > 0 )
} memcpy(m_upstream_buf, m_downstream_to_up_buf, bytes_transfered);
UpstreamWrite(bytes_transfered);
}
}
} }
void TCPIPPipe::HandleDownstreamWrite(const boost::system::error_code & ecode) { void TCPIPPipe::HandleDownstreamWrite(const boost::system::error_code & ecode)
if (ecode) {
{ if (ecode != boost::asio::error::operation_aborted)
LogPrint(eLogError, "TCPIPPipe: Downstream write error:" , ecode.message()); {
if (ecode != boost::asio::error::operation_aborted) if (ecode)
{
LogPrint(eLogWarning, "TCPIPPipe: Downstream write error:" , ecode.message());
Terminate(); Terminate();
} }
else else
AsyncReceiveUpstream(); AsyncReceiveUpstream();
}
} }
void TCPIPPipe::HandleUpstreamWrite(const boost::system::error_code & ecode) { void TCPIPPipe::HandleUpstreamWrite(const boost::system::error_code & ecode)
if (ecode) {
{ if (ecode != boost::asio::error::operation_aborted)
LogPrint(eLogError, "TCPIPPipe: Upstream write error:" , ecode.message()); {
if (ecode != boost::asio::error::operation_aborted) if (ecode)
{
LogPrint(eLogWarning, "TCPIPPipe: Upstream write error:" , ecode.message());
Terminate(); Terminate();
} }
else else
AsyncReceiveDownstream(); AsyncReceiveDownstream();
}
} }
void TCPIPPipe::HandleUpstreamReceived(const boost::system::error_code & ecode, std::size_t bytes_transfered) void TCPIPPipe::HandleUpstreamReceived(const boost::system::error_code & ecode, std::size_t bytes_transfered)
{ {
LogPrint(eLogDebug, "TCPIPPipe: Upstream ", (int)bytes_transfered, " bytes received"); if (ecode != boost::asio::error::operation_aborted)
if (ecode) {
{ LogPrint(eLogDebug, "TCPIPPipe: Upstream ", (int)bytes_transfered, " bytes received");
LogPrint(eLogError, "TCPIPPipe: Upstream read error:" , ecode.message()); if (ecode)
if (ecode != boost::asio::error::operation_aborted) {
LogPrint(eLogWarning, "TCPIPPipe: Upstream read error:" , ecode.message());
Terminate(); Terminate();
} else { }
if (bytes_transfered > 0 ) else
memcpy(m_downstream_buf, m_upstream_to_down_buf, bytes_transfered); {
DownstreamWrite(bytes_transfered); if (bytes_transfered > 0 )
} memcpy(m_downstream_buf, m_upstream_to_down_buf, bytes_transfered);
DownstreamWrite(bytes_transfered);
}
}
} }
void TCPIPAcceptor::Start () void TCPIPAcceptor::Start ()

Write Preview
Loading…
Cancel
Save