ACL: Fix the streaming connection limit, more verbose logs when connl…

…imit fails
tvheadend · Jun 5, 2015 · cde8524 · cde8524
1 parent 0cbfa37
commit cde8524
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/access.c b/src/access.c
@@ -465,10 +465,8 @@ access_update(access_t *a, access_entry_t *ae)
       a->aa_conn_limit = ae->ae_conn_limit;
     break;
   case ACCESS_CONN_LIMIT_TYPE_STREAMING:
-    if (ae->ae_conn_limit && a->aa_conn_limit_streaming < ae->ae_conn_limit) {
+    if (a->aa_conn_limit_streaming < ae->ae_conn_limit)
       a->aa_conn_limit_streaming = ae->ae_conn_limit;
-      a->aa_conn_limit = 0;
-    }
     break;
   case ACCESS_CONN_LIMIT_TYPE_DVR:
     if (a->aa_conn_limit_dvr < ae->ae_conn_limit)

diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
@@ -101,9 +101,9 @@ dvr_rec_subscribe(dvr_entry_t *de)
     c2 = aa->aa_conn_limit_dvr ? rec_count >= aa->aa_conn_limit : -1;
     if (c1 && c2) {
       tvherror("dvr", "multiple connections are not allowed for user '%s' from '%s' "
-                      "(limit %u, streaming %u, active DVR %u)",
+                      "(limit %u, dvr limit %u, active DVR %u, streaming %u)",
                aa->aa_username ?: "", aa->aa_representative ?: "",
-               aa->aa_conn_limit, rec_count, net_count);
+               aa->aa_conn_limit, aa->aa_conn_limit_dvr, rec_count, net_count);
       return -EOVERFLOW;
     }
   }

diff --git a/src/tcp.c b/src/tcp.c
@@ -494,8 +494,9 @@ tcp_connection_launch
     if (c1 && c2) {
       if (started + 3 < dispatch_clock) {
         tvherror("tcp", "multiple connections are not allowed for user '%s' from '%s' "
-                        "(limit %u, active streaming %u, DVR %u)",
-                 aa->aa_username ?: "", aa->aa_representative ?: "", aa->aa_conn_limit,
+                        "(limit %u, streaming limit %u, active streaming %u, DVR %u)",
+                 aa->aa_username ?: "", aa->aa_representative ?: "",
+                 aa->aa_conn_limit, aa->aa_conn_limit_streaming,
                  used, used2);
         return NULL;
       }