Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL: added connect_timeout to SocketAPM

This commit is contained in:
Andrew Tridgell 2023-10-20 09:56:31 +11:00
parent fd319c6b2c
commit 26823b56ae
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libraries/AP_HAL/utility/Socket.cpp
View File

@ -20,6 +20,7 @@
#if HAL_OS_SOCKETS
#include "Socket.h"
#include <errno.h>
/*
constructor
@ -74,6 +75,36 @@ bool SocketAPM::connect(const char *address, uint16_t port)
return true;
}
/*
connect the socket with a timeout
*/
bool SocketAPM::connect_timeout(const char *address, uint16_t port, uint32_t timeout_ms)
{
struct sockaddr_in sockaddr;
make_sockaddr(address, port, sockaddr);
set_blocking(false);
int ret = ::connect(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr));
if (ret == 0) {
// instant connect?
return true;
}
if (errno != EINPROGRESS) {
return false;
}
bool pollret = pollout(timeout_ms);
if (!pollret) {
return false;
}
int sock_error = 0;
socklen_t len = sizeof(sock_error);
if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void*)&sock_error, &len) != 0) {
return false;
}
return sock_error == 0;
}
/*
bind the socket
*/

1
libraries/AP_HAL/utility/Socket.h
View File

@ -36,6 +36,7 @@ public:
~SocketAPM();
bool connect(const char *address, uint16_t port);
bool connect_timeout(const char *address, uint16_t port, uint32_t timeout_ms);
bool bind(const char *address, uint16_t port);
bool reuseaddress() const;
bool set_blocking(bool blocking) const;