From: Jaroslav Kysela Date: Mon, 21 Oct 2019 08:08:01 +0000 (+0200) Subject: dvr: fix the DVR limit per user condition (substract self) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb23c42a9e398d83a76ad49d07553ddaf4c6e8d5;p=thirdparty%2Ftvheadend.git dvr: fix the DVR limit per user condition (substract self) --- diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c index 4f8fe4c2d..d8b95a1ba 100644 --- a/src/dvr/dvr_rec.c +++ b/src/dvr/dvr_rec.c @@ -108,8 +108,9 @@ dvr_rec_subscribe(dvr_entry_t *de) } if (aa->aa_conn_limit || aa->aa_conn_limit_dvr) { - rec_count = dvr_usage_count(aa); + rec_count = dvr_usage_count(aa) - 1; /* substract self */ net_count = aa->aa_conn_limit ? tcp_connection_count(aa) : 0; + assert(rec_count >= 0); /* the rule is: allow if one condition is OK */ c1 = aa->aa_conn_limit ? rec_count + net_count >= aa->aa_conn_limit : -1; c2 = aa->aa_conn_limit_dvr ? rec_count >= aa->aa_conn_limit_dvr : -1;