service, cwc, capmt: more es_filt_link fixes

diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c
index 570f10275478a0727018c592e4f824f3620bb68a..e2dcf2bf085666e43c1e53a925e71bac47290a44 100644 (file)
--- a/src/descrambler/capmt.c
+++ b/src/descrambler/capmt.c
@@ -1517,7 +1517,7 @@ capmt_caid_change(th_descrambler_t *td)
 
   lock_assert(&t->s_stream_mutex);
 
-  TAILQ_FOREACH(st, &t->s_filt_components, es_link) {
+  TAILQ_FOREACH(st, &t->s_filt_components, es_filt_link) {
     LIST_FOREACH(c, &st->es_caids, link) {
       /* search ecmpid in list */
       LIST_FOREACH(cce, &ct->ct_caid_ecm, cce_link)
@@ -1794,7 +1794,7 @@ capmt_service_start(service_t *s)
 
     change = 0;
     pthread_mutex_lock(&t->s_stream_mutex);
-    TAILQ_FOREACH(st, &t->s_filt_components, es_link) {
+    TAILQ_FOREACH(st, &t->s_filt_components, es_filt_link) {
       caid_t *c;
       LIST_FOREACH(c, &st->es_caids, link) {
         if(c == NULL || c->use == 0)

diff --git a/src/descrambler/cwc.c b/src/descrambler/cwc.c
index a2bddde3487227668c28c41a8367cd89994f3c44..0f2490614900bfc9dc2c87fc64aac1e15f5a5593 100755 (executable)
--- a/src/descrambler/cwc.c
+++ b/src/descrambler/cwc.c
@@ -1968,7 +1968,7 @@ cwc_service_start(service_t *t)
     pthread_mutex_lock(&t->s_stream_mutex);
     LIST_FOREACH(pcard, &cwc->cwc_cards, cs_card) {
       if (pcard->cwc_caid == 0) continue;
-      TAILQ_FOREACH(st, &t->s_filt_components, es_link) {
+      TAILQ_FOREACH(st, &t->s_filt_components, es_filt_link) {
         LIST_FOREACH(c, &st->es_caids, link) {
           if (c->use && c->caid == pcard->cwc_caid)
             break;
@@ -2004,7 +2004,7 @@ cwc_service_start(service_t *t)
 
     pthread_mutex_lock(&t->s_stream_mutex);
     i = 0;
-    TAILQ_FOREACH(st, &t->s_filt_components, es_link) {
+    TAILQ_FOREACH(st, &t->s_filt_components, es_filt_link) {
       LIST_FOREACH(c, &st->es_caids, link)
         if (c->use && c->caid == pcard->cwc_caid) {
           ct->cs_epids[i++] = st->es_pid;

diff --git a/src/service.c b/src/service.c
index aa0d6cb5761ba6b1e11ea40f2ab668a8967d158d..f811c52748ac26ed3b4690d6b02f03a1d75261cc 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -574,7 +574,7 @@ service_start(service_t *t, int instance)
   /**
    * Initialize stream
    */
-  TAILQ_FOREACH(st, &t->s_filt_components, es_link)
+  TAILQ_FOREACH(st, &t->s_filt_components, es_filt_link)
     stream_init(st);
 
   pthread_mutex_unlock(&t->s_stream_mutex);