Version 1.1.21vdr-1.1.21

- Fixed the 'channels.conf' entries for "Studio Universal" and "Disney Channel".
- Fixed handling channels in the "Channels" menu in case there are ':@nnn' group
  separators without names (thanks to Guy Roussin for reporting this one).
- The SVDRP command CHAN now also accepts channel IDs.
- Increased the timeout until an index file is considerd no longer to be written
  (sometimes in time shift with heavy system load the index file was closed too
  early by the replay thread).
- Implemented "Link Layer" based CAM support, which hopefully will solve the
  problems with CAMs we had in the past. To use this you need the driver version
  2002-01-08 or higher (with the new firmware supporting the "Link Layer" protocol).
- Added an EPG bugfix that moves the Subtitle data to the Extended Description in
  case the latter is empty and the Subtitle exceeds some useful length.
- Since several channels put very long strings into the Subtitle part of their
  EPG data, that string is now limited in length when used in a recording's
  file name.

21 files changed, 2196 insertions, 53 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 86ca1e7..1454c7d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -494,6 +494,8 @@ Andreas Kool <akool@akool.de>
 
 Guy Roussin <guy.roussin@teledetection.fr>
  for suggesting not to display channel group delimiters without text
+ for reporting a bug in handling channels in the "Channels" menu in case there are
+ ':@nnn' group separators without names
 
 Georg Hitsch <georg@hitsch.at>
  for his help in keeping 'channels.conf' up to date
diff --git a/HISTORY b/HISTORY
index 1b76bf4..e92eff1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1898,3 +1898,21 @@ Video Disk Recorder Revision History
   for providing an initial 'Doxyfile' configuration and adjusting some comments).
   See INSTALL for information how to do this. Some function descriptions have
   already been adapted to Doxygen, more will follow.
+
+2003-01-10: Version 1.1.21
+
+- Fixed the 'channels.conf' entries for "Studio Universal" and "Disney Channel".
+- Fixed handling channels in the "Channels" menu in case there are ':@nnn' group
+  separators without names (thanks to Guy Roussin for reporting this one).
+- The SVDRP command CHAN now also accepts channel IDs.
+- Increased the timeout until an index file is considerd no longer to be written
+  (sometimes in time shift with heavy system load the index file was closed too
+  early by the replay thread).
+- Implemented "Link Layer" based CAM support, which hopefully will solve the
+  problems with CAMs we had in the past. To use this you need the driver version
+  2002-01-08 or higher (with the new firmware supporting the "Link Layer" protocol).
+- Added an EPG bugfix that moves the Subtitle data to the Extended Description in
+  case the latter is empty and the Subtitle exceeds some useful length.
+- Since several channels put very long strings into the Subtitle part of their
+  EPG data, that string is now limited in length when used in a recording's
+  file name.
diff --git a/Makefile b/Makefile
index d1e17a7..efeed0d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.55 2002/12/15 15:15:55 kls Exp $
+# $Id: Makefile 1.56 2003/01/06 12:28:09 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -32,7 +32,7 @@ INCLUDES = -I$(DVBDIR)/include
 
 DTVLIB   = $(DTVDIR)/libdtv.a
 
-OBJS = audio.o channels.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd.o\
+OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd.o\
        dvbplayer.o dvbspu.o eit.o eitscan.o font.o i18n.o interface.o keys.o\
        lirc.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o rcu.o\
        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sources.o\
diff --git a/channels.conf b/channels.conf
index f6b273c..f01251e 100644
--- a/channels.conf
+++ b/channels.conf
@@ -54,9 +54,9 @@ Premiere 5:11797:h:S19.2E:27500:1279:1280:0:101:29:0:0:0
 Premiere 6:11797:h:S19.2E:27500:1535:1536:0:101:41:0:0:0
 Premiere 7:11797:h:S19.2E:27500:1023:1024:0:101:20:0:0:0
 13th Street:11758:h:S19.2E:27500:2303:2304:0:101:42:0:0:0
-Studio Universal:12090:v:S19.2E:27500:255:256:0:101:36:0:0:0
+Studio Universal:11758:h:S19.2E:27500:2047:2048:0:101:36:0:0:0
 Premiere Serie:12031:h:S19.2E:27500:1023:1024:0:101:16:0:0:0
-Disney Channel:12090:v:S19.2E:27500:767:768:0:101:34:0:0:0
+Disney Channel:11758:h:S19.2E:27500:2559:2560:0:101:34:0:0:0
 Premiere Nostalgie:12031:h:S19.2E:27500:2559:2560:0:101:516:0:0:0
 Discovery Channel:12031:h:S19.2E:27500:1791:1792:0:101:14:0:0:0
 Planet:12090:v:S19.2E:27500:1279:1280:0:101:13:0:0:0
diff --git a/ci.c b/ci.c
new file mode 100644
index 0000000..d3812d6
--- /dev/null
+++ b/ci.c
@@ -0,0 +1,1449 @@
+/*
+ * ci.c: Common Interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: ci.c 1.1 2003/01/06 13:56:17 kls Exp $
+ */
+
+/* XXX TODO
+- handle slots separately
+- use return values
+- update CA descriptors in case they change
+- dynamically react on CAM insert/remove
+- implement CAM reset (per slot)
+- implement a CA enquiry menu with actual user input
+XXX*/
+
+#include "ci.h"
+#include <ctype.h>
+#include <linux/dvb/ca.h>
+#include <malloc.h>
+#include <netinet/in.h>
+#include <poll.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <time.h>
+#include <unistd.h>
+#include "tools.h"
+
+/* these might come in handy in case you want to use this code without VDR's other files:
+#ifndef MALLOC
+#define MALLOC(type, size)  (type *)malloc(sizeof(type) * (size))
+#endif
+
+#ifndef esyslog
+static int SysLogLevel = 3;
+#define esyslog(a...) void( (SysLogLevel > 0) ? void(fprintf(stderr, a)), void(fprintf(stderr, "\n")) : void() )
+#define isyslog(a...) void( (SysLogLevel > 1) ? void(fprintf(stderr, a)), void(fprintf(stderr, "\n")) : void() )
+#define dsyslog(a...) void( (SysLogLevel > 2) ? void(fprintf(stderr, a)), void(fprintf(stderr, "\n")) : void() )
+#endif
+*/
+
+// Set these to 'true' for debug output:
+static bool DumpTPDUDataTransfer = false;
+static bool DebugProtocol = false;
+
+#define dbgprotocol(a...) if (DebugProtocol) printf(a)
+
+#define OK       0
+#define TIMEOUT -1
+#define ERROR   -2
+
+// --- Workarounds -----------------------------------------------------------
+
+// The Irdeto AllCAM 4.7 (and maybe others, too) does not react on AOT_ENTER_MENU
+// during the first few seconds of a newly established connection
+#define WRKRND_TIME_BEFORE_ENTER_MENU  15 // seconds
+
+// --- Helper functions ------------------------------------------------------
+
+#define SIZE_INDICATOR 0x80
+
+static const uint8_t *GetLength(const uint8_t *Data, int &Length)
+///< Gets the length field from the beginning of Data.
+///< \return Returns a pointer to the first byte after the length and
+///< stores the length value in Length.
+{
+  Length = *Data++;
+  if ((Length & SIZE_INDICATOR) != 0) {
+     int l = Length & ~SIZE_INDICATOR;
+     Length = 0;
+     for (int i = 0; i < l; i++)
+         Length = (Length << 8) | *Data++;
+     }
+  return Data;
+}
+
+static uint8_t *SetLength(uint8_t *Data, int Length)
+///< Sets the length field at the beginning of Data.
+///< \return Returns a pointer to the first byte after the length.
+{
+  uint8_t *p = Data;
+  if (Length < 128)
+     *p++ = Length;
+  else {
+     int n = sizeof(Length);
+     for (int i = n - 1; i >= 0; i--) {
+         int b = (Length >> (8 * i)) & 0xFF;
+         if (p != Data || b)
+            *++p = b;
+         }
+     *Data = (p - Data) | SIZE_INDICATOR;
+     p++;
+     }
+  return p;
+}
+
+static char *CopyString(int Length, const uint8_t *Data)
+///< Copies the string at Data.
+///< \return Returns a pointer to a newly allocated string.
+{
+  char *s = MALLOC(char, Length + 1);
+  strncpy(s, (char *)Data, Length);
+  s[Length] = 0;
+  return s;
+}
+
+static char *GetString(int &Length, const uint8_t **Data)
+///< Gets the string at Data.
+///< \return Returns a pointer to a newly allocated string, or NULL in case of error.
+///< Upon return Length and Data represent the remaining data after the string has been skipped.
+{
+  if (Length > 0 && Data && *Data) {
+     int l = 0;
+     const uint8_t *d = GetLength(*Data, l);
+     char *s = CopyString(l, d);
+     Length -= d - *Data + l;
+     *Data = d + l;
+     return s;
+     }
+  return NULL;
+}
+
+// --- cTPDU -----------------------------------------------------------------
+
+#define MAX_TPDU_SIZE  2048
+#define MAX_TPDU_DATA  (MAX_TPDU_SIZE - 4)
+
+#define DATA_INDICATOR 0x80
+
+#define T_SB           0x80
+#define T_RCV          0x81
+#define T_CREATE_TC    0x82
+#define T_CTC_REPLY    0x83
+#define T_DELETE_TC    0x84
+#define T_DTC_REPLY    0x85
+#define T_REQUEST_TC   0x86
+#define T_NEW_TC       0x87
+#define T_TC_ERROR     0x88
+#define T_DATA_LAST    0xA0
+#define T_DATA_MORE    0xA1
+
+class cTPDU {
+private:
+  int size;
+  uint8_t data[MAX_TPDU_SIZE];
+  const uint8_t *GetData(const uint8_t *Data, int &Length);
+public:
+  cTPDU(void) { size = 0; }
+  cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length = 0, const uint8_t *Data = NULL);
+  uint8_t Slot(void) { return data[0]; }
+  uint8_t Tcid(void) { return data[1]; }
+  uint8_t Tag(void)  { return data[2]; }
+  const uint8_t *Data(int &Length) { return GetData(data + 3, Length); }
+  uint8_t Status(void);
+  int Write(int fd);
+  int Read(int fd);
+  void Dump(bool Outgoing);
+  };
+
+cTPDU::cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length, const uint8_t *Data)
+{
+  size = 0;
+  data[0] = Slot;
+  data[1] = Tcid;
+  data[2] = Tag;
+  switch (Tag) {
+    case T_RCV:
+    case T_CREATE_TC:
+    case T_CTC_REPLY:
+    case T_DELETE_TC:
+    case T_DTC_REPLY:
+    case T_REQUEST_TC:
+         data[3] = 1; // length
+         data[4] = Tcid;
+         size = 5;
+         break;
+    case T_NEW_TC:
+    case T_TC_ERROR:
+         if (Length == 1) {
+            data[3] = 2; // length
+            data[4] = Tcid;
+            data[5] = Data[0];
+            size = 6;
+            }
+         else
+            esyslog("ERROR: illegal data length for TPDU tag 0x%02X: %d", Tag, Length);
+         break;
+    case T_DATA_LAST:
+    case T_DATA_MORE:
+         if (Length <= MAX_TPDU_DATA) {
+            uint8_t *p = data + 3;
+            p = SetLength(p, Length + 1);
+            *p++ = Tcid;
+            if (Length)
+               memcpy(p, Data, Length);
+            size = Length + (p - data);
+            }
+         else
+            esyslog("ERROR: illegal data length for TPDU tag 0x%02X: %d", Tag, Length);
+         break;
+    default:
+         esyslog("ERROR: unknown TPDU tag: 0x%02X", Tag);
+    }
+ }
+
+int cTPDU::Write(int fd)
+{
+  Dump(true);
+  if (size)
+     return write(fd, data, size) == size ? OK : ERROR;
+  esyslog("ERROR: attemp to write TPDU with zero size");
+  return ERROR;
+}
+
+int cTPDU::Read(int fd)
+{
+  size = read(fd, data, sizeof(data));
+  if (size < 0) {
+     esyslog("ERROR: %m");
+     size = 0;
+     return ERROR;
+     }
+  Dump(false);
+  return OK;
+}
+
+void cTPDU::Dump(bool Outgoing)
+{
+  if (DumpTPDUDataTransfer) {
+#define MAX_DUMP 256
+     printf("%s ", Outgoing ? "-->" : "<--");
+     for (int i = 0; i < size && i < MAX_DUMP; i++)
+         printf("%02X ", data[i]);
+     printf("%s\n", size >= MAX_DUMP ? "..." : "");
+     if (!Outgoing) {
+        printf("   ");
+        for (int i = 0; i < size && i < MAX_DUMP; i++)
+            printf("%2c ", isprint(data[i]) ? data[i] : '.');
+        printf("%s\n", size >= MAX_DUMP ? "..." : "");
+        }
+     }
+}
+
+const uint8_t *cTPDU::GetData(const uint8_t *Data, int &Length)
+{
+  if (size) {
+     Data = GetLength(Data, Length);
+     if (Length) {
+        Length--; // the first byte is always the tcid
+        return Data + 1;
+        }
+     }
+  return NULL;
+}
+
+uint8_t cTPDU::Status(void)
+{
+  if (size >= 4 && data[size - 4] == T_SB && data[size - 3] == 2) {
+     //XXX test tcid???
+     return data[size - 1];
+     }
+  return 0;
+}
+
+// --- cCiTransportConnection ------------------------------------------------
+
+enum eState { stIDLE, stCREATION, stACTIVE, stDELETION };
+
+class cCiTransportConnection {
+  friend class cCiTransportLayer;
+private:
+  int fd;
+  uint8_t slot;
+  uint8_t tcid;
+  eState state;
+  cTPDU *tpdu;
+  int lastResponse;
+  bool dataAvailable;
+  void Init(int Fd, uint8_t Slot, uint8_t Tcid);
+  int SendTPDU(uint8_t Tag, int Length = 0, const uint8_t *Data = NULL);
+  int RecvTPDU(void);
+  int CreateConnection(void);
+  int Poll(void);
+  eState State(void) { return state; }
+  int LastResponse(void) { return lastResponse; }
+  bool DataAvailable(void) { return dataAvailable; }
+public:
+  cCiTransportConnection(void);
+  ~cCiTransportConnection();
+  int SendData(int Length, const uint8_t *Data);
+  int RecvData(void);
+  const uint8_t *Data(int &Length);
+  //XXX Close()
+  };
+
+cCiTransportConnection::cCiTransportConnection(void)
+{
+  tpdu = NULL;
+  Init(-1, 0, 0);
+}
+
+cCiTransportConnection::~cCiTransportConnection()
+{
+  delete tpdu;
+}
+
+void cCiTransportConnection::Init(int Fd, uint8_t Slot, uint8_t Tcid)
+{
+  fd = Fd;
+  slot = Slot;
+  tcid = Tcid;
+  state = stIDLE;
+  if (fd >= 0 && !tpdu)
+     tpdu = new cTPDU;
+  lastResponse = ERROR;
+  dataAvailable = false;
+//XXX Clear()???
+}
+
+int cCiTransportConnection::SendTPDU(uint8_t Tag, int Length, const uint8_t *Data)
+{
+  cTPDU TPDU(slot, tcid, Tag, Length, Data);
+  return TPDU.Write(fd);
+}
+
+int cCiTransportConnection::RecvTPDU(void)
+{
+  //XXX poll, timeout???
+  struct pollfd pfd[1];
+  pfd[0].fd = fd;
+  pfd[0].events = POLLIN;
+  if (poll(pfd, 1, 3500/*XXX*/) && (pfd[0].revents & POLLIN))//XXX
+  if (tpdu->Read(fd) == OK && tpdu->Tcid() == tcid) {
+     switch (state) {
+       case stIDLE:     break;
+       case stCREATION: if (tpdu->Tag() == T_CTC_REPLY) {
+                           dataAvailable = tpdu->Status() & DATA_INDICATOR;
+                           state = stACTIVE;
+                           return tpdu->Tag();
+                           }
+                        break;
+       case stACTIVE:   switch (tpdu->Tag()) {
+                          case T_SB:
+                          case T_DATA_LAST:
+                          case T_DATA_MORE:
+                          case T_REQUEST_TC: break;
+                          case T_DELETE_TC:  if (SendTPDU(T_DTC_REPLY) != OK)
+                                                return ERROR;
+                                             Init(fd, slot, tcid);
+                                             break;
+                          default: return ERROR;
+                          }
+                        dataAvailable = tpdu->Status() & DATA_INDICATOR;
+                        return tpdu->Tag();
+                        break;
+       case stDELETION: if (tpdu->Tag() == T_DTC_REPLY) {
+                           Init(fd, slot, tcid);
+                           //XXX Status()???
+                           return tpdu->Tag();
+                           }
+                        break;
+       }
+     }
+  return ERROR;
+}
+
+int cCiTransportConnection::SendData(int Length, const uint8_t *Data)
+{
+  while (state == stACTIVE && Length > 0) {
+        uint8_t Tag = T_DATA_LAST;
+        int l = Length;
+        if (l > MAX_TPDU_DATA) {
+           Tag = T_DATA_MORE;
+           l = MAX_TPDU_DATA;
+           }
+        if (SendTPDU(Tag, l, Data) != OK || RecvTPDU() != T_SB)
+           break;
+        Length -= l;
+        Data += l;
+        }
+  return Length ? ERROR : OK;
+}
+
+int cCiTransportConnection::RecvData(void)
+{
+  if (SendTPDU(T_RCV) == OK) {
+     if (RecvTPDU() == OK) {
+        //XXX
+        }
+     }
+  return ERROR;
+}
+
+const uint8_t *cCiTransportConnection::Data(int &Length)
+{
+  return tpdu->Data(Length);
+}
+
+int cCiTransportConnection::CreateConnection(void)
+{
+  if (state == stIDLE) {
+     if (SendTPDU(T_CREATE_TC) == OK) {
+        state = stCREATION;
+        return OK;
+        }
+     }
+  return ERROR;
+}
+
+int cCiTransportConnection::Poll(void)
+{
+  if (state == stACTIVE) {
+     if (SendTPDU(T_DATA_LAST) == OK) {
+        return lastResponse = RecvTPDU();
+        }
+     }
+  return ERROR;
+}
+
+// --- cCiTransportLayer -----------------------------------------------------
+
+#define MAX_CI_CONNECT  16 // maximum possible value is 254
+
+class cCiTransportLayer {
+private:
+  int fd;
+  int numSlots;
+  cCiTransportConnection tc[MAX_CI_CONNECT];
+  bool ResetSlot(int Slot);
+public:
+  cCiTransportLayer(int Fd, int NumSlots);
+  cCiTransportConnection *NewConnection(void);
+  int Process(void);
+  };
+
+cCiTransportLayer::cCiTransportLayer(int Fd, int NumSlots)
+{
+  fd = Fd;
+  numSlots = NumSlots;
+  for (int s = 0; s < numSlots; s++)
+      ResetSlot(s);
+  for (int i = 0; i < MAX_CI_CONNECT; i++)
+      tc[i].Init(fd, 0/*XXX*/, i + 1);
+}
+
+cCiTransportConnection *cCiTransportLayer::NewConnection(void)
+{
+  for (int i = 0; i < MAX_CI_CONNECT; i++) {
+      if (tc[i].State() == stIDLE) {
+         if (tc[i].CreateConnection() == OK) {
+            if (tc[i].RecvTPDU() == T_CTC_REPLY)
+               return &tc[i];
+            }
+         break;
+         }
+      }
+  return NULL;
+}
+
+#define CA_RESET_TIMEOUT  2 // seconds
+
+bool cCiTransportLayer::ResetSlot(int Slot)
+{
+  ca_slot_info_t sinfo;
+  sinfo.num = Slot;
+  ioctl(fd, CA_RESET, Slot);
+  time_t t0 = time(NULL);
+  do {
+     ioctl(fd, CA_GET_SLOT_INFO, &sinfo);
+     if ((sinfo.flags & CA_CI_MODULE_READY) != 0)
+        return true;
+     } while (time(NULL) - t0 < CA_RESET_TIMEOUT);
+  return false;
+}
+
+int cCiTransportLayer::Process(void)
+{
+  for (int i = 0; i < MAX_CI_CONNECT; i++) {
+      cCiTransportConnection *Tc = &tc[i];
+      if (Tc->State() == stACTIVE) {
+         if (!Tc->DataAvailable()) {
+            if (Tc->Poll() != OK)
+               ;//XXX continue;
+            }
+         switch (Tc->LastResponse()) {
+           case T_REQUEST_TC:
+                //XXX
+                break;
+           case T_DATA_MORE:
+           case T_DATA_LAST:
+           case T_CTC_REPLY:
+           case T_SB:
+                if (Tc->DataAvailable())
+                   Tc->RecvData();
+                break;
+           case TIMEOUT:
+           case ERROR:
+           default:
+                //XXX Tc->state = stIDLE;//XXX Init()???
+                break;
+           }
+         }
+      }
+  return OK;
+}
+
+// -- cCiSession -------------------------------------------------------------
+
+// Session Tags:
+
+#define ST_SESSION_NUMBER           0x90
+#define ST_OPEN_SESSION_REQUEST     0x91
+#define ST_OPEN_SESSION_RESPONSE    0x92
+#define ST_CREATE_SESSION           0x93
+#define ST_CREATE_SESSION_RESPONSE  0x94
+#define ST_CLOSE_SESSION_REQUEST    0x95
+#define ST_CLOSE_SESSION_RESPONSE   0x96
+
+// Session Status:
+
+#define SS_OK             0x00
+#define SS_NOT_ALLOCATED  0xF0
+
+// Resource Identifiers:
+
+#define RI_RESOURCE_MANAGER            0x00010041
+#define RI_APPLICATION_INFORMATION     0x00020041
+#define RI_CONDITIONAL_ACCESS_SUPPORT  0x00030041
+#define RI_HOST_CONTROL                0x00200041
+#define RI_DATE_TIME                   0x00240041
+#define RI_MMI                         0x00400041
+
+// Application Object Tags:
+
+#define AOT_NONE                    0x000000
+#define AOT_PROFILE_ENQ             0x9F8010
+#define AOT_PROFILE                 0x9F8011
+#define AOT_PROFILE_CHANGE          0x9F8012
+#define AOT_APPLICATION_INFO_ENQ    0x9F8020
+#define AOT_APPLICATION_INFO        0x9F8021
+#define AOT_ENTER_MENU              0x9F8022
+#define AOT_CA_INFO_ENQ             0x9F8030
+#define AOT_CA_INFO                 0x9F8031
+#define AOT_CA_PMT                  0x9F8032
+#define AOT_CA_PMT_REPLY            0x9F8033
+#define AOT_TUNE                    0x9F8400
+#define AOT_REPLACE                 0x9F8401
+#define AOT_CLEAR_REPLACE           0x9F8402
+#define AOT_ASK_RELEASE             0x9F8403
+#define AOT_DATE_TIME_ENQ           0x9F8440
+#define AOT_DATE_TIME               0x9F8441
+#define AOT_CLOSE_MMI               0x9F8800
+#define AOT_DISPLAY_CONTROL         0x9F8801
+#define AOT_DISPLAY_REPLY           0x9F8802
+#define AOT_TEXT_LAST               0x9F8803
+#define AOT_TEXT_MORE               0x9F8804
+#define AOT_KEYPAD_CONTROL          0x9F8805
+#define AOT_KEYPRESS                0x9F8806
+#define AOT_ENQ                     0x9F8807
+#define AOT_ANSW                    0x9F8808
+#define AOT_MENU_LAST               0x9F8809
+#define AOT_MENU_MORE               0x9F880A
+#define AOT_MENU_ANSW               0x9F880B
+#define AOT_LIST_LAST               0x9F880C
+#define AOT_LIST_MORE               0x9F880D
+#define AOT_SUBTITLE_SEGMENT_LAST   0x9F880E
+#define AOT_SUBTITLE_SEGMENT_MORE   0x9F880F
+#define AOT_DISPLAY_MESSAGE         0x9F8810
+#define AOT_SCENE_END_MARK          0x9F8811
+#define AOT_SCENE_DONE              0x9F8812
+#define AOT_SCENE_CONTROL           0x9F8813
+#define AOT_SUBTITLE_DOWNLOAD_LAST  0x9F8814
+#define AOT_SUBTITLE_DOWNLOAD_MORE  0x9F8815
+#define AOT_FLUSH_DOWNLOAD          0x9F8816
+#define AOT_DOWNLOAD_REPLY          0x9F8817
+#define AOT_COMMS_CMD               0x9F8C00
+#define AOT_CONNECTION_DESCRIPTOR   0x9F8C01
+#define AOT_COMMS_REPLY             0x9F8C02
+#define AOT_COMMS_SEND_LAST         0x9F8C03
+#define AOT_COMMS_SEND_MORE         0x9F8C04
+#define AOT_COMMS_RCV_LAST          0x9F8C05
+#define AOT_COMMS_RCV_MORE          0x9F8C06
+
+class cCiSession {
+private:
+  int sessionId;
+  int resourceId;
+  cCiTransportConnection *tc;
+protected:
+  int GetTag(int &Length, const uint8_t **Data);
+  const uint8_t *GetData(const uint8_t *Data, int &Length);
+  int SendData(int Tag, int Length = 0, const uint8_t *Data = NULL);
+public:
+  cCiSession(int SessionId, int ResourceId, cCiTransportConnection *Tc);
+  virtual ~cCiSession();
+  int SessionId(void) { return sessionId; }
+  int ResourceId(void) { return resourceId; }
+  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  };
+
+cCiSession::cCiSession(int SessionId, int ResourceId, cCiTransportConnection *Tc)
+{
+  sessionId = SessionId;
+  resourceId = ResourceId;
+  tc = Tc;
+}
+
+cCiSession::~cCiSession()
+{
+}
+
+int cCiSession::GetTag(int &Length, const uint8_t **Data)
+///< Gets the tag at Data.
+///< \return Returns the actual tag, or AOT_NONE in case of error.
+///< Upon return Length and Data represent the remaining data after the tag has been skipped.
+{
+  if (Length >= 3 && Data && *Data) {
+     int t = 0;
+     for (int i = 0; i < 3; i++)
+         t = (t << 8) | *(*Data)++;
+     Length -= 3;
+     return t;
+     }
+  return AOT_NONE;
+}
+
+const uint8_t *cCiSession::GetData(const uint8_t *Data, int &Length)
+{
+  Data = GetLength(Data, Length);
+  return Length ? Data : NULL;
+}
+
+int cCiSession::SendData(int Tag, int Length, const uint8_t *Data)
+{
+  uint8_t buffer[2048];
+  uint8_t *p = buffer;
+  *p++ = ST_SESSION_NUMBER;
+  *p++ = 0x02;
+  *p++ = (sessionId >> 8) & 0xFF;
+  *p++ =  sessionId       & 0xFF;
+  *p++ = (Tag >> 16) & 0xFF;
+  *p++ = (Tag >>  8) & 0xFF;
+  *p++ =  Tag        & 0xFF;
+  p = SetLength(p, Length);
+  if (p - buffer + Length < sizeof(buffer)) {
+     memcpy(p, Data, Length);
+     p += Length;
+     return tc->SendData(p - buffer, buffer);
+     }
+  esyslog("ERROR: CAM: data length (%d) exceeds buffer size", Length);
+  return ERROR;
+}
+
+bool cCiSession::Process(int Length, const uint8_t *Data)
+{
+  return true;
+}
+
+// -- cCiResourceManager -----------------------------------------------------
+
+class cCiResourceManager : public cCiSession {
+private:
+  int state;
+public:
+  cCiResourceManager(int SessionId, cCiTransportConnection *Tc);
+  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  };
+
+cCiResourceManager::cCiResourceManager(int SessionId, cCiTransportConnection *Tc)
+:cCiSession(SessionId, RI_RESOURCE_MANAGER, Tc)
+{
+  dbgprotocol("New Resource Manager (session id %d)\n", SessionId);
+  state = 0;
+}
+
+bool cCiResourceManager::Process(int Length, const uint8_t *Data)
+{
+  if (Data) {
+     int Tag = GetTag(Length, &Data);
+     switch (Tag) {
+       case AOT_PROFILE_ENQ: {
+            dbgprotocol("%d: <== Profile Enquiry\n", SessionId());
+            int resources[] = { htonl(RI_RESOURCE_MANAGER),
+                                htonl(RI_APPLICATION_INFORMATION),
+                                htonl(RI_CONDITIONAL_ACCESS_SUPPORT),
+                                htonl(RI_DATE_TIME),
+                                htonl(RI_MMI)
+                              };
+            dbgprotocol("%d: ==> Profile\n", SessionId());
+            SendData(AOT_PROFILE, sizeof(resources), (uint8_t*)resources);
+            state = 3;
+            }
+            break;
+       case AOT_PROFILE: {
+            dbgprotocol("%d: <== Profile\n", SessionId());
+            if (state == 1) {
+               int l = 0;
+               const uint8_t *d = GetData(Data, l);
+               if (l > 0 && d)
+                  esyslog("CI resource manager: unexpected data");
+               dbgprotocol("%d: ==> Profile Change\n", SessionId());
+               SendData(AOT_PROFILE_CHANGE);
+               state = 2;
+               }
+            else {
+               esyslog("ERROR: CI resource manager: unexpected tag %06X in state %d", Tag, state);
+               }
+            }
+            break;
+       default: esyslog("ERROR: CI resource manager: unknown tag %06X", Tag);
+                return false;
+       }
+     }
+  else if (state == 0) {
+     dbgprotocol("%d: ==> Profile Enq\n", SessionId());
+     SendData(AOT_PROFILE_ENQ);
+     state = 1;
+     }
+  return true;
+}
+
+// --- cCiApplicationInformation ---------------------------------------------
+
+class cCiApplicationInformation : public cCiSession {
+private:
+  int state;
+  time_t creationTime;
+  uint8_t applicationType;
+  uint16_t applicationManufacturer;
+  uint16_t manufacturerCode;
+  char *menuString;
+public:
+  cCiApplicationInformation(int SessionId, cCiTransportConnection *Tc);
+  virtual ~cCiApplicationInformation();
+  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  bool EnterMenu(void);
+  };
+
+cCiApplicationInformation::cCiApplicationInformation(int SessionId, cCiTransportConnection *Tc)
+:cCiSession(SessionId, RI_APPLICATION_INFORMATION, Tc)
+{
+  dbgprotocol("New Aplication Information (session id %d)\n", SessionId);
+  state = 0;
+  creationTime = time(NULL);
+  menuString = NULL;
+}
+
+cCiApplicationInformation::~cCiApplicationInformation()
+{
+  free(menuString);
+}
+
+bool cCiApplicationInformation::Process(int Length, const uint8_t *Data)
+{
+  if (Data) {
+     int Tag = GetTag(Length, &Data);
+     switch (Tag) {
+       case AOT_APPLICATION_INFO: {
+            dbgprotocol("%d: <== Application Info\n", SessionId());
+            int l = 0;
+            const uint8_t *d = GetData(Data, l);
+            if ((l -= 1) < 0) break;
+            applicationType = *d++;
+            if ((l -= 2) < 0) break;
+            applicationManufacturer = ntohs(*(uint16_t *)d);
+            d += 2;
+            if ((l -= 2) < 0) break;
+            manufacturerCode = ntohs(*(uint16_t *)d);
+            d += 2;
+            free(menuString);
+            menuString = GetString(l, &d);
+            isyslog("CAM: %s, %02X, %04X, %04X", menuString, applicationType, applicationManufacturer, manufacturerCode);//XXX make externally accessible!
+            }
+            state = 2;
+            break;
+       default: esyslog("ERROR: CI application information: unknown tag %06X", Tag);
+                return false;
+       }
+     }
+  else if (state == 0) {
+     dbgprotocol("%d: ==> Application Info Enq\n", SessionId());
+     SendData(AOT_APPLICATION_INFO_ENQ);
+     state = 1;
+     }
+  return true;
+}
+
+bool cCiApplicationInformation::EnterMenu(void)
+{
+  if (state == 2 && time(NULL) - creationTime > WRKRND_TIME_BEFORE_ENTER_MENU) {
+     dbgprotocol("%d: ==> Enter Menu\n", SessionId());
+     SendData(AOT_ENTER_MENU);
+     return true;//XXX
+     }
+  return false;
+}
+
+// --- cCiConditionalAccessSupport -------------------------------------------
+
+class cCiConditionalAccessSupport : public cCiSession {
+private:
+  int state;
+public:
+  cCiConditionalAccessSupport(int SessionId, cCiTransportConnection *Tc);
+  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  bool SendPMT(cCiCaPmt &CaPmt);
+  };
+
+cCiConditionalAccessSupport::cCiConditionalAccessSupport(int SessionId, cCiTransportConnection *Tc)
+:cCiSession(SessionId, RI_CONDITIONAL_ACCESS_SUPPORT, Tc)
+{
+  dbgprotocol("New Conditional Access Support (session id %d)\n", SessionId);
+  state = 0;
+}
+
+bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
+{
+  if (state == 0) {
+     dbgprotocol("%d: ==> Ca Info Enq\n", SessionId());
+     SendData(AOT_CA_INFO_ENQ);
+     state = 1;
+     }
+  return true;
+}
+
+bool cCiConditionalAccessSupport::SendPMT(cCiCaPmt &CaPmt)
+{
+  if (state == 1) {
+     SendData(AOT_CA_PMT, CaPmt.length, CaPmt.capmt);
+     return true;
+     }
+  return false;
+}
+
+// --- cCiDateTime -----------------------------------------------------------
+
+class cCiDateTime : public cCiSession {
+private:
+  int interval;
+  time_t lastTime;
+  bool SendDateTime(void);
+public:
+  cCiDateTime(int SessionId, cCiTransportConnection *Tc);
+  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  };
+
+cCiDateTime::cCiDateTime(int SessionId, cCiTransportConnection *Tc)
+:cCiSession(SessionId, RI_DATE_TIME, Tc)
+{
+  interval = 0;
+  lastTime = 0;
+  dbgprotocol("New Date Time (session id %d)\n", SessionId);
+}
+
+bool cCiDateTime::SendDateTime(void)
+{
+  time_t t = time(NULL);
+  struct tm tm_gmt;
+  struct tm tm_loc;
+  if (gmtime_r(&t, &tm_gmt) && localtime_r(&t, &tm_loc)) {
+     int Y = tm_gmt.tm_year;
+     int M = tm_gmt.tm_mon + 1;
+     int D = tm_gmt.tm_mday;
+     int L = (M == 1 || M == 2) ? 1 : 0;
+     int MJD = 14956 + D + int((Y - L) * 365.25) + int((M + 1 + L * 12) * 30.6001);
+#define DEC2BCD(d) (((d / 10) << 4) + (d % 10))
+     struct tTime { unsigned short mjd; uint8_t h, m, s; short offset; };
+     tTime T = { mjd : htons(MJD), h : DEC2BCD(tm_gmt.tm_hour), m : DEC2BCD(tm_gmt.tm_min), s : DEC2BCD(tm_gmt.tm_sec), offset : htons(tm_loc.tm_gmtoff / 60) };
+     dbgprotocol("%d: ==> Date Time\n", SessionId());
+     SendData(AOT_DATE_TIME, 7, (uint8_t*)&T);
+     //XXX return value of all SendData() calls???
+     return true;
+     }
+  return false;
+}
+
+bool cCiDateTime::Process(int Length, const uint8_t *Data)
+{
+  if (Data) {
+     int Tag = GetTag(Length, &Data);
+     switch (Tag) {
+       case AOT_DATE_TIME_ENQ: {
+            interval = 0;
+            int l = 0;
+            const uint8_t *d = GetData(Data, l);
+            if (l > 0)
+               interval = *d;
+            dbgprotocol("%d: <== Date Time Enq, interval = %d\n", SessionId(), interval);
+            lastTime = time(NULL);
+            return SendDateTime();
+            }
+            break;
+       default: esyslog("ERROR: CI date time: unknown tag %06X", Tag);
+                return false;
+       }
+     }
+  else if (interval && time(NULL) - lastTime > interval) {
+     lastTime = time(NULL);
+     return SendDateTime();
+     }
+  return true;
+}
+
+// --- cCiMMI ----------------------------------------------------------------
+
+// Display Control Commands:
+
+#define DCC_SET_MMI_MODE                          0x01
+#define DCC_DISPLAY_CHARACTER_TABLE_LIST          0x02
+#define DCC_INPUT_CHARACTER_TABLE_LIST            0x03
+#define DCC_OVERLAY_GRAPHICS_CHARACTERISTICS      0x04
+#define DCC_FULL_SCREEN_GRAPHICS_CHARACTERISTICS  0x05
+
+// MMI Modes:
+
+#define MM_HIGH_LEVEL                      0x01
+#define MM_LOW_LEVEL_OVERLAY_GRAPHICS      0x02
+#define MM_LOW_LEVEL_FULL_SCREEN_GRAPHICS  0x03
+
+// Display Reply IDs:
+
+#define DRI_MMI_MODE_ACK                              0x01
+#define DRI_LIST_DISPLAY_CHARACTER_TABLES             0x02
+#define DRI_LIST_INPUT_CHARACTER_TABLES               0x03
+#define DRI_LIST_GRAPHIC_OVERLAY_CHARACTERISTICS      0x04
+#define DRI_LIST_FULL_SCREEN_GRAPHIC_CHARACTERISTICS  0x05
+#define DRI_UNKNOWN_DISPLAY_CONTROL_CMD               0xF0
+#define DRI_UNKNOWN_MMI_MODE                          0xF1
+#define DRI_UNKNOWN_CHARACTER_TABLE                   0xF2
+
+// Enquiry Flags:
+
+#define EF_BLIND  0x01
+
+// Answer IDs:
+
+#define AI_CANCEL  0x00
+#define AI_ANSWER  0x01
+
+class cCiMMI : public cCiSession {
+private:
+  char *GetText(int &Length, const uint8_t **Data);
+  cCiMenu *menu;
+  cCiEnquiry *enquiry;
+public:
+  cCiMMI(int SessionId, cCiTransportConnection *Tc);
+  virtual ~cCiMMI();
+  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  cCiMenu *Menu(void);
+  cCiEnquiry *Enquiry(void);
+  bool SendMenuAnswer(uint8_t Selection);
+  bool SendAnswer(const char *Text);
+  };
+
+cCiMMI::cCiMMI(int SessionId, cCiTransportConnection *Tc)
+:cCiSession(SessionId, RI_MMI, Tc)
+{
+  dbgprotocol("New MMI (session id %d)\n", SessionId);
+  menu = NULL;
+  enquiry = NULL;
+}
+
+cCiMMI::~cCiMMI()
+{
+  delete menu;
+  delete enquiry;
+}
+
+char *cCiMMI::GetText(int &Length, const uint8_t **Data)
+///< Gets the text at Data.
+///< \return Returns a pointer to a newly allocated string, or NULL in case of error.
+///< Upon return Length and Data represent the remaining data after the text has been skipped.
+{
+  int Tag = GetTag(Length, Data);
+  if (Tag == AOT_TEXT_LAST) {
+     char *s = GetString(Length, Data);
+     dbgprotocol("%d: <== Text Last '%s'\n", SessionId(), s);
+     return s;
+     }
+  else
+     esyslog("CI MMI: unexpected text tag: %06X", Tag);
+  return NULL;
+}
+
+bool cCiMMI::Process(int Length, const uint8_t *Data)
+{
+  if (Data) {
+     int Tag = GetTag(Length, &Data);
+     switch (Tag) {
+       case AOT_DISPLAY_CONTROL: {
+            dbgprotocol("%d: <== Display Control\n", SessionId());
+            int l = 0;
+            const uint8_t *d = GetData(Data, l);
+            if (l > 0) {
+               switch (*d) {
+                 case DCC_SET_MMI_MODE:
+                      if (l == 2 && *++d == MM_HIGH_LEVEL) {
+                         struct tDisplayReply { uint8_t id; uint8_t mode; };
+                         tDisplayReply dr = { id : DRI_MMI_MODE_ACK, mode : MM_HIGH_LEVEL };
+                         dbgprotocol("%d: ==> Display Reply\n", SessionId());
+                         SendData(AOT_DISPLAY_REPLY, 2, (uint8_t *)&dr);
+                         }
+                      break;
+                 default: esyslog("CI MMI: unsupported display control command %02X", *d);
+                          return false;
+                 }
+               }
+            }
+            break;
+       case AOT_LIST_LAST:
+       case AOT_MENU_LAST: {
+            dbgprotocol("%d: <== Menu Last\n", SessionId());
+            delete menu;
+            menu = new cCiMenu(this, Tag == AOT_MENU_LAST);
+            int l = 0;
+            const uint8_t *d = GetData(Data, l);
+            if (l > 0) {
+               // since the specification allows choiceNb to be undefined it is useless, so let's just skip it:
+               d++;
+               l--;
+               if (l > 0) menu->titleText = GetText(l, &d);
+               if (l > 0) menu->subTitleText = GetText(l, &d);
+               if (l > 0) menu->bottomText = GetText(l, &d);
+               while (l > 0) {
+                     char *s = GetText(l, &d);
+                     if (s) {
+                        if (!menu->AddEntry(s))
+                           free(s);
+                        }
+                     else
+                        break;
+                     }
+               }
+            }
+            break;
+       case AOT_ENQ: {
+            dbgprotocol("%d: <== Enq\n", SessionId());
+            delete enquiry;
+            enquiry = new cCiEnquiry(this);
+            int l = 0;
+            const uint8_t *d = GetData(Data, l);
+            if (l > 0) {
+               uint8_t blind = *d++;
+               //XXX GetByte()???
+               l--;
+               enquiry->blind = blind & EF_BLIND;
+               enquiry->expectedLength = *d++;
+               l--;
+               // I really wonder why there is no text length field here...
+               enquiry->text = CopyString(l, d);
+               }
+            }
+            break;
+       default: esyslog("ERROR: CI MMI: unknown tag %06X", Tag);
+                return false;
+       }
+     }
+  return true;
+}
+
+cCiMenu *cCiMMI::Menu(void)
+{
+  cCiMenu *m = menu;
+  menu = NULL;
+  return m;
+}
+
+cCiEnquiry *cCiMMI::Enquiry(void)
+{
+  cCiEnquiry *e = enquiry;
+  enquiry = NULL;
+  return e;
+}
+
+bool cCiMMI::SendMenuAnswer(uint8_t Selection)
+{
+  dbgprotocol("%d: ==> Menu Answ\n", SessionId());
+  SendData(AOT_MENU_ANSW, 1, &Selection);
+  //XXX return value of all SendData() calls???
+  return true;
+}
+
+bool cCiMMI::SendAnswer(const char *Text)
+{
+  dbgprotocol("%d: ==> Answ\n", SessionId());
+  struct tAnswer { uint8_t id; char text[256]; };//XXX
+  tAnswer answer;
+  answer.id = Text ? AI_ANSWER : AI_CANCEL;
+  if (Text)
+     strncpy(answer.text, Text, sizeof(answer.text));
+  SendData(AOT_ANSW, Text ? strlen(Text) + 1 : 1, (uint8_t *)&answer);
+  //XXX return value of all SendData() calls???
+  return true;
+}
+
+// --- cCiMenu ---------------------------------------------------------------
+
+cCiMenu::cCiMenu(cCiMMI *MMI, bool Selectable)
+{
+  mmi = MMI;
+  selectable = Selectable;
+  titleText = subTitleText = bottomText = NULL;
+  numEntries = 0;
+}
+
+cCiMenu::~cCiMenu()
+{
+  free(titleText);
+  free(subTitleText);
+  free(bottomText);
+  for (int i = 0; i < numEntries; i++)
+      free(entries[i]);
+}
+
+bool cCiMenu::AddEntry(char *s)
+{
+  if (numEntries < MAX_CIMENU_ENTRIES) {
+     entries[numEntries++] = s;
+     return true;
+     }
+  return false;
+}
+
+bool cCiMenu::Select(int Index)
+{
+  if (mmi && -1 <= Index && Index < numEntries)
+     return mmi->SendMenuAnswer(Index + 1);
+  return false;
+}
+
+bool cCiMenu::Cancel(void)
+{
+  return Select(-1);
+}
+
+// --- cCiEnquiry ------------------------------------------------------------
+
+cCiEnquiry::cCiEnquiry(cCiMMI *MMI)
+{
+  mmi = MMI;
+  text = NULL;
+  blind = false;;
+  expectedLength = 0;;
+}
+
+cCiEnquiry::~cCiEnquiry()
+{
+  free(text);
+}
+
+bool cCiEnquiry::Reply(const char *s)
+{
+  return mmi ? mmi->SendAnswer(s) : false;
+}
+
+bool cCiEnquiry::Cancel(void)
+{
+  return Reply(NULL);
+}
+
+// --- cCiCaPmt --------------------------------------------------------------
+
+// Ca Pmt List Management:
+
+#define CPLM_MORE    0x00
+#define CPLM_FIRST   0x01
+#define CPLM_LAST    0x02
+#define CPLM_ONLY    0x03
+#define CPLM_ADD     0x04
+#define CPLM_UPDATE  0x05
+
+// Ca Pmt Cmd Ids:
+
+#define CPCI_OK_DESCRAMBLING  0x01
+#define CPCI_OK_MMI           0x02
+#define CPCI_QUERY            0x03
+#define CPCI_NOT_SELECTED     0x04
+
+cCiCaPmt::cCiCaPmt(int ProgramNumber)
+{
+  length = 0;
+  capmt[length++] = CPLM_ONLY;
+  capmt[length++] = (ProgramNumber >> 8) & 0xFF;
+  capmt[length++] =  ProgramNumber       & 0xFF;
+  capmt[length++] = 0x00; //XXX version_number, current_next_indicator - apparently may be 0x00
+  capmt[length++] = 0x00; //XXX program_info_length H (at program level)
+  capmt[length++] = 0x00; //XXX program_info_length L
+  esInfoLengthPos = 0;
+}
+
+void cCiCaPmt::AddPid(int Pid)
+{
+  capmt[length++] = 0x00; //XXX stream_type (apparently doesn't matter)
+  capmt[length++] = (Pid >> 8) & 0xFF;
+  capmt[length++] =  Pid       & 0xFF;
+  esInfoLengthPos = length;
+}
+
+void cCiCaPmt::AddCaDescriptor(int Length, uint8_t *Data)
+{
+  if (esInfoLengthPos) {
+     if (esInfoLengthPos == length) {
+        length += 2;
+        capmt[length++] = CPCI_OK_DESCRAMBLING;
+        }
+     if (length + Length < int(sizeof(capmt))) {
+        memcpy(capmt + length, Data, Length);
+        length += Length;
+        int l = length - esInfoLengthPos - 2;
+        capmt[esInfoLengthPos]     = (l >> 8) & 0xFF;
+        capmt[esInfoLengthPos + 1] =  l       & 0xFF;
+        }
+     else
+        esyslog("ERROR: buffer overflow in CA descriptor");
+     }
+  else
+     esyslog("ERROR: adding CA descriptor without Pid!");
+}
+
+// -- cCiHandler -------------------------------------------------------------
+
+cCiHandler::cCiHandler(int Fd, int NumSlots)
+{
+  numSlots = NumSlots;
+  for (int i = 0; i < MAX_CI_SESSION; i++)
+      sessions[i] = NULL;
+  tpl = new cCiTransportLayer(Fd, numSlots);
+  tc = tpl->NewConnection();
+  if (!tc)
+     isyslog("CAM: no CAM detected");
+}
+
+cCiHandler::~cCiHandler()
+{
+  for (int i = 0; i < MAX_CI_SESSION; i++)
+      delete sessions[i];
+  delete tpl;
+}
+
+cCiHandler *cCiHandler::CreateCiHandler(const char *FileName)
+{
+  int fd_ca = open(FileName, O_RDWR);
+  if (fd_ca >= 0) {
+     ca_caps_t Caps;
+     if (ioctl(fd_ca, CA_GET_CAP, &Caps) == 0) {
+        int NumSlots = Caps.slot_num;
+        if (NumSlots > 0) {
+           dsyslog("CAM: found %d CAM slots", NumSlots);
+           if (Caps.slot_type == CA_CI_LINK) {
+              cCiHandler *CiHandler = new cCiHandler(fd_ca, NumSlots);
+              // drive the initial data exchange:
+              for (int i = 0; i < 20; i++) //XXX make this dynamic???
+                  CiHandler->Process();
+              return CiHandler;
+              }
+           else
+              esyslog("ERROR: CAM doesn't support link layer interface");
+           }
+        esyslog("ERROR: no CAM slots found");
+        }
+     else
+        LOG_ERROR_STR(FileName);
+     }
+  return NULL;
+}
+
+int cCiHandler::ResourceIdToInt(const uint8_t *Data)
+{
+  return (ntohl(*(int *)Data));
+}
+
+bool cCiHandler::Send(uint8_t Tag, int SessionId, int ResourceId, int Status)
+{
+  uint8_t buffer[16];
+  uint8_t *p = buffer;
+  *p++ = Tag;
+  *p++ = 0x00; // will contain length
+  if (Status >= 0)
+     *p++ = Status;
+  if (ResourceId) {
+     *(int *)p = htonl(ResourceId);
+     p += 4;
+     }
+  *(short *)p = htons(SessionId);
+  p += 2;
+  buffer[1] = p - buffer - 2; // length
+  return tc->SendData(p - buffer, buffer) == OK;
+}
+
+cCiSession *cCiHandler::GetSessionBySessionId(int SessionId)
+{
+  for (int i = 0; i < MAX_CI_SESSION; i++) {
+      if (sessions[i] && sessions[i]->SessionId() == SessionId)
+         return sessions[i];
+      }
+  return NULL;
+}
+
+cCiSession *cCiHandler::GetSessionByResourceId(int ResourceId)
+{
+  for (int i = 0; i < MAX_CI_SESSION; i++) {
+      if (sessions[i] && sessions[i]->ResourceId() == ResourceId)
+         return sessions[i];
+      }
+  return NULL;
+}
+
+cCiSession *cCiHandler::CreateSession(int ResourceId)
+{
+  if (!GetSessionByResourceId(ResourceId)) {
+     for (int i = 0; i < MAX_CI_SESSION; i++) {
+         if (!sessions[i]) {
+            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_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);
+              }
+            }
+         }
+     }
+  return NULL;
+}
+
+bool cCiHandler::OpenSession(int Length, const uint8_t *Data)
+{
+  if (Length == 6 && *(Data + 1) == 0x04) {
+     int ResourceId = ResourceIdToInt(Data + 2);
+     dbgprotocol("OpenSession %08X\n", ResourceId);
+     switch (ResourceId) {
+       case RI_RESOURCE_MANAGER:
+       case RI_APPLICATION_INFORMATION:
+       case RI_CONDITIONAL_ACCESS_SUPPORT:
+       case RI_HOST_CONTROL:
+       case RI_DATE_TIME:
+       case RI_MMI:
+            {
+              cCiSession *Session = CreateSession(ResourceId);
+              if (Session) {
+                 Send(ST_OPEN_SESSION_RESPONSE, Session->SessionId(), Session->ResourceId(), SS_OK);
+                 return true;
+                 }
+              esyslog("ERROR: can't create session for resource identifier: %08X", ResourceId);
+            }
+       default: esyslog("ERROR: unknown resource identifier: %08X", ResourceId);
+       }
+     }
+  return false;
+}
+
+bool cCiHandler::CloseSession(int SessionId)
+{
+  dbgprotocol("CloseSession %08X\n", SessionId);
+  cCiSession *Session = GetSessionBySessionId(SessionId);
+  if (Session && sessions[SessionId - 1] == Session) {
+     delete Session;
+     sessions[SessionId - 1] = NULL;
+     Send(ST_CLOSE_SESSION_RESPONSE, SessionId, 0, SS_OK);
+     return true;
+     }
+  else {
+     esyslog("ERROR: unknown session id: %d", SessionId);
+     Send(ST_CLOSE_SESSION_RESPONSE, SessionId, 0, SS_NOT_ALLOCATED);
+     }
+  return false;
+}
+
+bool cCiHandler::Process(void)
+{
+  if (tc) {
+     cMutexLock MutexLock(&mutex);
+     if (tpl->Process() == OK) {
+        int Length;
+        const uint8_t *Data = tc->Data(Length);
+        if (Data && Length > 1) {
+           switch (*Data) {
+             case ST_SESSION_NUMBER:          if (Length > 4) {
+                                                 int SessionId = ntohs(*(short *)&Data[2]);
+                                                 cCiSession *Session = GetSessionBySessionId(SessionId);
+                                                 if (Session)
+                                                    return Session->Process(Length - 4, Data + 4);
+                                                 else {
+                                                    esyslog("ERROR: unknown session id: %d", SessionId);
+                                                    return false;
+                                                    }
+                                                 }
+                                              break;
+             case ST_OPEN_SESSION_REQUEST:    return OpenSession(Length, Data);
+             case ST_CLOSE_SESSION_REQUEST:   if (Length == 4)
+                                                 return CloseSession(ntohs(*(short *)&Data[2]));
+                                              break;
+             case ST_CREATE_SESSION_RESPONSE: //XXX fall through to default
+             case ST_CLOSE_SESSION_RESPONSE:  //XXX fall through to default
+             default: esyslog("ERROR: unknown session tag: %02X", *Data);
+                      return false;
+             }
+           return true;
+           }
+        for (int i = 0; i < MAX_CI_SESSION; i++) {
+            if (sessions[i])
+               sessions[i]->Process();//XXX retval???
+            }
+        }
+     }
+  return false;
+}
+
+bool cCiHandler::EnterMenu(void)
+{
+  cMutexLock MutexLock(&mutex);
+  //XXX slots???
+  cCiApplicationInformation *api = (cCiApplicationInformation *)GetSessionByResourceId(RI_APPLICATION_INFORMATION);
+  return api ? api->EnterMenu() : false;
+}
+
+cCiMenu *cCiHandler::GetMenu(void)
+{
+  cMutexLock MutexLock(&mutex);
+  //XXX slots???
+  cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI);
+  return mmi ? mmi->Menu() : NULL;
+}
+
+cCiEnquiry *cCiHandler::GetEnquiry(void)
+{
+  cMutexLock MutexLock(&mutex);
+  //XXX slots???
+  cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI);
+  return mmi ? mmi->Enquiry() : NULL;
+}
+
+bool cCiHandler::SetCaPmt(cCiCaPmt &CaPmt)
+{
+  cMutexLock MutexLock(&mutex);
+  //XXX slots???
+  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT);
+  return cas ? cas->SendPMT(CaPmt) : false;
+}
+
+bool cCiHandler::Reset(void)
+{
+  cMutexLock MutexLock(&mutex);
+  //XXX slots???
+  return false;//XXX not yet implemented
+}
diff --git a/ci.h b/ci.h
new file mode 100644
index 0000000..c9cd6f5
--- /dev/null
+++ b/ci.h
@@ -0,0 +1,105 @@
+/*
+ * ci.h: Common Interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: ci.h 1.1 2003/01/06 12:31:09 kls Exp $
+ */
+
+#ifndef __CI_H
+#define __CI_H
+
+#include <stdint.h>
+#include <stdio.h>
+#include "thread.h"
+
+class cCiMMI;
+
+class cCiMenu {
+  friend class cCiMMI;
+private:
+  enum { MAX_CIMENU_ENTRIES = 64 }; ///< XXX is there a specified maximum?
+  cCiMMI *mmi;
+  bool selectable;
+  char *titleText;
+  char *subTitleText;
+  char *bottomText;
+  char *entries[MAX_CIMENU_ENTRIES];
+  int numEntries;
+  bool AddEntry(char *s);
+  cCiMenu(cCiMMI *MMI, bool Selectable);
+public:
+  ~cCiMenu();
+  const char *TitleText(void) { return titleText; }
+  const char *SubTitleText(void) { return subTitleText; }
+  const char *BottomText(void) { return bottomText; }
+  const char *Entry(int n) { return n < numEntries ? entries[n] : NULL; }
+  int NumEntries(void) { return numEntries; }
+  bool Selectable(void) { return selectable; }
+  bool Select(int Index);
+  bool Cancel(void);
+  };
+
+class cCiEnquiry {
+  friend class cCiMMI;
+private:
+  cCiMMI *mmi;
+  char *text;
+  bool blind;
+  int expectedLength;
+  cCiEnquiry(cCiMMI *MMI);
+public:
+  ~cCiEnquiry();
+  const char *Text(void) { return text; }
+  bool Blind(void) { return blind; }
+  int ExpectedLength(void) { return expectedLength; }
+  bool Reply(const char *s);
+  bool Cancel(void);
+  };
+
+class cCiCaPmt {
+  friend class cCiConditionalAccessSupport;
+private:
+  int length;
+  int esInfoLengthPos;
+  uint8_t capmt[2048]; ///< XXX is there a specified maximum?
+public:
+  cCiCaPmt(int ProgramNumber);
+  void AddPid(int Pid);
+  void AddCaDescriptor(int Length, uint8_t *Data);
+  };
+
+#define MAX_CI_SESSION  16 //XXX
+
+class cCiSession;
+class cCiTransportLayer;
+class cCiTransportConnection;
+
+class cCiHandler {
+private:
+  cMutex mutex;
+  int numSlots;
+  cCiSession *sessions[MAX_CI_SESSION];
+  cCiTransportLayer *tpl;
+  cCiTransportConnection *tc;
+  int ResourceIdToInt(const uint8_t *Data);
+  bool Send(uint8_t Tag, int SessionId, int ResourceId = 0, int Status = -1);
+  cCiSession *GetSessionBySessionId(int SessionId);
+  cCiSession *GetSessionByResourceId(int ResourceId);
+  cCiSession *CreateSession(int ResourceId);
+  bool OpenSession(int Length, const uint8_t *Data);
+  bool CloseSession(int SessionId);
+  cCiHandler(int Fd, int NumSlots);
+public:
+  ~cCiHandler();
+  static cCiHandler *CreateCiHandler(const char *FileName);
+  bool Process(void);
+  bool EnterMenu(void);
+  cCiMenu *GetMenu(void);
+  cCiEnquiry *GetEnquiry(void);
+  bool SetCaPmt(cCiCaPmt &CaPmt);
+  bool Reset(void);
+  };
+
+#endif //__CI_H
diff --git a/config.h b/config.h
index d09729e..7cf7d91 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.144 2002/12/13 13:41:55 kls Exp $
+ * $Id: config.h 1.145 2002/12/22 15:29:45 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.20"
+#define VDRVERSION "1.1.21"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index edbf5ca..15628cd 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.35 2002/11/10 10:17:57 kls Exp $
+ * $Id: device.c 1.36 2003/01/03 15:41:14 kls Exp $
  */
 
 #include "device.h"
@@ -47,6 +47,7 @@ cDevice::cDevice(void)
   mute = false;
   volume = Setup.CurrentVolume;
 
+  ciHandler = NULL;
   player = NULL;
 
   playerDetached = false;
@@ -67,6 +68,7 @@ cDevice::~cDevice()
   Detach(player);
   for (int i = 0; i < MAXRECEIVERS; i++)
       Detach(receiver[i]);
+  delete ciHandler;
 }
 
 void cDevice::SetUseDevice(int n)
diff --git a/device.h b/device.h
index f18699c..ad876ba 100644
--- a/device.h
+++ b/device.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.28 2002/12/15 14:40:11 kls Exp $
+ * $Id: device.h 1.29 2003/01/03 15:43:48 kls Exp $
  */
 
 #ifndef __DEVICE_H
 #define __DEVICE_H
 
+#include "ci.h"
 #include "thread.h"
 #include "tools.h"
 
@@ -211,6 +212,13 @@ protected:
          ///< Type indicates some special types of PIDs, which the device may
          ///< need to set in a specific way.
 
+// Common Interface facilities:
+
+protected:
+  cCiHandler *ciHandler;
+public:
+  cCiHandler *CiHandler(void) { return ciHandler; }
+
 // Image Grab facilities
 
 public:
diff --git a/dvbdevice.c b/dvbdevice.c
index adc900b..2e12f26 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.40 2002/12/14 10:52:13 kls Exp $
+ * $Id: dvbdevice.c 1.41 2003/01/06 14:44:27 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -43,6 +43,7 @@ extern "C" {
 #define DEV_DVB_DEMUX     "demux"
 #define DEV_DVB_VIDEO     "video"
 #define DEV_DVB_AUDIO     "audio"
+#define DEV_DVB_CA        "ca"
 
 static const char *DvbName(const char *Name, int n)
 {
@@ -68,30 +69,34 @@ private:
   int fd_frontend;
   int cardIndex;
   fe_type_t frontendType;
+  cCiHandler *ciHandler;
   cChannel channel;
   const char *diseqcCommands;
   bool active;
   eTunerStatus tunerStatus;
+  bool caSet;
   cMutex mutex;
   cCondVar newSet;
   bool SetFrontend(void);
   virtual void Action(void);
 public:
-  cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType);
+  cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCiHandler *CiHandler);
   virtual ~cDvbTuner();
   bool IsTunedTo(const cChannel *Channel) const;
-  void Set(const cChannel *Channel);
+  void Set(const cChannel *Channel, bool Tune);
   bool Locked(void) { return tunerStatus == tsLocked; }
   };
 
-cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType)
+cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCiHandler *CiHandler)
 {
   fd_frontend = Fd_Frontend;
   cardIndex = CardIndex;
   frontendType = FrontendType;
+  ciHandler = CiHandler;
   diseqcCommands = NULL;
   active = false;
   tunerStatus = tsIdle;
+  caSet = false;
   Start();
 }
 
@@ -108,11 +113,13 @@ bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
   return tunerStatus != tsIdle && channel.Source() == Channel->Source() && channel.Frequency() == Channel->Frequency();
 }
 
-void cDvbTuner::Set(const cChannel *Channel)
+void cDvbTuner::Set(const cChannel *Channel, bool Tune)
 {
   cMutexLock MutexLock(&mutex);
   channel = *Channel;
-  tunerStatus = tsSet;
+  if (Tune)
+     tunerStatus = tsSet;
+  caSet = false;
   newSet.Broadcast();
 }
 
@@ -251,6 +258,30 @@ void cDvbTuner::Action(void)
               continue;
               }
            }
+        if (ciHandler && !caSet) {//XXX TODO update in case the CA descriptors have changed
+           uchar buffer[2048];
+           int length = cSIProcessor::GetCaDescriptors(channel.Source(), channel.Frequency(), channel.Sid(), sizeof(buffer), buffer);
+           if (length > 0) {
+              cCiCaPmt CaPmt(channel.Sid());
+              if (channel.Vpid()) {
+                 CaPmt.AddPid(channel.Vpid());
+                 CaPmt.AddCaDescriptor(length, buffer);
+                 }
+              if (channel.Apid1()) {
+                 CaPmt.AddPid(channel.Apid1());
+                 CaPmt.AddCaDescriptor(length, buffer);
+                 }
+              if (channel.Apid2()) {
+                 CaPmt.AddPid(channel.Apid2());
+                 CaPmt.AddCaDescriptor(length, buffer);
+                 }
+              if (channel.Dpid1()) {
+                 CaPmt.AddPid(channel.Dpid1());
+                 CaPmt.AddCaDescriptor(length, buffer);
+                 }
+              caSet = ciHandler->SetCaPmt(CaPmt);
+              }
+           }
         newSet.TimedWait(mutex, 1000);
         }
   dsyslog("tuner thread ended on device %d (pid=%d)", cardIndex + 1, getpid());
@@ -291,7 +322,8 @@ cDvbDevice::cDvbDevice(int n)
      siProcessor = new cSIProcessor(DvbName(DEV_DVB_DEMUX, n));
      if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0) {
         frontendType = feinfo.type;
-        dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType);
+        ciHandler = cCiHandler::CreateCiHandler(DvbName(DEV_DVB_CA, n));
+        dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType, ciHandler);
         }
      else
         LOG_ERROR;
@@ -616,8 +648,8 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      DelPid(pidHandles[ptDolby].pid);
      }
 
+  dvbTuner->Set(Channel, DoTune);
   if (DoTune) {
-     dvbTuner->Set(Channel);
      /*XXX do we still need this???
      if (!(status & FE_HAS_LOCK)) {
         esyslog("ERROR: channel %d not locked on DVB card %d!", Channel->Number(), CardIndex() + 1);
diff --git a/eit.c b/eit.c
index dd51f0c..e2e0fe7 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.61 2002/11/24 14:37:38 kls Exp $
+ * $Id: eit.c 1.63 2003/01/06 15:05:46 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -399,8 +399,8 @@ bool cEventInfo::Read(FILE *f, cSchedule *Schedule)
   return false;
 }
 
-#define MAXEPGBUGFIXSTATS 6
-#define MAXEPGBUGFIXCHANS 50
+#define MAXEPGBUGFIXSTATS 7
+#define MAXEPGBUGFIXCHANS 100
 struct tEpgBugFixStats {
   int hits;
   int n;
@@ -597,6 +597,20 @@ void cEventInfo::FixEpgBugs(void)
               }
         }
 
+#define MAX_USEFUL_SUBTITLE_LENGTH 40
+     // Some channels put a whole lot of information in the Subtitle and leave
+     // the Extended Description totally empty. So if the Subtitle length exceeds
+     // MAX_USEFUL_SUBTITLE_LENGTH, let's put this into the Extended Description
+     // instead:
+     if (!isempty(pSubtitle) && isempty(pExtendedDescription)) {
+        if (strlen(pSubtitle) > MAX_USEFUL_SUBTITLE_LENGTH) {
+           free(pExtendedDescription);
+           pExtendedDescription = pSubtitle;
+           pSubtitle = NULL;
+           EpgBugFixStat(5, GetChannelID());
+           }
+        }
+
      // Some channels use the ` ("backtick") character, where a ' (single quote)
      // would be normally used. Actually, "backticks" in normal text don't make
      // much sense, so let's replace them:
@@ -985,6 +999,68 @@ bool cEIT::IsPresentFollowing()
    return false;
 }
 
+// --- cCaDescriptor ---------------------------------------------------------
+
+class cCaDescriptor : public cListObject {
+  friend class cCaDescriptors;
+private:
+  int source;
+  int transponder;
+  int serviceId;
+  int caSystem;
+  int length;
+  uchar *data;
+public:
+  cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, int Length, uchar *Data);
+  virtual ~cCaDescriptor();
+  int Length(void) const { return length; }
+  const uchar *Data(void) const { return data; }
+  };
+
+cCaDescriptor::cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, int Length, uchar *Data)
+{
+  source = Source;
+  transponder = Transponder;
+  serviceId = ServiceId;
+  caSystem = CaSystem;
+  length = Length;
+  data = MALLOC(uchar, length);
+  memcpy(data, Data, length);
+  /*//XXX just while debugging...
+  char buffer[1024];
+  char *q = buffer;
+  q += sprintf(q, "CAM: %04X %5d %4d", source, transponder, serviceId);
+  for (int i = 0; i < length; i++)
+      q += sprintf(q, " %02X", data[i]);
+  dsyslog(buffer);
+  *///XXX
+}
+
+cCaDescriptor::~cCaDescriptor()
+{
+  free(data);
+}
+
+// --- cCaDescriptors --------------------------------------------------------
+
+class cCaDescriptors : public cList<cCaDescriptor> {
+public:
+  const cCaDescriptor *Get(int Source, int Transponder, int ServiceId, int CaSystem);
+  };
+
+const cCaDescriptor *cCaDescriptors::Get(int Source, int Transponder, int ServiceId, int CaSystem)
+{
+  for (cCaDescriptor *ca = First(); ca; ca = Next(ca)) {
+      if (ca->source == Source && ca->transponder == Transponder && ca->serviceId == ServiceId) {
+         if (CaSystem == -1 || ca->caSystem == CaSystem)
+            return ca;
+         if (CaSystem < 0)
+            CaSystem++;
+         }
+      }
+  return NULL;
+}
+
 // --- cSIProcessor ----------------------------------------------------------
 
 #define MAX_FILTERS 20
@@ -993,6 +1069,8 @@ bool cEIT::IsPresentFollowing()
 int cSIProcessor::numSIProcessors = 0;
 cSchedules *cSIProcessor::schedules = NULL;
 cMutex cSIProcessor::schedulesMutex;
+cCaDescriptors *cSIProcessor::caDescriptors = NULL;
+cMutex cSIProcessor::caDescriptorsMutex;
 const char *cSIProcessor::epgDataFileName = EPGDATAFILENAME;
 time_t cSIProcessor::lastDump = time(NULL);
 
@@ -1003,9 +1081,13 @@ cSIProcessor::cSIProcessor(const char *FileName)
    masterSIProcessor = numSIProcessors == 0; // the first one becomes the 'master'
    currentSource = 0;
    currentTransponder = 0;
+   pmtIndex = 0;
+   pmtPid = 0;
    filters = NULL;
-   if (!numSIProcessors++) // the first one creates it
+   if (!numSIProcessors++) { // the first one creates them
       schedules = new cSchedules;
+      caDescriptors = new cCaDescriptors;
+      }
    filters = (SIP_FILTER *)calloc(MAX_FILTERS, sizeof(SIP_FILTER));
    SetStatus(true);
    Start();
@@ -1019,8 +1101,10 @@ cSIProcessor::~cSIProcessor()
    Cancel(3);
    ShutDownFilters();
    free(filters);
-   if (!--numSIProcessors) // the last one deletes it
+   if (!--numSIProcessors) { // the last one deletes them
       delete schedules;
+      delete caDescriptors;
+      }
    free(fileName);
 }
 
@@ -1075,9 +1159,13 @@ const char *cSIProcessor::GetEpgDataFileName(void)
 
 void cSIProcessor::SetStatus(bool On)
 {
+   LOCK_THREAD;
    ShutDownFilters();
+   pmtIndex = 0;
+   pmtPid = 0;
    if (On)
    {
+      AddFilter(0x00, 0x00);  // PAT
       AddFilter(0x14, 0x70);  // TDT
       AddFilter(0x14, 0x73);  // TOT
       AddFilter(0x12, 0x4e);  // event info, actual TS, present/following
@@ -1089,6 +1177,8 @@ void cSIProcessor::SetStatus(bool On)
    }
 }
 
+#define PMT_SCAN_TIMEOUT  10 // seconds
+
 /** use the vbi device to parse all relevant SI
 information and let the classes corresponding
 to the tables write their information to the disk */
@@ -1097,6 +1187,7 @@ void cSIProcessor::Action()
    dsyslog("EIT processing thread started (pid=%d)%s", getpid(), masterSIProcessor ? " - master" : "");
 
    time_t lastCleanup = time(NULL);
+   time_t lastPmtScan = time(NULL);
 
    active = true;
 
@@ -1162,6 +1253,37 @@ void cSIProcessor::Action()
                      //dsyslog("Received pid 0x%02x with table ID 0x%02x and length of %04d\n", pid, buf[0], seclen);
                      switch (pid)
                      {
+                        case 0x00:
+                           if (buf[0] == 0x00)
+                           {
+                              LOCK_THREAD;
+                              if (pmtPid && time(NULL) - lastPmtScan > PMT_SCAN_TIMEOUT) {
+                                 DelFilter(pmtPid, 0x02);
+                                 pmtPid = 0;
+                                 pmtIndex++;
+                                 lastPmtScan = time(NULL);
+                                 }
+                              if (!pmtPid) {
+                                 cMutexLock MutexLock(&schedulesMutex); // since the xMem... stuff is not thread safe, we need to use a "global" mutex
+                                 struct LIST *pat = siParsePAT(buf);
+                                 if (pat) {
+                                    int Index = 0;
+                                    for (struct Program *prg = (struct Program *)pat->Head; prg; prg = (struct Program *)xSucc(prg)) {
+                                        if (prg->ProgramID) {
+                                           if (Index++ == pmtIndex) {
+                                              pmtPid = prg->NetworkPID;
+                                              AddFilter(pmtPid, 0x02);
+                                              break;
+                                              }
+                                           }
+                                        }
+                                    if (!pmtPid)
+                                       pmtIndex = 0;
+                                    }
+                                 xMemFreeAll(NULL);
+                                 }
+                           }
+                           break;
                         case 0x14:
                            if (buf[0] == 0x70)
                            {
@@ -1188,7 +1310,28 @@ void cSIProcessor::Action()
                               dsyslog("Received stuffing section in EIT\n");
                            break;
 
-                        default:
+                        default: {
+                           LOCK_THREAD;
+                           if (pid == pmtPid && buf[0] == 0x02 && currentSource && currentTransponder) {
+                              cMutexLock MutexLock(&schedulesMutex); // since the xMem... stuff is not thread safe, we need to use a "global" mutex
+                              struct Pid *pi = siParsePMT(buf);
+                              if (pi) {
+                                 for (struct LIST *d = (struct LIST *)pi->Descriptors; d; d = (struct LIST *)xSucc(d)) {
+                                     if (DescriptorTag(d) == DESCR_CA) {
+                                        uchar *Data = ((ConditionalAccessDescriptor *)d)->Data;
+                                        int CaSystem = (Data[2] << 8) | Data[3];
+                                        if (!caDescriptors->Get(currentSource, currentTransponder, pi->ProgramID, CaSystem)) {
+                                           cMutexLock MutexLock(&caDescriptorsMutex);
+                                           caDescriptors->Add(new cCaDescriptor(currentSource, currentTransponder, pi->ProgramID, CaSystem, ((ConditionalAccessDescriptor *)d)->Amount, Data));
+                                           }
+                                        //XXX update???
+                                        }
+                                     }
+                                 }
+                              xMemFreeAll(NULL);
+                              lastPmtScan = 0; // this triggers the next scan
+                              }
+                           }
                            break;
                      }
                   }
@@ -1229,7 +1372,7 @@ bool cSIProcessor::AddFilter(u_char pid, u_char tid)
                filters[a].inuse = true;
             else
             {
-               esyslog("ERROR: can't set filter");
+               esyslog("ERROR: can't set filter (pid=%d, tid=%02X)", pid, tid);
                close(filters[a].handle);
                return false;
             }
@@ -1248,6 +1391,21 @@ bool cSIProcessor::AddFilter(u_char pid, u_char tid)
    return false;
 }
 
+bool cSIProcessor::DelFilter(u_char pid, u_char tid)
+{
+   for (int a = 0; a < MAX_FILTERS; a++)
+   {
+      if (filters[a].inuse && filters[a].pid == pid && filters[a].tid == tid)
+      {
+         close(filters[a].handle);
+         // dsyslog("Deregistered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
+         filters[a].inuse = false;
+         return true;
+      }
+   }
+   return false;
+}
+
 /**  */
 bool cSIProcessor::ShutDownFilters(void)
 {
@@ -1283,3 +1441,26 @@ void cSIProcessor::TriggerDump(void)
   cMutexLock MutexLock(&schedulesMutex);
   lastDump = 0;
 }
+
+int cSIProcessor::GetCaDescriptors(int Source, int Transponder, int ServiceId, int BufSize, uchar *Data)
+{
+  if (BufSize > 0 && Data) {
+     cMutexLock MutexLock(&caDescriptorsMutex);
+     int length = 0;
+     for (int i = -1; ; i--) {
+         const cCaDescriptor *d = caDescriptors->Get(Source, Transponder, ServiceId, i);
+         if (d) {
+            if (length + d->Length() <= BufSize) {
+               memcpy(Data + length, d->Data(), d->Length());
+               length += d->Length();
+               }
+            else
+               return -1;
+            }
+         else
+            break;
+         }
+     return length;
+     }
+  return -1;
+}
diff --git a/eit.h b/eit.h
index 36c0a3e..ec203ea 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.22 2002/11/24 12:45:55 kls Exp $
+ * $Id: eit.h 1.23 2003/01/04 10:12:54 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -134,21 +134,29 @@ typedef struct sip_filter {
 
 }SIP_FILTER;
 
+class cCaDescriptor;
+class cCaDescriptors;
+
 class cSIProcessor : public cThread {
 private:
   static int numSIProcessors;
   static cSchedules *schedules;
   static cMutex schedulesMutex;
+  static cCaDescriptors *caDescriptors;
+  static cMutex caDescriptorsMutex;
   static const char *epgDataFileName;
   static time_t lastDump;
   bool masterSIProcessor;
   int currentSource;
   int currentTransponder;
+  int pmtIndex;
+  int pmtPid;
   SIP_FILTER *filters;
   char *fileName;
   bool active;
   void Action(void);
   bool AddFilter(u_char pid, u_char tid);
+  bool DelFilter(u_char pid, u_char tid);
   bool ShutDownFilters(void);
 public:
   cSIProcessor(const char *FileName);
@@ -159,6 +167,12 @@ public:
          // Caller must provide a cMutexLock which has to survive the entire
          // time the returned cSchedules is accessed. Once the cSchedules is no
          // longer used, the cMutexLock must be destroyed.
+  static int GetCaDescriptors(int Source, int Transponder, int ServiceId, int BufSize, uchar *Data);
+         ///< Gets all CA descriptors for a given channel.
+         ///< Copies all available CA descriptors for the given Source, Transponder and ServiceId
+         ///< into the provided buffer at Data (at most BufSize bytes).
+         ///< \return Returns the number of bytes copied into Data (0 if no CA descriptors are
+         ///< available), or -1 if BufSize was too small to hold all CA descriptors.
   static bool Read(FILE *f = NULL);
   static void Clear(void);
   void SetStatus(bool On);
diff --git a/i18n.c b/i18n.c
index 79fa607..aafe0c1 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.100 2002/11/10 12:32:30 kls Exp $
+ * $Id: i18n.c 1.101 2003/01/06 12:16:28 kls Exp $
  *
  * Translations provided by:
  *
@@ -664,6 +664,38 @@ const tI18nPhrase Phrases[] = {
     "Suprascrie",
     "Átírni",
   },
+  { "Menu",
+    "Menü",
+    "Meni",
+    "Menu",
+    "Menu",
+    "Menu",
+    "Menu",
+    "Meny",
+    "Valikko",
+    "Menu",
+    "Menu",
+    "Menou",
+    "Meny",
+    "Meniu",
+    "Menü",
+  },
+  { "Reset",
+    "Reset",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   // Confirmations:
   { "Delete channel?",
     "Kanal löschen?",
@@ -1580,6 +1612,54 @@ const tI18nPhrase Phrases[] = {
     "Spatiu scazut pe disc!",
     "A merev lemez majdnem tele!",
   },
+  { "Can't open CAM menu!",
+    "CAM-Menü kann nicht geöffnet werden!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "Can't reset CAM!",
+    "CAM-Reset fehlgeschlagen!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "CAM has been reset",
+    "CAM wurde zurückgesetzt!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   // Setup pages:
   { "OSD",
     "OSD",
diff --git a/libdtv/libsi/include/libsi.h b/libdtv/libsi/include/libsi.h
index 366387a..8e9e260 100644
--- a/libdtv/libsi/include/libsi.h
+++ b/libdtv/libsi/include/libsi.h
@@ -315,6 +315,29 @@ struct Descriptor {
 };
 
 
+/* ConditionalAccessDescriptor */
+
+struct ConditionalAccessDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   unsigned short       Amount;        /* Data */
+   unsigned char       *Data;
+};
+
+#define CreateConditionalAccessDescriptor(descr, amount, data) \
+   do \
+   { \
+      unsigned char *tmpptr; \
+      \
+      xMemAlloc (amount, &tmpptr); \
+      memcpy (tmpptr, data, amount); \
+      xCreateNode (((struct ConditionalAccessDescriptor *)descr), NULL); \
+      ((struct ConditionalAccessDescriptor *)descr)->Tag = DESCR_CA; \
+      ((struct ConditionalAccessDescriptor *)descr)->Amount = amount; \
+      ((struct ConditionalAccessDescriptor *)descr)->Data = tmpptr; \
+   } while (0)
+
+
 /* Iso639LanguageDescriptor */
 
 struct Iso639LanguageDescriptor {
diff --git a/libdtv/libsi/si_parser.c b/libdtv/libsi/si_parser.c
index be0d254..ccca6e5 100644
--- a/libdtv/libsi/si_parser.c
+++ b/libdtv/libsi/si_parser.c
@@ -705,6 +705,12 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
             HILO (CastTimeShiftedEventDescriptor(Ptr)->reference_event_id));
       break;
 
+      case DESCR_CA:
+         CreateConditionalAccessDescriptor (Descriptor,
+            *(Ptr + 1) + 2, // we'll need the entire raw data!
+            Ptr);
+      break;
+
       case DESCR_ISO_639_LANGUAGE:
          CreateIso639LanguageDescriptor (Descriptor,
                    CastIso639LanguageDescriptor(Buffer)->lang_code1,
@@ -790,7 +796,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
       case DESCR_DATA_STREAM_ALIGN:
       case DESCR_TARGET_BACKGRID:
       case DESCR_VIDEO_WINDOW:
-      case DESCR_CA:
       case DESCR_SYSTEM_CLOCK:
       case DESCR_MULTIPLEX_BUFFER_UTIL:
       case DESCR_COPYRIGHT:
diff --git a/menu.c b/menu.c
index a1c136f..e3a4c18 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.228 2002/12/01 10:31:55 kls Exp $
+ * $Id: menu.c 1.231 2003/01/06 16:13:53 kls Exp $
  */
 
 #include "menu.h"
@@ -645,6 +645,7 @@ private:
 public:
   cMenuChannelItem(cChannel *Channel);
   virtual void Set(void);
+  cChannel *Channel(void) { return channel; }
   };
 
 cMenuChannelItem::cMenuChannelItem(cChannel *Channel)
@@ -669,6 +670,7 @@ void cMenuChannelItem::Set(void)
 
 class cMenuChannels : public cOsdMenu {
 private:
+  cChannel *GetChannel(int Index);
   void Propagate(void);
 protected:
   eOSState Switch(void);
@@ -691,6 +693,12 @@ cMenuChannels::cMenuChannels(void)
   SetHelp(tr("Edit"), tr("New"), tr("Delete"), tr("Mark"));
 }
 
+cChannel *cMenuChannels::GetChannel(int Index)
+{
+  cMenuChannelItem *p = (cMenuChannelItem *)Get(Index);
+  return p ? (cChannel *)p->Channel() : NULL;
+}
+
 void cMenuChannels::Propagate(void)
 {
   Channels.ReNumber();
@@ -703,7 +711,7 @@ void cMenuChannels::Propagate(void)
 
 eOSState cMenuChannels::Switch(void)
 {
-  cChannel *ch = Channels.Get(Current());
+  cChannel *ch = GetChannel(Current());
   if (ch)
      cDevice::PrimaryDevice()->SwitchChannel(ch, true);
   return osEnd;
@@ -713,7 +721,7 @@ eOSState cMenuChannels::Edit(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
-  cChannel *ch = Channels.Get(Current());
+  cChannel *ch = GetChannel(Current());
   if (ch)
      return AddSubMenu(new cMenuEditChannel(ch));
   return osContinue;
@@ -730,7 +738,7 @@ eOSState cMenuChannels::Delete(void)
 {
   if (Count() > 0) {
      int Index = Current();
-     cChannel *channel = Channels.Get(Index);
+     cChannel *channel = GetChannel(Current());
      int DeletedChannel = channel->Number();
      // Check if there is a timer using this channel:
      for (cTimer *ti = Timers.First(); ti; ti = Timers.Next(ti)) {
@@ -751,12 +759,16 @@ eOSState cMenuChannels::Delete(void)
 
 void cMenuChannels::Move(int From, int To)
 {
-  int FromNumber = Channels.Get(From)->Number();
-  int ToNumber = Channels.Get(To)->Number();
-  Channels.Move(From, To);
-  cOsdMenu::Move(From, To);
-  Propagate();
-  isyslog("channel %d moved to %d", FromNumber, ToNumber);
+  cChannel *FromChannel = GetChannel(From);
+  cChannel *ToChannel = GetChannel(To);
+  if (FromChannel && ToChannel) {
+     int FromNumber = FromChannel->Number();
+     int ToNumber = ToChannel->Number();
+     Channels.Move(FromChannel, ToChannel);
+     cOsdMenu::Move(From, To);
+     Propagate();
+     isyslog("channel %d moved to %d", FromNumber, ToNumber);
+     }
 }
 
 eOSState cMenuChannels::ProcessKey(eKeys Key)
@@ -1509,6 +1521,116 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuCam --------------------------------------------------------------
+
+cMenuCam::cMenuCam(cCiMenu *CiMenu)
+:cOsdMenu("")
+{
+  ciMenu = CiMenu;
+  selected = false;
+  if (ciMenu->Selectable())
+     SetHasHotkeys();
+  SetTitle(ciMenu->TitleText() ? ciMenu->TitleText() : "CAM");
+  for (int i = 0; i < ciMenu->NumEntries(); i++)
+      Add(new cOsdItem(hk(ciMenu->Entry(i))));
+  //XXX implement a clean way of displaying this:
+  Add(new cOsdItem(ciMenu->SubTitleText()));
+  Add(new cOsdItem(ciMenu->BottomText()));
+  Display();
+}
+
+cMenuCam::~cMenuCam()
+{
+  if (!selected)
+     ciMenu->Cancel();
+  delete ciMenu;
+}
+
+eOSState cMenuCam::Select(void)
+{
+  if (ciMenu->Selectable()) {
+     ciMenu->Select(Current());
+     selected = true;
+     }
+  return osEnd;
+}
+
+eOSState cMenuCam::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk:     return Select();
+       default: break;
+       }
+     }
+  return state;
+}
+
+// --- cMenuCamEnquiry -------------------------------------------------------
+
+//XXX this is just quick and dirty - make this a separate display object
+cMenuCamEnquiry::cMenuCamEnquiry(cCiEnquiry *CiEnquiry)
+:cOsdMenu("")
+{
+  ciEnquiry = CiEnquiry;
+  replied = false;
+  SetTitle(ciEnquiry->Text() ? ciEnquiry->Text() : "CAM");
+  Display();
+}
+
+cMenuCamEnquiry::~cMenuCamEnquiry()
+{
+  if (!replied)
+     ciEnquiry->Cancel();
+  delete ciEnquiry;
+}
+
+eOSState cMenuCamEnquiry::Reply(void)
+{
+  ciEnquiry->Reply("1234");//XXX implement actual user input
+  replied = true;
+  return osEnd;
+}
+
+eOSState cMenuCamEnquiry::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk:     return Reply();
+       default: break;
+       }
+     }
+  return state;
+}
+
+// --- CamControl ------------------------------------------------------------
+
+cOsdObject *CamControl(void)
+{
+  for (int d = 0; d < cDevice::NumDevices(); d++) {
+      cDevice *Device = cDevice::GetDevice(d);
+      if (Device) {
+         cCiHandler *CiHandler = Device->CiHandler();
+         if (CiHandler) {
+            CiHandler->Process();
+            cCiMenu *CiMenu = CiHandler->GetMenu();
+            if (CiMenu)
+               return new cMenuCam(CiMenu);
+            else {
+               cCiEnquiry *CiEnquiry = CiHandler->GetEnquiry();
+               if (CiEnquiry)
+                  return new cMenuCamEnquiry(CiEnquiry);
+               }
+            }
+         }
+      }
+  return NULL;
+}
+
 // --- cMenuRecordingItem ----------------------------------------------------
 
 class cMenuRecordingItem : public cOsdItem {
@@ -1938,6 +2060,12 @@ eOSState cMenuSetupLNB::ProcessKey(eKeys Key)
 // --- cMenuSetupCICAM -------------------------------------------------------
 
 class cMenuSetupCICAM : public cMenuSetupBase {
+private:
+  int helpKeys;
+  void SetHelpKeys(void);
+  cCiHandler *GetCurrentCiHandler(void);
+  eOSState Menu(void);
+  eOSState Reset(void);
 public:
   cMenuSetupCICAM(void);
   virtual eOSState ProcessKey(eKeys Key);
@@ -1945,6 +2073,7 @@ public:
 
 cMenuSetupCICAM::cMenuSetupCICAM(void)
 {
+  helpKeys = -1;
   SetSection(tr("CICAM"));
   for (int d = 0; d < cDevice::NumDevices(); d++) {
       for (int i = 0; i < 2; i++) {
@@ -1953,6 +2082,46 @@ cMenuSetupCICAM::cMenuSetupCICAM(void)
           Add(new cMenuEditCaItem(buffer, &data.CaCaps[d][i]));
           }
       }
+  SetHelpKeys();
+}
+
+cCiHandler *cMenuSetupCICAM::GetCurrentCiHandler(void)
+{
+  cDevice *Device = cDevice::GetDevice(Current() / 2);
+  return Device ? Device->CiHandler() : NULL;
+}
+
+void cMenuSetupCICAM::SetHelpKeys(void)
+{
+  int NewHelpKeys = helpKeys;
+  NewHelpKeys = GetCurrentCiHandler() ? 1 : 0;
+  if (NewHelpKeys != helpKeys) {
+     switch (NewHelpKeys) {
+       case 0: SetHelp(NULL); break;
+       case 1: SetHelp(tr("Menu"), tr("Reset"));
+       }
+     helpKeys = NewHelpKeys;
+     }
+}
+
+eOSState cMenuSetupCICAM::Menu(void)
+{
+  cCiHandler *CiHandler = GetCurrentCiHandler();
+  if (CiHandler && CiHandler->EnterMenu())
+     return osEnd; // the CAM menu will be executed explicitly from the main loop
+  else
+     Interface->Error(tr("Can't open CAM menu!"));
+  return osContinue;
+}
+
+eOSState cMenuSetupCICAM::Reset(void)
+{
+  cCiHandler *CiHandler = GetCurrentCiHandler();
+  if (CiHandler && CiHandler->Reset())
+     Interface->Info(tr("CAM has been reset"));
+  else
+     Interface->Error(tr("Can't reset CAM!"));
+  return osContinue;
 }
 
 eOSState cMenuSetupCICAM::ProcessKey(eKeys Key)
@@ -1961,6 +2130,19 @@ eOSState cMenuSetupCICAM::ProcessKey(eKeys Key)
 
   if (state == osBack && Key == kOk)
      cDevice::SetCaCaps();
+  else if (state == osUnknown) {
+     switch (Key) {
+       case kRed:    if (helpKeys == 1)
+                        return Menu();
+                     break;
+       case kGreen:  if (helpKeys == 1)
+                        return Reset();
+                     break;
+       default: break;
+       }
+     }
+  if (Key != kNone)
+     SetHelpKeys();
   return state;
 }
 
diff --git a/menu.h b/menu.h
index 7e7e4d6..e886f18 100644
--- a/menu.h
+++ b/menu.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.51 2002/11/30 15:55:39 kls Exp $
+ * $Id: menu.h 1.52 2003/01/06 10:04:05 kls Exp $
  */
 
 #ifndef __MENU_H
 #define __MENU_H
 
+#include "ci.h"
 #include "device.h"
 #include "osd.h"
 #include "dvbplayer.h"
@@ -58,6 +59,30 @@ public:
   eOSState ProcessKey(eKeys Key);
   };
 
+class cMenuCam : public cOsdMenu {
+private:
+  cCiMenu *ciMenu;
+  bool selected;
+  eOSState Select(void);
+public:
+  cMenuCam(cCiMenu *CiMenu);
+  virtual ~cMenuCam();
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+class cMenuCamEnquiry : public cOsdMenu {
+private:
+  cCiEnquiry *ciEnquiry;
+  bool replied;
+  eOSState Reply(void);
+public:
+  cMenuCamEnquiry(cCiEnquiry *CiEnquiry);
+  virtual ~cMenuCamEnquiry();
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cOsdObject *CamControl(void);
+
 class cMenuRecordingItem;
 
 class cMenuRecordings : public cOsdMenu {
diff --git a/recorder.c b/recorder.c
index 4904014..426b555 100644
--- a/recorder.c
+++ b/recorder.c
@@ -1,10 +1,10 @@
 /*
- * recorder.h: The actual DVB recorder
+ * recorder.c: The actual DVB recorder
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.3 2002/10/12 13:34:29 kls Exp $
+ * $Id: recorder.c 1.4 2002/12/22 11:33:08 kls Exp $
  */
 
 #include <stdarg.h>
diff --git a/recording.c b/recording.c
index ba85ded..e14bb43 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.70 2002/10/20 11:54:29 kls Exp $
+ * $Id: recording.c 1.72 2003/01/06 15:36:12 kls Exp $
  */
 
 #include "recording.h"
@@ -58,6 +58,8 @@
 #define TIMERMACRO_TITLE    "TITLE"
 #define TIMERMACRO_EPISODE  "EPISODE"
 
+#define MAX_SUBTITLE_LENGTH  40
+
 void RemoveDeletedRecordings(void)
 {
   static time_t LastRemoveCheck = 0;
@@ -306,10 +308,17 @@ cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, c
   fileName = NULL;
   name = NULL;
   // set up the actual name:
+  const char *OriginalSubtitle = Subtitle;
+  char SubtitleBuffer[MAX_SUBTITLE_LENGTH];
   if (isempty(Title))
      Title = Timer->Channel()->Name();
   if (isempty(Subtitle))
      Subtitle = " ";
+  else if (strlen(Subtitle) > MAX_SUBTITLE_LENGTH) {
+     // let's make sure the Subtitle doesn't produce too long a file name:
+     strn0cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
+     Subtitle = SubtitleBuffer;
+     }
   char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
   char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
   if (macroTITLE || macroEPISODE) {
@@ -333,6 +342,7 @@ cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, c
   // handle summary:
   summary = !isempty(Timer->Summary()) ? strdup(Timer->Summary()) : NULL;
   if (!summary) {
+     Subtitle = OriginalSubtitle;
      if (isempty(Subtitle))
         Subtitle = "";
      if (isempty(Summary))
@@ -758,7 +768,7 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
 #define MAXINDEXCATCHUP   2 // seconds
 
 // The minimum age of an index file for considering it no longer to be written:
-#define MININDEXAGE      10 // seconds
+#define MININDEXAGE      60 // seconds
 
 cIndexFile::cIndexFile(const char *FileName, bool Record)
 :resumeFile(FileName)
diff --git a/svdrp.c b/svdrp.c
index 66b420c..102abe0 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.49 2002/11/10 12:09:56 kls Exp $
+ * $Id: svdrp.c 1.50 2002/12/22 14:04:08 kls Exp $
  */
 
 #include "svdrp.h"
@@ -174,8 +174,8 @@ bool cPUTEhandler::Process(const char *s)
 #define MAXHELPTOPIC 10
 
 const char *HelpPages[] = {
-  "CHAN [ + | - | <number> | <name> ]\n"
-  "    Switch channel up, down or to the given channel number or name.\n"
+  "CHAN [ + | - | <number> | <name> | <id> ]\n"
+  "    Switch channel up, down or to the given channel number, name or id.\n"
   "    Without option (or after successfully switching to the channel)\n"
   "    it returns the current channel number and name.",
   "CLRE\n"
@@ -412,15 +412,19 @@ void cSVDRP::CmdCHAN(const char *Option)
            }
         }
      else {
-        int i = 1;
-        cChannel *channel;
-        while ((channel = Channels.GetByNumber(i, 1)) != NULL) {
-              if (strcasecmp(channel->Name(), Option) == 0) {
-                 n = i;
-                 break;
+        cChannel *channel = Channels.GetByChannelID(tChannelID::FromString(Option));
+        if (channel)
+           n = channel->Number();
+        else {
+           int i = 1;
+           while ((channel = Channels.GetByNumber(i, 1)) != NULL) {
+                 if (strcasecmp(channel->Name(), Option) == 0) {
+                    n = channel->Number();
+                    break;
+                    }
+                 i = channel->Number() + 1;
                  }
-              i = channel->Number() + 1;
-              }
+           }
         }
      if (n < 0) {
         Reply(501, "Undefined channel \"%s\"", Option);
diff --git a/vdr.c b/vdr.c
index bec5133..44ed58f 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.139 2002/12/13 16:01:09 kls Exp $
+ * $Id: vdr.c 1.140 2003/01/06 11:14:50 kls Exp $
  */
 
 #include <getopt.h>
@@ -468,6 +468,9 @@ int main(int argc, char *argv[])
                  Timer->SetPending(true);
               }
            }
+        // CAM control:
+        if (!Menu)
+           Menu = CamControl();
         // User Input:
         cOsdObject *Interact = Menu ? Menu : cControl::Control();
         eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse());