mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-22 23:59:41 +08:00
Services and their clients read their own configuration
A service keeps the configuration it was started with (srvparam.config) and its threads and its clients' read it there: limits and counters (alwaysauth, the limiter), RADIUS, dnspr's name servers, and the checks for a reload in the accept loop and in sockmap(). The configuration is still reloaded in place, so it is the current one for now; this is what lets a reload build a new one while the old one still serves. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
737bdc7d24
commit
7ec05ff372
7 files changed
+47
-45
No files matched your search
+7
-7
@@ -17,7 +17,7 @@ int alwaysauth(struct clientparam * param){
|
||||
int countout = 0;
|
||||
|
||||
|
||||
if(conf->connlimiter && !param->connlim && startconnlims(param)) return 10;
|
||||
if(param->srv->config->connlimiter && !param->connlim && startconnlims(param)) return 10;
|
||||
#ifdef WITH_HTTPSRV
|
||||
/* The http server answers the request itself, so authorization must not
|
||||
try to reach a destination that does not exist. A request it has handed
|
||||
@@ -27,15 +27,15 @@ int alwaysauth(struct clientparam * param){
|
||||
res = doconnect(param);
|
||||
#endif
|
||||
if(!res){
|
||||
if(conf->bandlimfunc && (conf->bandlimiter||conf->bandlimiterout)){
|
||||
if(param->srv->config->bandlimfunc && (param->srv->config->bandlimiter||param->srv->config->bandlimiterout)){
|
||||
_3proxy_mutex_lock(&bandlim_mutex);
|
||||
initbandlims(param);
|
||||
_3proxy_mutex_unlock(&bandlim_mutex);
|
||||
}
|
||||
|
||||
if(conf->trafcountfunc && conf->trafcounter) {
|
||||
if(param->srv->config->trafcountfunc && param->srv->config->trafcounter) {
|
||||
_3proxy_mutex_lock(&tc_mutex);
|
||||
for(tc = conf->trafcounter; tc; tc = tc->next) {
|
||||
for(tc = param->srv->config->trafcounter; tc; tc = tc->next) {
|
||||
if(tc->disabled) continue;
|
||||
if(ACLmatches(tc->ace, param)){
|
||||
if(tc->ace->action == NOCOUNTIN) {
|
||||
@@ -51,11 +51,11 @@ int alwaysauth(struct clientparam * param){
|
||||
_3proxy_mutex_unlock(&tc_mutex);
|
||||
return 10;
|
||||
}
|
||||
param->trafcountfunc = conf->trafcountfunc;
|
||||
param->trafcountfunc = param->srv->config->trafcountfunc;
|
||||
param->maxtrafin64 = tc->traflim64 - tc->v->traf64;
|
||||
}
|
||||
}
|
||||
if(countout)for(tc = conf->trafcounter; tc; tc = tc->next) {
|
||||
if(countout)for(tc = param->srv->config->trafcounter; tc; tc = tc->next) {
|
||||
if(tc->disabled) continue;
|
||||
if(ACLmatches(tc->ace, param)){
|
||||
if(tc->ace->action == NOCOUNTOUT || tc->ace->action == NOCOUNTALL) break;
|
||||
@@ -66,7 +66,7 @@ int alwaysauth(struct clientparam * param){
|
||||
_3proxy_mutex_unlock(&tc_mutex);
|
||||
return 10;
|
||||
}
|
||||
param->trafcountfunc = conf->trafcountfunc;
|
||||
param->trafcountfunc = param->srv->config->trafcountfunc;
|
||||
param->maxtrafout64 = tc->traflim64 - tc->v->traf64;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user