circlecloud/proxychains-ng
1
0
Fork 0
mirror of https://github.com/rofl0r/proxychains-ng.git synced 2024-12-22 12:18:47 +00:00
Code Issues Projects Releases Wiki Activity

properly handle non-blocking mode of socket

Browse Source 
addressing #171
This commit is contained in:
rofl0r 2017-05-04 01:31:56 +01:00
parent bb3df1e440
commit cbddf15b19
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core.c
View File

@ -154,10 +154,19 @@ static int timed_connect(int sock, const struct sockaddr *addr, socklen_t len) {
pfd[0].fd = sock; pfd[0].fd = sock;
pfd[0].events = POLLOUT; pfd[0].events = POLLOUT;
fcntl(sock, F_SETFL, O_NONBLOCK); int flags = fcntl(sock, F_GETFL, 0);
/* put socket temporarily into nonblocking mode so we can enforce
* the timeout. */
if(!(flags & O_NONBLOCK))
fcntl(sock, F_SETFL, flags | O_NONBLOCK);
ret = true_connect(sock, addr, len); ret = true_connect(sock, addr, len);
PDEBUG("\nconnect ret=%d\n", ret); PDEBUG("\nconnect ret=%d\n", ret);
/* if the socket was already non-blocking, we assume the app takes
* care of handling the timeouts itself. */
if(flags & O_NONBLOCK)
return ret;
if(ret == -1 && errno == EINPROGRESS) { if(ret == -1 && errno == EINPROGRESS) {
ret = poll_retry(pfd, 1, tcp_connect_time_out); ret = poll_retry(pfd, 1, tcp_connect_time_out);
PDEBUG("\npoll ret=%d\n", ret); PDEBUG("\npoll ret=%d\n", ret);
@ -181,7 +190,7 @@ static int timed_connect(int sock, const struct sockaddr *addr, socklen_t len) {
ret = -1; ret = -1;
} }
fcntl(sock, F_SETFL, !O_NONBLOCK); fcntl(sock, F_SETFL, flags);
return ret; return ret;
} }