Now only those Ca descriptors are sent to a CAM that are actually understood by that CAM

1 files changed, 31 insertions, 12 deletions

diff --git a/ci.c b/ci.c
index a3d64df3..8f38ee4e 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.9 2003/03/23 15:18:40 kls Exp $
+ * $Id: ci.c 1.10 2003/04/18 12:48:49 kls Exp $
  */
 
 /* XXX TODO
@@ -769,7 +769,7 @@ public:
 cCiApplicationInformation::cCiApplicationInformation(int SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_APPLICATION_INFORMATION, Tc)
 {
-  dbgprotocol("New Aplication Information (session id %d)\n", SessionId);
+  dbgprotocol("New Application Information (session id %d)\n", SessionId);
   state = 0;
   creationTime = time(NULL);
   menuString = NULL;
@@ -827,12 +827,17 @@ bool cCiApplicationInformation::EnterMenu(void)
 
 // --- cCiConditionalAccessSupport -------------------------------------------
 
+#define MAXCASYSTEMIDS 16
+
 class cCiConditionalAccessSupport : public cCiSession {
 private:
   int state;
+  int numCaSystemIds;
+  unsigned short caSystemIds[MAXCASYSTEMIDS + 1]; // list is zero terminated!
 public:
   cCiConditionalAccessSupport(int SessionId, cCiTransportConnection *Tc);
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  const unsigned short *GetCaSystemIds(void) { return caSystemIds; }
   bool SendPMT(cCiCaPmt &CaPmt);
   };
 
@@ -841,6 +846,7 @@ cCiConditionalAccessSupport::cCiConditionalAccessSupport(int SessionId, cCiTrans
 {
   dbgprotocol("New Conditional Access Support (session id %d)\n", SessionId);
   state = 0;
+  caSystemIds[numCaSystemIds = 0] = 0;
 }
 
 bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
@@ -853,9 +859,16 @@ bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
             int l = 0;
             const uint8_t *d = GetData(Data, l);
             while (l > 1) {
-                  dbgprotocol(" %04X", ((unsigned int)(*d) << 8) | *(d + 1));
+                  unsigned short id = ((unsigned short)(*d) << 8) | *(d + 1);
+                  dbgprotocol(" %04X", id);
                   d += 2;
                   l -= 2;
+                  if (numCaSystemIds < MAXCASYSTEMIDS) {
+                     caSystemIds[numCaSystemIds++] = id;
+                     caSystemIds[numCaSystemIds] = 0;
+                     }
+                  else
+                     esyslog("ERROR: too many CA system IDs!");
                   }
             dbgprotocol("\n");
             }
@@ -1274,6 +1287,7 @@ cCiHandler::cCiHandler(int Fd, int NumSlots)
 {
   numSlots = NumSlots;
   enabled = true;
+  newCaSupport = false;
   for (int i = 0; i < MAX_CI_SESSION; i++)
       sessions[i] = NULL;
   tpl = new cCiTransportLayer(Fd, numSlots);
@@ -1358,7 +1372,8 @@ cCiSession *cCiHandler::CreateSession(int ResourceId)
             switch (ResourceId) {
               case RI_RESOURCE_MANAGER:           return sessions[i] = new cCiResourceManager(i + 1, tc);
               case RI_APPLICATION_INFORMATION:    return sessions[i] = new cCiApplicationInformation(i + 1, tc);
-              case RI_CONDITIONAL_ACCESS_SUPPORT: return sessions[i] = new cCiConditionalAccessSupport(i + 1, tc);
+              case RI_CONDITIONAL_ACCESS_SUPPORT: newCaSupport = true;
+                                                  return sessions[i] = new cCiConditionalAccessSupport(i + 1, tc);
               case RI_HOST_CONTROL:               break; //XXX
               case RI_DATE_TIME:                  return sessions[i] = new cCiDateTime(i + 1, tc);
               case RI_MMI:                        return sessions[i] = new cCiMMI(i + 1, tc);
@@ -1470,6 +1485,8 @@ bool cCiHandler::Process(void)
       if (sessions[i])
          sessions[i]->Process();
       }
+  if (newCaSupport)
+     newCaSupport = result = false; // triggers new SetCaPmt at caller!
   return result;
 }
 
@@ -1502,16 +1519,18 @@ cCiEnquiry *cCiHandler::GetEnquiry(void)
   return NULL;
 }
 
-bool cCiHandler::SetCaPmt(cCiCaPmt &CaPmt)
+const unsigned short *cCiHandler::GetCaSystemIds(int Slot)
 {
   cMutexLock MutexLock(&mutex);
-  bool result = false;
-  for (int Slot = 0; Slot < numSlots; Slot++) {
-      cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
-      if (cas)
-         result |= cas->SendPMT(CaPmt);
-      }
-  return result;
+  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
+  return cas ? cas->GetCaSystemIds() : NULL;
+}
+
+bool cCiHandler::SetCaPmt(cCiCaPmt &CaPmt, int Slot)
+{
+  cMutexLock MutexLock(&mutex);
+  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
+  return cas && cas->SendPMT(CaPmt);
 }
 
 bool cCiHandler::Reset(int Slot)