From 13249f12f2610c780605b496c68e2db44fc0e37e Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 17 Sep 2005 12:08:54 +0200 Subject: [PATCH] Fixed error handling in cCiTransportConnection::RecvTPDU() --- CONTRIBUTORS | 1 + HISTORY | 2 ++ ci.c | 6 +++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 0239a0cc..7fdaf60d 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1434,6 +1434,7 @@ Georg Acher '& 0xff' in CRC32::crc32() of libsi/util.c for suggesting to reduce the priority of the section handler threads for a patch that was used to implement a hash for the channels + for reporting a problem with error handling in cCiTransportConnection::RecvTPDU() Henrik Niehaus for reporting a problem with timers with a day given as MTWTF--@6, i.e. a repeating diff --git a/HISTORY b/HISTORY index d0aeea35..541c5803 100644 --- a/HISTORY +++ b/HISTORY @@ -3819,3 +3819,5 @@ Video Disk Recorder Revision History for reporting this one). - Fixed handling key macros with keys after @plugin (thanks to Rolf Ahrenberg for reporting this one). +- Fixed error handling in cCiTransportConnection::RecvTPDU() (thanks to Georg Acher + for reporting this one). diff --git a/ci.c b/ci.c index 94a5cd63..4e341d75 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.27 2005/08/21 14:10:27 kls Exp $ + * $Id: ci.c 1.28 2005/09/17 11:43:08 kls Exp $ */ #include "ci.h" @@ -358,8 +358,8 @@ int cCiTransportConnection::RecvTPDU(void) break; } } - else { - esyslog("ERROR: CAM: Read failed: slot %d, tcid %d\n", slot, tcid); + else if (FATALERRNO) { + esyslog("ERROR: CAM: Read failed: slot %d, tcid %d - %m\n", slot, tcid); Init(-1, slot, tcid); } return lastResponse;