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

Add POLLRDHUP support to spliced sockmap

Browse Source
This commit is contained in:
z3APA3A 2019-01-11 19:12:03 +03:00
parent 54e9f9cedd
commit 03efdc451b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sockmap.c
View File

@ -128,7 +128,7 @@ int splicemap(struct clientparam * param, int timeo){
#if DEBUGLEVEL > 2 #if DEBUGLEVEL > 2
(*param->srv->logfunc)(param, "splice: will recv from server"); (*param->srv->logfunc)(param, "splice: will recv from server");
#endif #endif
fds[1].events |= POLLIN; fds[1].events |= (POLLIN|POLLRDHUP);
} }
if(clistate && !param->waitserver64 && param->remsock != INVALID_SOCKET){ if(clistate && !param->waitserver64 && param->remsock != INVALID_SOCKET){
#if DEBUGLEVEL > 2 #if DEBUGLEVEL > 2
@ -142,7 +142,7 @@ int splicemap(struct clientparam * param, int timeo){
#if DEBUGLEVEL > 2 #if DEBUGLEVEL > 2
(*param->srv->logfunc)(param, "splice: will recv from client"); (*param->srv->logfunc)(param, "splice: will recv from client");
#endif #endif
fds[0].events |= POLLIN; fds[0].events |= (POLLIN|POLLRDHUP);
} }
if(!fds[0].events && !fds[1].events) RETURN (666); if(!fds[0].events && !fds[1].events) RETURN (666);
if(fds[0].fd == INVALID_SOCKET){ if(fds[0].fd == INVALID_SOCKET){
@ -166,7 +166,7 @@ int splicemap(struct clientparam * param, int timeo){
if(res < 1){ if(res < 1){
RETURN(92); RETURN(92);
} }
if( (fds[0].revents & (POLLERR|POLLNVAL|POLLHUP)) && !(fds[0].revents & POLLIN)) { if( (fds[0].revents & (POLLERR|POLLNVAL|POLLHUP|POLLRDHUP)) && !(fds[0].revents & POLLIN)) {
fds[0].revents = 0; fds[0].revents = 0;
stop = 1; stop = 1;
param->res = 90; param->res = 90;
@ -174,7 +174,7 @@ int splicemap(struct clientparam * param, int timeo){
so._closesocket(param->clisock); so._closesocket(param->clisock);
fds[0].fd = param->clisock = INVALID_SOCKET; fds[0].fd = param->clisock = INVALID_SOCKET;
} }
if( (fds[1].revents & (POLLERR|POLLNVAL|POLLHUP)) && !(fds[1].revents & POLLIN)){ if( (fds[1].revents & (POLLERR|POLLNVAL|POLLHUP|POLLRDHUP)) && !(fds[1].revents & POLLIN)){
fds[1].revents = 0; fds[1].revents = 0;
stop = 1; stop = 1;
param->res = 90; param->res = 90;