Skip to content

Fix socket leak(server_tcp_socket_fd_) on ConnectTCPSocket fail. #96

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
merged 2 commits into from
Apr 30, 2018
Merged

Fix socket leak(server_tcp_socket_fd_) on ConnectTCPSocket fail. #96

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb0b791
Fix socket leak(server_tcp_socket_fd_) on ConnectTCPSocket fail.
Apr 24, 2018
284a669
Remove redundant close of socket.
Apr 27, 2018
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
10 changes: 5 additions & 5 deletions network/OpenSSL/OpenSSLConnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,6 @@ namespace awsiotsdk {
return ResponseCode::SUCCESS;
}

#ifdef WIN32
closesocket(server_tcp_socket_fd_);
#else
close(server_tcp_socket_fd_);
#endif
AWS_LOG_ERROR(OPENSSL_WRAPPER_LOG_TAG, "connect - %s", strerror(errno));
return ResponseCode::NETWORK_TCP_CONNECT_ERROR;
}
Expand Down Expand Up @@ -362,6 +357,11 @@ namespace awsiotsdk {
networkResponse = ConnectTCPSocket();
if (ResponseCode::SUCCESS != networkResponse) {
AWS_LOG_ERROR(OPENSSL_WRAPPER_LOG_TAG, "TCP Connection error");
#ifdef WIN32
closesocket(server_tcp_socket_fd_);
#else
close(server_tcp_socket_fd_);
#endif
return networkResponse;
}

Expand Down