Skip to content

Client library can hangs on connect more than timeout #61

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Client library can hangs on connect more than timeout #61

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbd8468
connect() should respect timeout parameter
ihanick Aug 3, 2011
22f541a
fix a typo with fcntl result check
ihanick Aug 3, 2011
e8895ab
Add polling for outgoing packets on connect
ihanick Aug 3, 2011
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
24 changes: 23 additions & 1 deletion libhsclient/socket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <fcntl.h>
#include <signal.h>
#include <sys/un.h>
#include <poll.h>

#include "socket.hpp"
#include "string_util.hpp"
Expand Down Expand Up @@ -127,11 +128,32 @@ socket_connect(auto_file& fd, const socket_args& args, std::string& err_r)
if ((r = socket_open(fd, args, err_r)) != 0) {
return r;
}

if(!args.nonblocking ) {
if (fcntl(fd.get(), F_SETFL, O_NONBLOCK) != 0) {
return errno_string("fcntl O_NONBLOCK", errno, err_r);
}
}


if (connect(fd.get(), reinterpret_cast<const sockaddr *>(&args.addr),
args.addrlen) != 0) {
if (!args.nonblocking || errno != EINPROGRESS) {
if (errno != EINPROGRESS) {
return errno_string("connect", errno, err_r);
}
// disable NONBLOCK and wait for connect or timeout
if(!args.nonblocking) {
struct pollfd fds[1];
int nfds = 1;
fds[0].fd = fd.get();
fds[0].events = POLLIN|POLLOUT;
if( poll(fds,nfds, 1000*args.timeout) <= 0){
return errno_string("connect poll", errno, err_r);
}
if (fcntl(fd.get(), F_SETFL, fcntl(fd.get(), F_GETFL) & ~O_NONBLOCK) != 0) {
return errno_string("fcntl ~O_NONBLOCK", errno, err_r);
}
}
}
return 0;
}
Expand Down