From cfa4d1102760918ec76191aae563c52e3122e018 Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Tue, 26 Apr 2016 18:50:57 +0300 Subject: [PATCH] Do not fail connection with 333 error on configuration reload --- src/auth.c | 1 - src/sockmap.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/auth.c b/src/auth.c index 3908bb3..2c89c65 100644 --- a/src/auth.c +++ b/src/auth.c @@ -558,7 +558,6 @@ int alwaysauth(struct clientparam * param){ res = doconnect(param); if(!res){ - if(param->srv->paused != conf.paused) return 333; initbandlims(param); for(tc = conf.trafcounter; tc; tc = tc->next) { if(tc->disabled) continue; diff --git a/src/sockmap.c b/src/sockmap.c index d3ccdf6..a2cd9b2 100644 --- a/src/sockmap.c +++ b/src/sockmap.c @@ -69,7 +69,7 @@ int sockmap(struct clientparam * param, int timeo){ while (!stop&&!conf.timetoexit){ sasize = sizeof(struct sockaddr_in); if(param->version < conf.version){ - if((res = (*param->srv->authfunc)(param)) && !param->srv->noforce) {return(res);} + if((res = (*param->srv->authfunc)(param)) && res != 2 && !param->srv->noforce) {return(res);} param->paused = conf.paused; param->version = conf.version; }