bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-24 02:55:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Corrected connect() timeout on *nix

Browse Source
This commit is contained in:
z3apa3a 2016-12-22 17:31:17 +03:00
parent d1d86ed9b3
commit 42ca640769
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common.c
View File

@ -707,11 +707,10 @@ int doconnect(struct clientparam * param){
unsigned long ul = 1; unsigned long ul = 1;
ioctlsocket(param->remsock, FIONBIO, &ul); ioctlsocket(param->remsock, FIONBIO, &ul);
#else #else
socklen_t us = sizeof(ul);
fcntl(param->remsock,F_SETFL,O_NONBLOCK); fcntl(param->remsock,F_SETFL,O_NONBLOCK);
#endif #endif
if(so._connect(param->remsock,(struct sockaddr *)&param->sinsr,SASIZE(&param->sinsr))) { if(so._connect(param->remsock,(struct sockaddr *)&param->sinsr,SASIZE(&param->sinsr))) {
if(errno != EAGAIN) return (13); if(errno != EAGAIN && errno != EINPROGRESS) return (13);
} }
memset(fds, 0, sizeof(fds)); memset(fds, 0, sizeof(fds));
fds[0].fd = param->remsock; fds[0].fd = param->remsock;
@ -719,15 +718,6 @@ int doconnect(struct clientparam * param){
if(so._poll(fds, 1, conf.timeouts[STRING_S]*1000) <= 0) { if(so._poll(fds, 1, conf.timeouts[STRING_S]*1000) <= 0) {
return (13); return (13);
} }
#ifndef _WIN32
#ifdef SO_ERROR
getsockopt(param->remsock, SOL_SOCKET, SO_ERROR, &ul, &us);
if (ul != 0) {
return (13);
}
#endif
#endif
} }
size = sizeof(param->sinsl); size = sizeof(param->sinsl);
if(so._getsockname(param->remsock, (struct sockaddr *)&param->sinsl, &size)==-1) {return (15);} if(so._getsockname(param->remsock, (struct sockaddr *)&param->sinsl, &size)==-1) {return (15);}