hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix socket connect issue on interrupt

Browse source
This commit is contained in:
Thulinma 2021-02-05 20:21:03 +01:00
parent 248bb9c61e
commit ed1d690610
1 changed files with 6 additions and 1 deletions

7
lib/socket.cpp
View file

@ -873,7 +873,12 @@ void Socket::Connection::open(std::string host, int port, bool nonblock, bool wi
for (rp = result; rp != NULL; rp = rp->ai_next){ for (rp = result; rp != NULL; rp = rp->ai_next){
sSend = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); sSend = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
if (sSend < 0){continue;} if (sSend < 0){continue;}
if (connect(sSend, rp->ai_addr, rp->ai_addrlen) == 0){ //Ensure we can handle interrupted system call case
int ret = 0;
do{
ret = connect(sSend, rp->ai_addr, rp->ai_addrlen);
}while(ret && errno == EINTR);
if (!ret){
memcpy(&remoteaddr, rp->ai_addr, rp->ai_addrlen); memcpy(&remoteaddr, rp->ai_addr, rp->ai_addrlen);
break; break;
} }