From 6e982f765eb538e16cfe2fe0320edbe20073c701 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 30 Oct 2005 13:21:23 +0100 Subject: [PATCH] Fixed lock handling in CAM communication to avoid problems with multiple CAMs per device or CAMs with more than one smart card --- HISTORY | 2 ++ ci.c | 49 +++++++++++++++++++++++++++++-------------------- ci.h | 8 +++++--- 3 files changed, 36 insertions(+), 23 deletions(-) diff --git a/HISTORY b/HISTORY index b8111c34..bef49c6b 100644 --- a/HISTORY +++ b/HISTORY @@ -3905,3 +3905,5 @@ Video Disk Recorder Revision History - Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Added missing mutex locks to cCiMenu::Abort() and cCiEnquiry::Abort() (reported by Marco Schlüßler). +- Fixed lock handling in CAM communication to avoid problems with multiple CAMs + per device or CAMs with more than one smart card. diff --git a/ci.c b/ci.c index 542e318e..4e63fde4 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.37 2005/10/30 10:24:38 kls Exp $ + * $Id: ci.c 1.38 2005/10/30 13:04:10 kls Exp $ */ #include "ci.h" @@ -156,7 +156,7 @@ public: uint8_t Status(void); int Write(int fd); int Read(int fd); - void Dump(bool Outgoing); + void Dump(int fd, bool Outgoing); }; cTPDU::cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length, const uint8_t *Data) @@ -207,9 +207,9 @@ cTPDU::cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length, const uint8_t int cTPDU::Write(int fd) { - Dump(true); + Dump(fd, true); if (size) - return write(fd, data, size) == size ? OK : ERROR; + return safe_write(fd, data, size) == size ? OK : ERROR; esyslog("ERROR: attemp to write TPDU with zero size"); return ERROR; } @@ -222,20 +222,20 @@ int cTPDU::Read(int fd) size = 0; return ERROR; } - Dump(false); + Dump(fd, false); return OK; } -void cTPDU::Dump(bool Outgoing) +void cTPDU::Dump(int fd, bool Outgoing) { if (DumpTPDUDataTransfer) { #define MAX_DUMP 256 - fprintf(stderr, "%s ", Outgoing ? "-->" : "<--"); + fprintf(stderr, "%2d %s ", fd, Outgoing ? "-->" : "<--"); for (int i = 0; i < size && i < MAX_DUMP; i++) fprintf(stderr, "%02X ", data[i]); fprintf(stderr, "%s\n", size >= MAX_DUMP ? "..." : ""); if (!Outgoing) { - fprintf(stderr, " "); + fprintf(stderr, " "); for (int i = 0; i < size && i < MAX_DUMP; i++) fprintf(stderr, "%2c ", isprint(data[i]) ? data[i] : '.'); fprintf(stderr, "%s\n", size >= MAX_DUMP ? "..." : ""); @@ -1048,12 +1048,12 @@ cCiMMI::cCiMMI(int SessionId, cCiTransportConnection *Tc) cCiMMI::~cCiMMI() { if (fetchedMenu) { - cMutexLock MutexLock(&fetchedMenu->mutex); + cMutexLock MutexLock(fetchedMenu->mutex); fetchedMenu->mmi = NULL; } delete menu; if (fetchedEnquiry) { - cMutexLock MutexLock(&fetchedEnquiry->mutex); + cMutexLock MutexLock(fetchedEnquiry->mutex); fetchedEnquiry->mmi = NULL; } delete enquiry; @@ -1227,7 +1227,7 @@ cCiMenu::cCiMenu(cCiMMI *MMI, bool Selectable) cCiMenu::~cCiMenu() { - cMutexLock MutexLock(&mutex); + cMutexLock MutexLock(mutex); if (mmi) mmi->Menu(true); free(titleText); @@ -1254,7 +1254,8 @@ bool cCiMenu::HasUpdate(void) bool cCiMenu::Select(int Index) { - cMutexLock MutexLock(&mutex); + cMutexLock MutexLock(mutex); + dbgprotocol("%d: ==> Select %d\n", mmi ? mmi->SessionId() : -1, Index); if (mmi && -1 <= Index && Index < numEntries) return mmi->SendMenuAnswer(Index + 1); return false; @@ -1267,7 +1268,7 @@ bool cCiMenu::Cancel(void) bool cCiMenu::Abort(void) { - cMutexLock MutexLock(&mutex); + cMutexLock MutexLock(mutex); return mmi && mmi->SendCloseMMI(); } @@ -1283,7 +1284,7 @@ cCiEnquiry::cCiEnquiry(cCiMMI *MMI) cCiEnquiry::~cCiEnquiry() { - cMutexLock MutexLock(&mutex); + cMutexLock MutexLock(mutex); if (mmi) mmi->Enquiry(true); free(text); @@ -1291,7 +1292,7 @@ cCiEnquiry::~cCiEnquiry() bool cCiEnquiry::Reply(const char *s) { - cMutexLock MutexLock(&mutex); + cMutexLock MutexLock(mutex); return mmi ? mmi->SendAnswer(s) : false; } @@ -1302,7 +1303,7 @@ bool cCiEnquiry::Cancel(void) bool cCiEnquiry::Abort(void) { - cMutexLock MutexLock(&mutex); + cMutexLock MutexLock(mutex); return mmi && mmi->SendCloseMMI(); } @@ -1619,8 +1620,12 @@ cCiMenu *cCiHandler::GetMenu(void) cMutexLock MutexLock(&mutex); for (int Slot = 0; Slot < numSlots; Slot++) { cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI, Slot); - if (mmi) - return mmi->Menu(); + if (mmi) { + cCiMenu *Menu = mmi->Menu(); + if (Menu) + Menu->mutex = &mutex; + return Menu; + } } return NULL; } @@ -1630,8 +1635,12 @@ cCiEnquiry *cCiHandler::GetEnquiry(void) cMutexLock MutexLock(&mutex); for (int Slot = 0; Slot < numSlots; Slot++) { cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI, Slot); - if (mmi) - return mmi->Enquiry(); + if (mmi) { + cCiEnquiry *Enquiry = mmi->Enquiry(); + if (Enquiry) + Enquiry->mutex = &mutex; + return Enquiry; + } } return NULL; } diff --git a/ci.h b/ci.h index 6c35e6f0..ae760155 100644 --- a/ci.h +++ b/ci.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: ci.h 1.17 2005/10/03 12:49:52 kls Exp $ + * $Id: ci.h 1.18 2005/10/30 12:31:14 kls Exp $ */ #ifndef __CI_H @@ -17,11 +17,12 @@ class cCiMMI; class cCiMenu { + friend class cCiHandler; friend class cCiMMI; private: enum { MAX_CIMENU_ENTRIES = 64 }; ///< XXX is there a specified maximum? cCiMMI *mmi; - cMutex mutex; + cMutex *mutex; bool selectable; char *titleText; char *subTitleText; @@ -45,10 +46,11 @@ public: }; class cCiEnquiry { + friend class cCiHandler; friend class cCiMMI; private: cCiMMI *mmi; - cMutex mutex; + cMutex *mutex; char *text; bool blind; int expectedLength;