Skip to content

Close the socket gracefully on Windows #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shibd merged 2 commits into from
Jun 20, 2023
Merged

Close the socket gracefully on Windows #284

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0b499b
Close the socket gracefully on Windows
BewareMyPower Jun 14, 2023
9d6aeca
Handle operation_failed first
BewareMyPower Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions lib/ClientConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,13 +609,13 @@ void ClientConnection::handleRead(const boost::system::error_code& err, size_t b
incomingBuffer_.bytesWritten(bytesTransferred);

if (err || bytesTransferred == 0) {
if (err) {
if (err == boost::asio::error::operation_aborted) {
LOG_DEBUG(cnxString_ << "Read operation was canceled: " << err.message());
} else {
LOG_ERROR(cnxString_ << "Read operation failed: " << err.message());
}
} // else: bytesTransferred == 0, which means server has closed the connection
if (err == boost::asio::error::operation_aborted) {
LOG_DEBUG(cnxString_ << "Read operation was canceled: " << err.message());
} else if (bytesTransferred == 0 || err == boost::asio::error::eof) {
LOG_DEBUG(cnxString_ << "Server closed the connection: " << err.message());
} else {
LOG_ERROR(cnxString_ << "Read operation failed: " << err.message());
}
close();
} else if (bytesTransferred < minReadSize) {
// Read the remaining part, use a slice of buffer to write on the next
Expand Down Expand Up @@ -1355,6 +1355,7 @@ Future<Result, SchemaInfo> ClientConnection::newGetSchema(const std::string& top
void ClientConnection::closeSocket() {
boost::system::error_code err;
if (socket_) {
socket_->shutdown(boost::asio::socket_base::shutdown_both, err);
socket_->close(err);
if (err) {
LOG_WARN(cnxString_ << "Failed to close socket: " << err.message());
Expand Down