bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-05-13 13:30:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

FIx hanging connections in sockmap

Browse Source
This commit is contained in:
Vladimir Dubrovin 2026-05-01 17:19:23 +03:00
parent 314503d8df
commit e986f8a747
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sockmap.c
View File

@ -499,6 +499,14 @@ log("done read from server to buf");
} }
} }
} }
if (CLIENTTERMREAD && !inclientbuf && !SERVERTERMWRITE) {
SERVERTERMWRITE = 1;
param->srv->so._shutdown(param->sostate, param->remsock, SHUT_WR);
}
if (SERVERTERMREAD && !inserverbuf && !CLIENTTERMWRITE) {
CLIENTTERMWRITE = 1;
param->srv->so._shutdown(param->sostate, param->clisock, SHUT_WR);
}
for(after = 0, cli_events=0, srv_events=0; after < 2; after ++){ for(after = 0, cli_events=0, srv_events=0; after < 2; after ++){
fdsc = 0; fdsc = 0;
@ -558,6 +566,9 @@ log("ready to write to client");
if(fds[fdsc].events & POLLOUT) CLIENTTERMWRITE = 1; if(fds[fdsc].events & POLLOUT) CLIENTTERMWRITE = 1;
} }
} }
} else if(fds[fdsc].revents & (POLLERR|POLLNVAL|POLLHUP)) {
CLIENTTERMREAD = 1;
CLIENTTERMWRITE = 1;
} }
fdsc++; fdsc++;
@ -621,6 +632,9 @@ log("server terminated connection");
if(fds[fdsc].events & POLLOUT) SERVERTERMWRITE = 1; if(fds[fdsc].events & POLLOUT) SERVERTERMWRITE = 1;
} }
} }
} else if(fds[fdsc].revents & (POLLERR|POLLNVAL|POLLHUP)) {
SERVERTERMREAD = 1;
SERVERTERMWRITE = 1;
} }
fdsc++; fdsc++;
// } // }