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

Fix connlim issues

Browse Source
This commit is contained in:
Vladimir Dubrovin 2023-04-26 15:04:00 +03:00
parent 862405bdfd
commit 6532163f01
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/auth.c
View File

@ -475,6 +475,7 @@ int startconnlims (struct clientparam *param){
uint64_t rating; uint64_t rating;
int ret = 0; int ret = 0;
param->connlim = 1;
pthread_mutex_lock(&connlim_mutex); pthread_mutex_lock(&connlim_mutex);
for(ce = conf.connlimiter; ce; ce = ce->next) { for(ce = conf.connlimiter; ce; ce = ce->next) {
if(ACLmatches(ce->ace, param)){ if(ACLmatches(ce->ace, param)){
@ -659,7 +660,7 @@ int alwaysauth(struct clientparam * param){
int countout = 0; int countout = 0;
if(conf.connlimiter && param->remsock == INVALID_SOCKET && startconnlims(param)) return 10; if(conf.connlimiter && !param->connlim && startconnlims(param)) return 10;
res = doconnect(param); res = doconnect(param);
if(!res){ if(!res){
if(conf.bandlimfunc && (conf.bandlimiter||conf.bandlimiterout)){ if(conf.bandlimfunc && (conf.bandlimiter||conf.bandlimiterout)){

2
src/proxymain.c
View File

@ -1025,7 +1025,7 @@ void freeparam(struct clientparam * param) {
} }
myfree(param->filters); myfree(param->filters);
} }
if(conf.connlimiter && (param->res != 10 || param->remsock != INVALID_SOCKET)) stopconnlims(param); if(param->connlim) stopconnlims(param);
#endif #endif
if(param->clibuf) myfree(param->clibuf); if(param->clibuf) myfree(param->clibuf);
if(param->srvbuf) myfree(param->srvbuf); if(param->srvbuf) myfree(param->srvbuf);

3
src/structures.h
View File

@ -523,7 +523,8 @@ struct clientparam {
transparent, transparent,
chunked, chunked,
paused, paused,
version; version,
connlim;
unsigned char *hostname, unsigned char *hostname,
*username, *username,