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

Merge branch 'master' of https://github.com/3proxy/3proxy

Browse Source
This commit is contained in:
z3apa3a 2021-05-15 18:42:30 +03:00
commit e642100271
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/auth.c
View File

@ -317,7 +317,7 @@ int handleredirect(struct clientparam * param, struct ace * acentry){
} }
if((res = alwaysauth(param))){ if((res = alwaysauth(param))){
return (res == 10)? res : 60+res; return (res >= 10)? res : 60+res;
} }
} }
else { else {

16
src/plugins/SSLPlugin/ssl_plugin.c
View File

@ -120,10 +120,10 @@ static int ssl_send(SOCKET s, const void *msg, size_t len, int flags){
if((res = ssl_write(sslq->conn, (void *)msg, len)) <= 0){ if((res = ssl_write(sslq->conn, (void *)msg, len)) <= 0){
err = SSL_get_error((SSL *)((ssl_conn*)sslq->conn)->ssl, res); err = SSL_get_error((SSL *)((ssl_conn*)sslq->conn)->ssl, res);
if (err == SSL_ERROR_WANT_WRITE){ if (err == SSL_ERROR_WANT_WRITE){
_set_errno(EAGAIN); seterrno3(EAGAIN);
return -1; return -1;
} }
else _set_errno(err); else seterrno3(err);
} }
return res; return res;
} }
@ -144,10 +144,10 @@ static int ssl_sendto(SOCKET s, const void *msg, size_t len, int flags, const st
if((res = ssl_write(sslq->conn, (void *)msg, len)) <= 0) { if((res = ssl_write(sslq->conn, (void *)msg, len)) <= 0) {
err = SSL_get_error((SSL *)((ssl_conn*)sslq->conn)->ssl, res); err = SSL_get_error((SSL *)((ssl_conn*)sslq->conn)->ssl, res);
if (err == SSL_ERROR_WANT_WRITE){ if (err == SSL_ERROR_WANT_WRITE){
_set_errno(EAGAIN); seterrno3(EAGAIN);
return -1; return -1;
} }
else _set_errno(err); else seterrno3(err);
} }
return res; return res;
} }
@ -167,10 +167,10 @@ static int ssl_recvfrom(SOCKET s, void *msg, size_t len, int flags, struct socka
if((res = ssl_read(sslq->conn, (void *)msg, len)) <= 0) { if((res = ssl_read(sslq->conn, (void *)msg, len)) <= 0) {
err = SSL_get_error((SSL *)((ssl_conn*)sslq->conn)->ssl, res); err = SSL_get_error((SSL *)((ssl_conn*)sslq->conn)->ssl, res);
if (err == SSL_ERROR_WANT_READ) { if (err == SSL_ERROR_WANT_READ) {
_set_errno(EAGAIN); seterrno3(EAGAIN);
return -1; return -1;
} }
else _set_errno(err); else seterrno3(err);
} }
return res; return res;
} }
@ -189,10 +189,10 @@ static int WINAPI ssl_recv(SOCKET s, void *msg, size_t len, int flags){
if((res = ssl_read(sslq->conn, (void *)msg, len)) <= 0) { if((res = ssl_read(sslq->conn, (void *)msg, len)) <= 0) {
err = SSL_get_error((SSL *)((ssl_conn*)sslq->conn)->ssl, res); err = SSL_get_error((SSL *)((ssl_conn*)sslq->conn)->ssl, res);
if (err == SSL_ERROR_WANT_READ) { if (err == SSL_ERROR_WANT_READ) {
_set_errno(EAGAIN); seterrno3(EAGAIN);
return -1; return -1;
} }
else _set_errno(err); else seterrno3(err);
} }
return res; return res;
} }

3
src/proxy.h
View File

@ -116,6 +116,9 @@ void daemonize(void);
#ifdef _WIN32 #ifdef _WIN32
#define strcasecmp stricmp #define strcasecmp stricmp
#define strncasecmp strnicmp #define strncasecmp strnicmp
#define seterrno3(x) _set_errno(x)
#else
#define seterrno3(x) (errno = x)
#endif #endif
#ifndef SOCKET_ERROR #ifndef SOCKET_ERROR