From: Mariusz Bialonczyk <manio@skyboo.net>
Date: Tue, 3 Dec 2013 10:57:24 +0000 (+0100)
Subject: capmt: fix numbering services after a686fe3
X-Git-Tag: v4.1~2349^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F308%2Fhead;p=thirdparty%2Ftvheadend.git

capmt: fix numbering services after a686fe3

The commit fixes simultaneous channel decryption.
We are enumerating services based on the generated seq value.
In fact it should be elementary stream PID, but currently
we can leave it until PMT code rework.

The CA_SET_PID and CA_SET_DESCR from OSCam was always set with
seq=0 leading to setting all keys always to first subscribed
service.
---

diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c
index e65010f24..7e68347a6 100644
--- a/src/descrambler/capmt.c
+++ b/src/descrambler/capmt.c
@@ -1001,6 +1001,7 @@ capmt_service_start(service_t *s)
     tvhcsa_init(&ct->ct_csa);
     ct->ct_capmt    = capmt;
     ct->ct_service  = t;
+    ct->ct_seq      = capmt->capmt_seq++;
 
 
     TAILQ_FOREACH(st, &t->s_components, es_link) {