mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-22 23:59:41 +08:00
Fix UDP parent for SOCKSv5
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Waiting to run
This commit is contained in:
1 parent
07c1dc1462
commit
4068a6955f
12 files changed
+128
-72
No files matched your search
+30
-2
@@ -314,6 +314,11 @@ log(logbuf);
|
||||
}
|
||||
else {
|
||||
FROMCLIENTPIPE = TOSERVER = 0;
|
||||
if(errno && errno != EINTR && errno != EAGAIN) {
|
||||
SERVERTERMREAD = 1;
|
||||
SERVERTERMWRITE = 1;
|
||||
HASERROR |= 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(inserverpipe && !inserverbuf && FROMSERVERPIPE && TOCLIENT){
|
||||
@@ -339,6 +344,11 @@ log(logbuf);
|
||||
}
|
||||
else {
|
||||
FROMSERVERPIPE = TOCLIENT = 0;
|
||||
if(errno && errno != EINTR && errno != EAGAIN) {
|
||||
CLIENTTERMREAD = 1;
|
||||
CLIENTTERMWRITE = 1;
|
||||
HASERROR |= 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(fromclient>inclientpipe && FROMCLIENT && TOCLIENTPIPE){
|
||||
@@ -364,6 +374,11 @@ log(logbuf);
|
||||
CLIENTTERMREAD = 1;
|
||||
continue;
|
||||
}
|
||||
if(errno && errno != EINTR && errno != EAGAIN) {
|
||||
CLIENTTERMREAD = 1;
|
||||
CLIENTTERMWRITE = 1;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else {
|
||||
#ifdef WITHLOG
|
||||
@@ -401,6 +416,11 @@ log(logbuf);
|
||||
SERVERTERMREAD = 1;
|
||||
continue;
|
||||
}
|
||||
if(errno && errno != EINTR && errno != EAGAIN) {
|
||||
SERVERTERMREAD = 1;
|
||||
SERVERTERMWRITE = 1;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else {
|
||||
#ifdef WITHLOG
|
||||
@@ -499,11 +519,19 @@ log("done read from server to buf");
|
||||
}
|
||||
}
|
||||
}
|
||||
if (CLIENTTERMREAD && !inclientbuf && !SERVERTERMWRITE) {
|
||||
if (CLIENTTERMREAD && !inclientbuf
|
||||
#ifdef WITHSPLICE
|
||||
&& !inclientpipe
|
||||
#endif
|
||||
&& !SERVERTERMWRITE) {
|
||||
SERVERTERMWRITE = 1;
|
||||
param->srv->so._shutdown(param->sostate, param->remsock, SHUT_WR);
|
||||
}
|
||||
if (SERVERTERMREAD && !inserverbuf && !CLIENTTERMWRITE) {
|
||||
if (SERVERTERMREAD && !inserverbuf
|
||||
#ifdef WITHSPLICE
|
||||
&& !inserverpipe
|
||||
#endif
|
||||
&& !CLIENTTERMWRITE) {
|
||||
CLIENTTERMWRITE = 1;
|
||||
param->srv->so._shutdown(param->sostate, param->clisock, SHUT_WR);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user