From 021314d6f5af290777ac4cb2d4afe6681158215b Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Wed, 11 Nov 2020 17:40:46 +0300 Subject: [PATCH] Fix bandlim handling --- src/auth.c | 4 ++-- src/sockmap.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/auth.c b/src/auth.c index 6f7efef..dc01cbb 100644 --- a/src/auth.c +++ b/src/auth.c @@ -575,7 +575,7 @@ unsigned bandlimitfunc(struct clientparam *param, unsigned nbytesin, unsigned nb param->bandlims[i]->nexttime - now : 0; sleeptime = (nsleeptime > sleeptime)? nsleeptime : sleeptime; param->bandlims[i]->basetime = sec; - param->bandlims[i]->nexttime = msec + nsleeptime + (nbytesin > 512)? ((nbytesin+32)/64)*(((64*8*1000000)/param->bandlims[i]->rate)) : ((nbytesin+1) * (8*1000000))/param->bandlims[i]->rate; + param->bandlims[i]->nexttime = msec + nsleeptime + ((nbytesin > 512)? ((nbytesin+32)/64)*(((64*8*1000000)/param->bandlims[i]->rate)) : ((nbytesin+1) * (8*1000000))/param->bandlims[i]->rate); } for(i=0; nbytesout && ibandlimsout[i]; i++){ if( !param->bandlimsout[i]->basetime || @@ -592,7 +592,7 @@ unsigned bandlimitfunc(struct clientparam *param, unsigned nbytesin, unsigned nb param->bandlimsout[i]->nexttime - now : 0; sleeptime = (nsleeptime > sleeptime)? nsleeptime : sleeptime; param->bandlimsout[i]->basetime = sec; - param->bandlimsout[i]->nexttime = msec + nsleeptime + (nbytesout > 512)? ((nbytesout+32)/64)*((64*8*1000000)/param->bandlimsout[i]->rate) : ((nbytesout+1)* (8*1000000))/param->bandlimsout[i]->rate; + param->bandlimsout[i]->nexttime = msec + nsleeptime + ((nbytesout > 512)? ((nbytesout+32)/64)*((64*8*1000000)/param->bandlimsout[i]->rate) : ((nbytesout+1)* (8*1000000))/param->bandlimsout[i]->rate); } pthread_mutex_unlock(&bandlim_mutex); return sleeptime/1000; diff --git a/src/sockmap.c b/src/sockmap.c index 9bdfac7..239f042 100644 --- a/src/sockmap.c +++ b/src/sockmap.c @@ -355,7 +355,7 @@ log("done read from server to pipe\n"); if(inserverpipe >= MAXSPLICE) TOSERVERPIPE = 0; if(param->bandlimfunc) { int sl1; - sl1 = (*param->bandlimfunc)(param, 1, res); + sl1 = (*param->bandlimfunc)(param, res, 0); if(sl1 > sleeptime) sleeptime = sl1; } if(param->operation == UDPASSOC && param->srv->singlepacket){ @@ -418,7 +418,7 @@ log("done read from server to buf"); param->srvinbuf += res; if(param->bandlimfunc) { int sl1; - sl1 = (*param->bandlimfunc)(param, 1, res); + sl1 = (*param->bandlimfunc)(param, res, 0); if(sl1 > sleeptime) sleeptime = sl1; } if(param->srvbufsize == param->srvinbuf) TOSERVERBUF = 0;