Now sending CA descriptors to the CAM in the same sequence as they were originally received

2 files changed, 16 insertions, 11 deletions

diff --git a/HISTORY b/HISTORY
index 3bdd2b5a..97805459 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2057,3 +2057,5 @@ Video Disk Recorder Revision History
 2003-04-25: Version 1.1.29
 
 - Fixed detecting broken connection to the LIRC daemon (thanks to Ludwig Nussel).
+- Now sending CA descriptors to the CAM in the same sequence as they were originally
+  received (thanks to Stefan Huelswitt).
diff --git a/eit.c b/eit.c
index 2bab1a51..242b51bd 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.72 2003/04/21 13:21:54 kls Exp $
+ * $Id: eit.c 1.73 2003/04/25 14:45:32 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1444,18 +1444,21 @@ int cSIProcessor::GetCaDescriptors(int Source, int Transponder, int ServiceId, c
   if (BufSize > 0 && Data) {
      cMutexLock MutexLock(&caDescriptorsMutex);
      int length = 0;
-     do {
-        for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
-            if (d->source == Source && d->transponder == Transponder && d->serviceId == ServiceId && d->caSystem == *CaSystemIds) {
-               if (length + d->Length() <= BufSize) {
-                  memcpy(Data + length, d->Data(), d->Length());
-                  length += d->Length();
+     for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
+         if (d->source == Source && d->transponder == Transponder && d->serviceId == ServiceId) {
+            const unsigned short *caids = CaSystemIds;
+            do {
+               if (d->caSystem == *caids) {
+                  if (length + d->Length() <= BufSize) {
+                     memcpy(Data + length, d->Data(), d->Length());
+                     length += d->Length();
+                     }
+                  else
+                     return -1;
                   }
-               else
-                  return -1;
-               }
+               } while (*++caids);
             }
-        } while (*++CaSystemIds);
+         }
      return length;
      }
   return -1;