Skip to content

modify windows tcpclient reconnect bug #2662

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
Oct 1, 2025
Merged

modify windows tcpclient reconnect bug #2662

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5c7d0e
modify windows tcpclient reconnect bug
ytyisme Sep 25, 2025
95b50fb
fix code style
ytyisme Sep 30, 2025
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
13 changes: 11 additions & 2 deletions src/mavsdk/core/tcp_client_connection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@

namespace mavsdk {

inline bool notReady(int err)
{
#ifdef WINDOWS
return (err == WSAEWOULDBLOCK || err == WSAETIMEDOUT);
#else
return (err == EAGAIN || err == ETIMEDOUT);
#endif
}

/* change to remote_ip and remote_port */
TcpClientConnection::TcpClientConnection(
Connection::ReceiverCallback receiver_callback,
Expand Down Expand Up @@ -204,13 +213,13 @@ void TcpClientConnection::receive()
while (!_should_exit) {
const auto recv_len = recv(_socket_fd.get(), buffer, sizeof(buffer), 0);

if (recv_len == 0 || (recv_len < 0 && (errno == EAGAIN || errno == ETIMEDOUT))) {
if (recv_len == 0 || (recv_len < 0 && notReady(recv_len))) {
// Timeout, just try again.
continue;
}

if (recv_len < 0) {
LogErr() << "TCP receive error: " << GET_ERROR(errno) << ", trying to reeconnect...";
LogErr() << "TCP receive error: " << GET_ERROR(errno) << ", trying to reconnect...";
std::this_thread::sleep_for(std::chrono::seconds(1));
setup_port();
continue;
Expand Down
Loading