Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-10 09:58:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL: fixed SO_REUSEADDR on bind

Browse Source 
and use MSG_NOSIGNAL to prevent pipe errors in SITL
This commit is contained in:
Andrew Tridgell 2023-12-04 14:37:54 +11:00
parent 98e8b9785c
commit 64d649fbcc
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,10 +199,10 @@ bool SocketAPM::bind(const char *address, uint16_t port)
struct sockaddr_in sockaddr; struct sockaddr_in sockaddr;
make_sockaddr(address, port, sockaddr); make_sockaddr(address, port, sockaddr);
reuseaddress();
if (CALL_PREFIX(bind)(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr)) != 0) { if (CALL_PREFIX(bind)(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr)) != 0) {
return false; return false;
} }
reuseaddress();
return true; return true;
} }
@ -265,7 +265,7 @@ ssize_t SocketAPM::send(const void *buf, size_t size) const
if (fd == -1) { if (fd == -1) {
return -1; return -1;
} }
return CALL_PREFIX(send)(fd, buf, size, 0); return CALL_PREFIX(send)(fd, buf, size, MSG_NOSIGNAL);
} }
/* /*
@ -424,7 +424,12 @@ SocketAPM *SocketAPM::accept(uint32_t timeout_ms)
if (newfd == -1) { if (newfd == -1) {
return nullptr; return nullptr;
} }
return new SocketAPM(false, newfd); auto *ret = new SocketAPM(false, newfd);
if (ret != nullptr) {
ret->connected = true;
ret->reuseaddress();
}
return ret;
} }
/* /*