Updated for vdr-2.1.6.

HISTORY

@@ -212,3 +212,38 @@ VDR Plugin 'iptv' Revision History
 - Fixed a nasty network byte order bug.
 - Fixed and refactored the section filtering code.
 - Fixed a possible crash in the file protocol.
+
+2014-01-10: Version 2.0.1
+
+- Added missing CURL timeouts.
+- Improved section id scanner.
+- Added support for cDevice::IsTunedToTransponder() and
+  cDevice::GetCurrentlyTunedTransponder().
+- Fixed a memory leak and some issues reported by scan-build.
+
+2014-01-18: Version 2.0.2
+
+- Made devices to shutdown already in cPluginManager::Stop()
+  to prevent possible crashes while VDR shutdown.
+
+2014-03-09: Version 2.0.3
+
+- Fixed installation target bugs (Thanks to Alexander Grothe).
+
+
+==================================
+VDR Plugin 'iptv' Revision History
+==================================
+
+2014-02-20: Version 2.1.0
+
+- Added initial CAM support.
+- Added missing RTSP/UDP support.
+
+2014-03-09: Version 2.1.1
+
+- Fixed installation target bugs (Thanks to Alexander Grothe).
+
+2014-03-16: Version 2.1.2
+
+- Updated for vdr-2.1.6.

Makefile

@@ -28,10 +28,11 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
+RESDIR = $(call PKGCFG,resdir)
 CFGDIR = $(call PKGCFG,configdir)
 #
 TMPDIR ?= /tmp
@@ -147,7 +148,8 @@ install-lib: $(SOFILE)
 
 install-conf:
 	@mkdir -p $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)
-	@cp -pn $(PLUGIN)/* $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)/
+	@mkdir -p $(DESTDIR)$(RESDIR)/plugins/$(PLUGIN)
+	@cp -pn $(PLUGIN)/* $(DESTDIR)$(RESDIR)/plugins/$(PLUGIN)/
 
 install: install-lib install-i18n install-conf
 

README

@@ -53,10 +53,12 @@ Setup menu:
                                    stream ringbuffer before data is
                                    transferred to VDR.
                                    Valid range: 0...40
-- EXT protocol base port = 4321    Defines base port used in EXT protocol.
+- Protocol base port = 4321        Defines base port used in CURL/EXT
+                                   protocol. Two ports are defined for
+                                   each device.
                                    The port range is defined by the number
-                                   of IPTV devices (max. 8).
-                                   Valid range: 0...65527
+                                   of IPTV devices times two (max. 32).
+                                   Valid range: 0...65503
 - Use section filtering = 1        Defines whether section filtering shall
                                    be used.
                                    Valid range: 0...1
@@ -127,11 +129,11 @@ External streaming:
   script parameter is passed to the script and it can be used to select for
   example between different URLs.
 
-- When an EXT channel is opened the IPTV plugin opens an UDP listening port
-  on the localhost. The external script is responsible for supplying IPTV
-  plugin with MPEG2 TS data in UDP/RTP format to the listening port. The
-  data will be processed in VDR like a normal DVB broadcast. The listening
-  base port can be specified in the plugin configuration menu.
+- When an EXT or CURL/RTSP channel is opened the IPTV plugin opens an UDP
+  listening port on the localhost. The external script is responsible for
+  supplying IPTV plugin with MPEG2 TS data in UDP/RTP format to the listening
+  port. The data will be processed in VDR like a normal DVB broadcast. The
+  listening base port can be specified in the plugin configuration menu.
 
 - Each IPTV device has different listen port. The port number is specified
   as a base port number plus IPTV device index minus one. Maximum of 8 IPTV
@@ -165,8 +167,7 @@ Notes:
   "disable_ca_updates" patch to the VDR in order to get rid of "Channel not
   available" messages.
 
-- EIT scanning functionality can be disabled for all IPTV channels by applying
-  the "disable_eitscan" patch to the VDR.
+- EIT scanning functionality is disabled by default.
 
 - Section id and pid scanners should be disabled after the correct data is
   found. This can be made via VDR's channel editor.
@@ -176,11 +177,16 @@ Notes:
   IGMP v3 protocol:
   "U=<source address>@<group address>"
 
-- The CURL implementation supports only HTTP/HTTPS protocols and an optional
-  netrc configuration file for authentication:
+- The CURL implementation supports only RTSP/HTTP/HTTPS protocols and an
+  optional netrc configuration file for authentication:
   $(CONFDIR)/iptv/netrc
 
-- CURL implementation
+- You can quite easily figure out correct DVB triplet values by using the
+  multicat and dvbsnoop tools:
+  $ multicat -u -d 1620000000 @127.0.0.1:1234 /tmp/video.ts
+  $ dvbsnoop -s ts -if /tmp/video.ts -tssubdecode -hexdumpbuffer 0x12 | \
+    grep -m1 -A8 Service_ID | grep _ID
+
 Acknowledgements:
 
 - The IPTV section filtering code is derived from Linux kernel.

common.h

@@ -44,7 +44,8 @@
   do {                                                            \
      if (exp) {                                                   \
         char tmp[64];                                             \
-        error(errstr": %s", strerror_r(errno, tmp, sizeof(tmp))); \
+        error("[%s,%d]: "errstr": %s", __FILE__, __LINE__,        \
+              strerror_r(errno, tmp, sizeof(tmp)));               \
         func;                                                     \
         ret;                                                      \
         }                                                         \

config.c

@@ -12,13 +12,14 @@ cIptvConfig IptvConfig;
 cIptvConfig::cIptvConfig(void)
 : tsBufferSizeM(2),
   tsBufferPrefillRatioM(0),
-  extProtocolBasePortM(4321),
+  protocolBasePortM(4321),
   useBytesM(1),
   sectionFilteringM(1)
 {
   for (unsigned int i = 0; i < ARRAY_SIZE(disabledFiltersM); ++i)
       disabledFiltersM[i] = -1;
   memset(configDirectoryM, 0, sizeof(configDirectoryM));
+  memset(resourceDirectoryM, 0, sizeof(resourceDirectoryM));
 }
 
 unsigned int cIptvConfig::GetDisabledFiltersCount(void) const
@@ -45,3 +46,9 @@ void cIptvConfig::SetConfigDirectory(const char *directoryP)
   debug("cIptvConfig::%s(%s)", __FUNCTION__, directoryP);
   ERROR_IF(!realpath(directoryP, configDirectoryM), "Cannot canonicalize configuration directory");
 }
+
+void cIptvConfig::SetResourceDirectory(const char *directoryP)
+{
+  debug("cIptvConfig::%s(%s)", __FUNCTION__, directoryP);
+  ERROR_IF(!realpath(directoryP, resourceDirectoryM), "Cannot canonicalize resource directory");
+}

config.h

@@ -16,29 +16,32 @@ class cIptvConfig
 private:
   unsigned int tsBufferSizeM;
   unsigned int tsBufferPrefillRatioM;
-  unsigned int extProtocolBasePortM;
+  unsigned int protocolBasePortM;
   unsigned int useBytesM;
   unsigned int sectionFilteringM;
   int disabledFiltersM[SECTION_FILTER_TABLE_SIZE];
   char configDirectoryM[PATH_MAX];
+  char resourceDirectoryM[PATH_MAX];
 
 public:
   cIptvConfig();
   unsigned int GetTsBufferSize(void) const { return tsBufferSizeM; }
   unsigned int GetTsBufferPrefillRatio(void) const { return tsBufferPrefillRatioM; }
-  unsigned int GetExtProtocolBasePort(void) const { return extProtocolBasePortM; }
+  unsigned int GetProtocolBasePort(void) const { return protocolBasePortM; }
   unsigned int GetUseBytes(void) const { return useBytesM; }
   unsigned int GetSectionFiltering(void) const { return sectionFilteringM; }
   const char *GetConfigDirectory(void) const { return configDirectoryM; }
+  const char *GetResourceDirectory(void) const { return resourceDirectoryM; }
   unsigned int GetDisabledFiltersCount(void) const;
   int GetDisabledFilters(unsigned int indexP) const;
   void SetTsBufferSize(unsigned int sizeP) { tsBufferSizeM = sizeP; }
   void SetTsBufferPrefillRatio(unsigned int ratioP) { tsBufferPrefillRatioM = ratioP; }
-  void SetExtProtocolBasePort(unsigned int portNumberP) { extProtocolBasePortM = portNumberP; }
+  void SetProtocolBasePort(unsigned int portNumberP) { protocolBasePortM = portNumberP; }
   void SetUseBytes(unsigned int onOffP) { useBytesM = onOffP; }
   void SetSectionFiltering(unsigned int onOffP) { sectionFilteringM = onOffP; }
   void SetDisabledFilters(unsigned int indexP, int numberP);
   void SetConfigDirectory(const char *directoryP);
+  void SetResourceDirectory(const char *directoryP);
 };
 
 extern cIptvConfig IptvConfig;

device.c

@@ -20,7 +20,7 @@ cIptvDevice::cIptvDevice(unsigned int indexP)
   isOpenDvrM(false),
   sidScanEnabledM(false),
   pidScanEnabledM(false),
-  channelIdM(tChannelID::InvalidID)
+  channelM()
 {
   unsigned int bufsize = (unsigned int)MEGABYTE(IptvConfig.GetTsBufferSize());
   bufsize -= (bufsize % TS_SIZE);
@@ -58,18 +58,18 @@ cIptvDevice::cIptvDevice(unsigned int indexP)
 cIptvDevice::~cIptvDevice()
 {
   debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
-  DELETE_POINTER(pIptvStreamerM);
-  DELETE_POINTER(pUdpProtocolM);
-  DELETE_POINTER(pCurlProtocolM);
-  DELETE_POINTER(pHttpProtocolM);
-  DELETE_POINTER(pFileProtocolM);
-  DELETE_POINTER(pExtProtocolM);
-  DELETE_POINTER(tsBufferM);
-  DELETE_POINTER(pPidScannerM);
-  DELETE_POINTER(pSidScannerM);
   // Stop section handler of iptv device
   StopSectionHandler();
   DELETE_POINTER(pIptvSectionM);
+  DELETE_POINTER(pSidScannerM);
+  DELETE_POINTER(pPidScannerM);
+  DELETE_POINTER(pIptvStreamerM);
+  DELETE_POINTER(pExtProtocolM);
+  DELETE_POINTER(pFileProtocolM);
+  DELETE_POINTER(pHttpProtocolM);
+  DELETE_POINTER(pCurlProtocolM);
+  DELETE_POINTER(pUdpProtocolM);
+  DELETE_POINTER(tsBufferM);
   // Close dvr fifo
   if (dvrFdM >= 0) {
      int fd = dvrFdM;
@@ -91,6 +91,15 @@ bool cIptvDevice::Initialize(unsigned int deviceCountP)
   return true;
 }
 
+void cIptvDevice::Shutdown(void)
+{
+  debug("cIptvDevice::%s()", __FUNCTION__);
+  for (int i = 0; i < IPTV_MAX_DEVICES; ++i) {
+      if (IptvDevicesS[i])
+         IptvDevicesS[i]->CloseDvr();
+      }
+}
+
 unsigned int cIptvDevice::Count(void)
 {
   unsigned int count = 0;
@@ -106,7 +115,7 @@ cIptvDevice *cIptvDevice::GetIptvDevice(int cardIndexP)
 {
   //debug("cIptvDevice::%s(%d)", __FUNCTION__, cardIndexP);
   for (unsigned int i = 0; i < IPTV_MAX_DEVICES; ++i) {
-      if ((IptvDevicesS[i] != NULL) && (IptvDevicesS[i]->CardIndex() == cardIndexP)) {
+      if (IptvDevicesS[i] && (IptvDevicesS[i]->CardIndex() == cardIndexP)) {
          //debug("cIptvDevice::%s(%d): found!", __FUNCTION__, cardIndexP);
          return IptvDevicesS[i];
          }
@@ -214,7 +223,7 @@ bool cIptvDevice::ProvidesChannel(const cChannel *channelP, int priorityP, bool
   if (channelP && ProvidesTransponder(channelP)) {
      result = hasPriority;
      if (Receiving()) {
-        if (channelP->GetChannelID() == channelIdM)
+        if (channelP->GetChannelID() == channelM.GetChannelID())
            result = true;
         else
            needsDetachReceivers = Receiving();
@@ -235,6 +244,21 @@ int cIptvDevice::NumProvidedSystems(void) const
   return 1;
 }
 
+const cChannel *cIptvDevice::GetCurrentlyTunedTransponder(void) const
+{
+  return &channelM;
+}
+
+bool cIptvDevice::IsTunedToTransponder(const cChannel *channelP) const
+{
+  return channelP ? (channelP->GetChannelID() == channelM.GetChannelID()) : false;
+}
+
+bool cIptvDevice::MaySwitchTransponder(const cChannel *channelP) const
+{
+  return cDevice::MaySwitchTransponder(channelP);
+}
+
 bool cIptvDevice::SetChannelDevice(const cChannel *channelP, bool liveViewP)
 {
   cIptvProtocolIf *protocol;
@@ -269,12 +293,12 @@ bool cIptvDevice::SetChannelDevice(const cChannel *channelP, bool liveViewP)
   }
   sidScanEnabledM = itp.SidScan() ? true : false;
   pidScanEnabledM = itp.PidScan() ? true : false;
-  if (pIptvStreamerM->Set(itp.Address(), itp.Parameter(), deviceIndexM, protocol)) {
-     channelIdM = channelP->GetChannelID();
+  if (pIptvStreamerM && pIptvStreamerM->SetSource(itp.Address(), itp.Parameter(), deviceIndexM, protocol)) {
+     channelM = *channelP;
      if (sidScanEnabledM && pSidScannerM && IptvConfig.GetSectionFiltering())
-        pSidScannerM->SetChannel(channelIdM);
+        pSidScannerM->SetChannel(channelM.GetChannelID());
      if (pidScanEnabledM && pPidScannerM)
-        pPidScannerM->SetChannel(channelIdM);
+        pPidScannerM->SetChannel(channelM.GetChannelID());
      }
   return true;
 }
@@ -282,22 +306,30 @@ bool cIptvDevice::SetChannelDevice(const cChannel *channelP, bool liveViewP)
 bool cIptvDevice::SetPid(cPidHandle *handleP, int typeP, bool onP)
 {
   debug("cIptvDevice::%s(%d): pid=%d type=%d on=%d", __FUNCTION__, deviceIndexM, handleP->pid, typeP, onP);
+  if (pIptvStreamerM && handleP)
+     return pIptvStreamerM->SetPid(handleP->pid, typeP, onP);
   return true;
 }
 
 int cIptvDevice::OpenFilter(u_short pidP, u_char tidP, u_char maskP)
 {
   //debug("cIptvDevice::%s(%d): pid=%d tid=%d mask=%d", __FUNCTION__, deviceIndexM, pidP, tidP,  maskP);
-  if (pIptvSectionM && IptvConfig.GetSectionFiltering())
+  if (pIptvSectionM && IptvConfig.GetSectionFiltering()) {
+     if (pIptvStreamerM)
+        pIptvStreamerM->SetPid(pidP, ptOther, true);
      return pIptvSectionM->Open(pidP, tidP, maskP);
+     }
   return -1;
 }
 
 void cIptvDevice::CloseFilter(int handleP)
 {
   //debug("cIptvDevice::%s(%d): handle=%d", __FUNCTION__, deviceIndexM, handleP);
-  if (pIptvSectionM)
+  if (pIptvSectionM) {
+     if (pIptvStreamerM)
+        pIptvStreamerM->SetPid(pIptvSectionM->GetPid(handleP), ptOther, false);
      pIptvSectionM->Close(handleP);
+     }
 }
 
 bool cIptvDevice::OpenDvr(void)
@@ -310,6 +342,8 @@ bool cIptvDevice::OpenDvr(void)
      pIptvStreamerM->Open();
   if (sidScanEnabledM && pSidScannerM && IptvConfig.GetSectionFiltering())
      pSidScannerM->Open();
+  if (pidScanEnabledM && pPidScannerM)
+     pPidScannerM->Open();
   isOpenDvrM = true;
   return true;
 }
@@ -317,7 +351,9 @@ bool cIptvDevice::OpenDvr(void)
 void cIptvDevice::CloseDvr(void)
 {
   debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
-  if (sidScanEnabledM && pSidScannerM )
+  if (pidScanEnabledM && pPidScannerM)
+     pPidScannerM->Close();
+  if (sidScanEnabledM && pSidScannerM)
      pSidScannerM->Close();
   if (pIptvStreamerM)
      pIptvStreamerM->Close();
@@ -333,7 +369,7 @@ bool cIptvDevice::HasLock(int timeoutMsP) const
 bool cIptvDevice::HasInternalCam(void)
 {
   //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
-  return true;
+  return false;
 }
 
 void cIptvDevice::ResetBuffering(void)
@@ -381,39 +417,66 @@ unsigned int cIptvDevice::CheckData(void)
   return 0;
 }
 
-bool cIptvDevice::GetTSPacket(uchar *&Data)
+uchar *cIptvDevice::GetData(int *availableP)
 {
   //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
-  if (tsBufferM && !IsBuffering()) {
-     if (isPacketDeliveredM) {
-        tsBufferM->Del(TS_SIZE);
-        isPacketDeliveredM = false;
-        // Update buffer statistics
-        AddBufferStatistic(TS_SIZE, tsBufferM->Available());
-        }
-     int Count = 0;
-     uchar *p = tsBufferM->Get(Count);
-     if (p && Count >= TS_SIZE) {
+  if (isOpenDvrM && tsBufferM && !IsBuffering()) {
+     int count = 0;
+     if (isPacketDeliveredM)
+        SkipData(TS_SIZE);
+     uchar *p = tsBufferM->Get(count);
+     if (p && count >= TS_SIZE) {
         if (*p != TS_SYNC_BYTE) {
-           for (int i = 1; i < Count; i++) {
+           for (int i = 1; i < count; i++) {
                if (p[i] == TS_SYNC_BYTE) {
-                  Count = i;
+                  count = i;
                   break;
                   }
                }
-           tsBufferM->Del(Count);
-           error("Skipped %d bytes to sync on TS packet", Count);
-           return false;
+           tsBufferM->Del(count);
+           error("Skipped %d bytes to sync on TS packet", count);
+           return NULL;
            }
         isPacketDeliveredM = true;
-        Data = p;
+        if (availableP)
+           *availableP = count;
         // Update pid statistics
         AddPidStatistic(ts_pid(p), payload(p));
-        return true;
+        return p;
         }
      }
+  return NULL;
+}
+
+void cIptvDevice::SkipData(int countP)
+{
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  tsBufferM->Del(countP);
+  isPacketDeliveredM = false;
+  // Update buffer statistics
+  AddBufferStatistic(countP, tsBufferM->Available());
+}
+
+bool cIptvDevice::GetTSPacket(uchar *&dataP)
+{
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  if (tsBufferM) {
+     if (cCamSlot *cs = CamSlot()) {
+        if (cs->WantsTsData()) {
+           int available;
+           dataP = GetData(&available);
+           if (dataP) {
+              dataP = cs->Decrypt(dataP, available);
+              SkipData(available);
+              }
+           return true;
+           }
+        }
+     dataP = GetData();
+     return true;
+     }
   // Reduce cpu load by preventing busylooping
   cCondWait::SleepMs(10);
-  Data = NULL;
+  dataP = NULL;
   return true;
 }

device.h

@@ -27,6 +27,7 @@ class cIptvDevice : public cDevice, public cIptvPidStatistics, public cIptvBuffe
 public:
   static unsigned int deviceCount;
   static bool Initialize(unsigned int DeviceCount);
+  static void Shutdown(void);
   static unsigned int Count(void);
   static cIptvDevice *GetIptvDevice(int CardIndex);
 
@@ -40,7 +41,7 @@ private:
   bool pidScanEnabledM;
   cRingBufferLinear *tsBufferM;
   mutable int tsBufferPrefillM;
-  tChannelID channelIdM;
+  cChannel channelM;
   cIptvProtocolUdp *pUdpProtocolM;
   cIptvProtocolCurl *pCurlProtocolM;
   cIptvProtocolHttp *pHttpProtocolM;
@@ -87,10 +88,18 @@ public:
   virtual bool ProvidesChannel(const cChannel *channelP, int priorityP = -1, bool *needsDetachReceiversP = NULL) const;
   virtual bool ProvidesEIT(void) const;
   virtual int NumProvidedSystems(void) const;
+  virtual const cChannel *GetCurrentlyTunedTransponder(void) const;
+  virtual bool IsTunedToTransponder(const cChannel *channelP) const;
+  virtual bool MaySwitchTransponder(const cChannel *channelP) const;
+
 protected:
   virtual bool SetChannelDevice(const cChannel *channelP, bool liveViewP);
 
   // for recording
+private:
+  uchar *GetData(int *availableP = NULL);
+  void SkipData(int countP);
+
 protected:
   virtual bool SetPid(cPidHandle *handleP, int typeP, bool onP);
   virtual bool OpenDvr(void);

iptv.c

@@ -13,15 +13,15 @@
 #include "device.h"
 #include "iptvservice.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 20000
-#error "VDR-2.0.0 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 20106
+#error "VDR-2.1.6 API version or greater is required!"
 #endif
 
 #ifndef GITVERSION
 #define GITVERSION ""
 #endif
 
-       const char VERSION[]     = "2.0.0" GITVERSION;
+       const char VERSION[]     = "2.1.2" GITVERSION;
 static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
 
 class cPluginIptv : public cPlugin {
@@ -99,7 +99,8 @@ bool cPluginIptv::Initialize(void)
 {
   debug("cPluginIptv::%s()", __FUNCTION__);
   // Initialize any background activities the plugin shall perform.
-  IptvConfig.SetConfigDirectory(cPlugin::ResourceDirectory(PLUGIN_NAME_I18N));
+  IptvConfig.SetConfigDirectory(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N));
+  IptvConfig.SetResourceDirectory(cPlugin::ResourceDirectory(PLUGIN_NAME_I18N));
   return cIptvDevice::Initialize(deviceCountM);
 }
 
@@ -109,7 +110,14 @@ bool cPluginIptv::Start(void)
   // Start any background activities the plugin shall perform.
   if (curl_global_init(CURL_GLOBAL_ALL) == CURLE_OK) {
      curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-     info("Using CURL %s", data->version);
+     cString info = cString::sprintf("Using CURL %s", data->version);
+     for (int i = 0; data->protocols[i]; ++i) {
+         // Supported protocols: HTTP(S), RTSP, FILE
+         if (startswith(data->protocols[i], "http") || startswith(data->protocols[i], "rtsp") ||
+             startswith(data->protocols[i], "file"))
+            info = cString::sprintf("%s %s", *info, data->protocols[i]);
+         }
+     info("%s", *info);
      }
   return true;
 }
@@ -118,6 +126,7 @@ void cPluginIptv::Stop(void)
 {
   debug("cPluginIptv::%s()", __FUNCTION__);
   // Stop any background activities the plugin is performing.
+  cIptvDevice::Shutdown();
   curl_global_cleanup();
 }
 
@@ -188,7 +197,7 @@ bool cPluginIptv::SetupParse(const char *nameP, const char *valueP)
   else if (!strcasecmp(nameP, "TsBufferPrefill"))
      IptvConfig.SetTsBufferPrefillRatio(atoi(valueP));
   else if (!strcasecmp(nameP, "ExtProtocolBasePort"))
-     IptvConfig.SetExtProtocolBasePort(atoi(valueP));
+     IptvConfig.SetProtocolBasePort(atoi(valueP));
   else if (!strcasecmp(nameP, "SectionFiltering"))
      IptvConfig.SetSectionFiltering(atoi(valueP));
   else if (!strcasecmp(nameP, "DisabledFilters")) {

pidscanner.c

@@ -39,7 +39,6 @@ void cPidScanner::SetChannel(const tChannelID &channelIdP)
   aPidM = 0xFFFF;
   numApidsM = 0;
   processM = true;
-  timeoutM.Set(PIDSCANNER_TIMEOUT_IN_MS);
 }
 
 void cPidScanner::Process(const uint8_t* bufP)

pidscanner.h

@@ -13,6 +13,12 @@
 
 class cPidScanner {
 private:
+  enum {
+    PIDSCANNER_APID_COUNT      = 5,    /* minimum count of audio pid samples for pid detection */
+    PIDSCANNER_VPID_COUNT      = 5,    /* minimum count of video pid samples for pid detection */
+    PIDSCANNER_PID_DELTA_COUNT = 100,  /* minimum count of pid samples for audio/video only pid detection */
+    PIDSCANNER_TIMEOUT_IN_MS   = 15000 /* 15s timeout for detection */
+  };
   cTimeMs timeoutM;
   tChannelID channelIdM;
   bool processM;
@@ -26,6 +32,8 @@ public:
   ~cPidScanner();
   void SetChannel(const tChannelID &channelIdP);
   void Process(const uint8_t* bufP);
+  void Open()  { debug("cPidScanner::%s()", __FUNCTION__); timeoutM.Set(PIDSCANNER_TIMEOUT_IN_MS); }
+  void Close() { debug("cPidScanner::%s()", __FUNCTION__); timeoutM.Set(0); }
 };
 
 #endif // __PIDSCANNER_H

po/de_DE.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# Copyright (C) 2007-2014 Rolf Ahrenberg & Antti Seppala
 # This file is distributed under the same license as the iptv package.
 # Tobias <vdr@e-tobi.net>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.2\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-01 04:01+0200\n"
-"PO-Revision-Date: 2013-04-01 04:01+0200\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: Tobias Grimm <tg@e-tobi.net>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
 "Language: de\n"
@@ -77,13 +77,13 @@ msgid ""
 "This is useful if streaming media over a slow or unreliable connection."
 msgstr ""
 
-msgid "EXT protocol base port"
-msgstr "EXT Protokoll Basisport"
+msgid "Protocol base port"
+msgstr "Protokoll Basisport"
 
 msgid ""
-"Define a base port used by EXT protocol.\n"
+"Define a base port used by CURL/EXT protocol.\n"
 "\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
 msgstr ""
 
 msgid "Use section filtering"
@@ -130,12 +130,6 @@ msgstr "DATEI"
 msgid "EXT"
 msgstr "EXT"
 
-msgid "Nid"
-msgstr "Nid"
-
-msgid "Tid"
-msgstr "Tid"
-
 msgid "Rid"
 msgstr "Rid"
 

po/fi_FI.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# Copyright (C) 2007-2014 Rolf Ahrenberg & Antti Seppala
 # This file is distributed under the same license as the iptv package.
 # Rolf Ahrenberg
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.2\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-01 04:01+0200\n"
-"PO-Revision-Date: 2013-04-01 04:01+0200\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"
@@ -82,17 +82,17 @@ msgstr ""
 "\n"
 "Puskurin esitäyttö parantaa suoratoistoa hitailla ja epäluotettavilla yhteyksillä."
 
-msgid "EXT protocol base port"
-msgstr "EXT-protokollan perusportti"
+msgid "Protocol base port"
+msgstr "Protokollan perusportti"
 
 msgid ""
-"Define a base port used by EXT protocol.\n"
+"Define a base port used by CURL/EXT protocol.\n"
 "\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
 msgstr ""
-"Määrittele EXT-protokollan käyttämä perusportti.\n"
+"Määrittele protokollan käyttämä perusportti.\n"
 "\n"
-"Porttiavaruuden koko määräytyy käytettyjen IPTV-laitteiden mukaan. Laajennos lukee EXT-protokollan yhteydessä perusportista dataa, jota ulkoiset ohjelmistot tarjoavat."
+"Porttiavaruuden koko määräytyy käytettyjen IPTV-laitteiden mukaan. Laajennos lukee CURL/EXT-protokollan yhteydessä perusportista dataa, jota ulkoiset ohjelmistot tarjoavat."
 
 msgid "Use section filtering"
 msgstr "Käytä sektioiden suodatusta"
@@ -145,12 +145,6 @@ msgstr "FILE"
 msgid "EXT"
 msgstr "EXT"
 
-msgid "Nid"
-msgstr "Verkko-ID"
-
-msgid "Tid"
-msgstr "Lähete-ID"
-
 msgid "Rid"
 msgstr "Radio-ID"
 

po/fr_FR.po

@@ -1,15 +1,15 @@
 # French translations for iptv package.
-# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# Copyright (C) 2007-2014 Rolf Ahrenberg & Antti Seppala
 # This file is distributed under the same license as the iptv package.
 # Bruno ROUSSEL <bruno.roussel@free.fr>, 2007.
 # NIVAL Michaël <mnival@club-internet.fr>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.2\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-01 04:01+0200\n"
-"PO-Revision-Date: 2013-04-01 04:01+0200\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: NIVAL Michaël <mnival@club-internet.fr>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
@@ -84,17 +84,17 @@ msgstr ""
 "\n"
 "Cette option est utile si le streaming est sur une connexion lente ou peu fiables."
 
-msgid "EXT protocol base port"
-msgstr "Port de base du protocole EXT"
+msgid "Protocol base port"
+msgstr "Port de base du protocole"
 
 msgid ""
-"Define a base port used by EXT protocol.\n"
+"Define a base port used by CURL/EXT protocol.\n"
 "\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
 msgstr ""
-"Définit le port de base utilisé par le protocole EXT.\n"
+"Définit le port de base utilisé par le protocole CURL/EXT.\n"
 "\n"
-"La plage de port est défini par le nombre de dispositif IPTV. Ce paramètre défini le port qui est écouté pour les connexions à partir d'applications externes en utilisant le protocole EXT."
+"La plage de port est défini par le nombre de dispositif IPTV. Ce paramètre défini le port qui est écouté pour les connexions à partir d'applications externes en utilisant le protocole CURL/EXT."
 
 msgid "Use section filtering"
 msgstr "Utiliser le filtrage de section"
@@ -147,12 +147,6 @@ msgstr "FICHIER"
 msgid "EXT"
 msgstr "EXT"
 
-msgid "Nid"
-msgstr "Nid"
-
-msgid "Tid"
-msgstr "Tid"
-
 msgid "Rid"
 msgstr "Rid"
 

po/it_IT.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# Copyright (C) 2007-2014 Rolf Ahrenberg & Antti Seppala
 # This file is distributed under the same license as the iptv package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.2\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-01 04:01+0200\n"
-"PO-Revision-Date: 2013-04-01 04:01+0200\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -83,17 +83,17 @@ msgstr ""
 "\n"
 "Questo è utile se si trasmette dati su una connessione lenta oppure inaffidabile."
 
-msgid "EXT protocol base port"
-msgstr "Porta base protocollo EXT"
+msgid "Protocol base port"
+msgstr "Porta base protocollo"
 
 msgid ""
-"Define a base port used by EXT protocol.\n"
+"Define a base port used by CURL/EXT protocol.\n"
 "\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
 msgstr ""
-"Definisci una porta base usata dal protocollo EXT.\n"
+"Definisci una porta base usata dal protocollo CURL/EXT.\n"
 "\n"
-"Il range della porta è definito dal numero di periferiche IPTV. Questo parametro imposta la porta che è in ascolto per connessioni da applicazioni esterne quando si usa il protocollo EXT."
+"Il range della porta è definito dal numero di periferiche IPTV. Questo parametro imposta la porta che è in ascolto per connessioni da applicazioni esterne quando si usa il protocollo CURL/EXT."
 
 msgid "Use section filtering"
 msgstr "Utilizza sezione filtri"
@@ -146,12 +146,6 @@ msgstr "FILE"
 msgid "EXT"
 msgstr "EXT"
 
-msgid "Nid"
-msgstr "Nid"
-
-msgid "Tid"
-msgstr "Tid"
-
 msgid "Rid"
 msgstr "Rid"
 

po/nl_NL.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# Copyright (C) 2007-2014 Rolf Ahrenberg & Antti Seppala
 # This file is distributed under the same license as the iptv package.
 # Carel, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.2\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-01 04:01+0200\n"
-"PO-Revision-Date: 2013-04-01 04:01+0200\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: Carel\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
 "Language: nl\n"
@@ -83,17 +83,17 @@ msgstr ""
 "\n"
 "Dit is aan te bevelen bij onbetrouwbare of langzame verbindingen."
 
-msgid "EXT protocol base port"
-msgstr "EXT protocol basispoort"
+msgid "Protocol base port"
+msgstr "Protocol basispoort"
 
 msgid ""
-"Define a base port used by EXT protocol.\n"
+"Define a base port used by CURL/EXT protocol.\n"
 "\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
 msgstr ""
-"Bepaal de basispoort voor het EXT protocol.\n"
+"Bepaal de basispoort voor het CURL/EXT protocol.\n"
 "\n"
-"De poortrange wordt bepaald door het aantal IPTV apparaten. Deze poort luistert naar inkomende verbindingen wanneer het EXT protocol wordt gebruikt."
+"De poortrange wordt bepaald door het aantal IPTV apparaten. Deze poort luistert naar inkomende verbindingen wanneer het CURL/EXT protocol wordt gebruikt."
 
 msgid "Use section filtering"
 msgstr "Benutze Abschnittsfilterung"
@@ -145,12 +145,6 @@ msgstr "BESTAND"
 msgid "EXT"
 msgstr "EXT"
 
-msgid "Nid"
-msgstr "Nid"
-
-msgid "Tid"
-msgstr "Tid"
-
 msgid "Rid"
 msgstr "Rid"
 

po/ru_RU.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# Copyright (C) 2007-2014 Rolf Ahrenberg & Antti Seppala
 # This file is distributed under the same license as the iptv package.
 # Alexander Gross <Bikalexander@gmail.com>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.2\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-01 04:01+0200\n"
-"PO-Revision-Date: 2013-04-01 04:01+0200\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
 "Language: ru\n"
@@ -78,13 +78,13 @@ msgid ""
 "This is useful if streaming media over a slow or unreliable connection."
 msgstr ""
 
-msgid "EXT protocol base port"
-msgstr "Базисный порт EXT протокола"
+msgid "Protocol base port"
+msgstr "Базисный порт протокола"
 
 msgid ""
-"Define a base port used by EXT protocol.\n"
+"Define a base port used by CURL/EXT protocol.\n"
 "\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
 msgstr ""
 
 msgid "Use section filtering"
@@ -131,12 +131,6 @@ msgstr "ФАЙЛ"
 msgid "EXT"
 msgstr "EXT"
 
-msgid "Nid"
-msgstr "Nid"
-
-msgid "Tid"
-msgstr "Tid"
-
 msgid "Rid"
 msgstr "Rid"
 

protocolcurl.c

@@ -15,25 +15,27 @@
 
 #define iptv_curl_easy_setopt(X, Y, Z) \
   if ((res = curl_easy_setopt((X), (Y), (Z))) != CURLE_OK) { \
-     error("curl_easy_setopt(%s, %s, %s) failed: %d", #X, #Y, #Z, res); \
+     error("curl_easy_setopt(%s, %s) failed: %s (%d)", #Y, #Z, curl_easy_strerror(res), res); \
      }
 
 #define iptv_curl_easy_perform(X) \
   if ((res = curl_easy_perform((X))) != CURLE_OK) { \
-     error("curl_easy_perform(%s) failed: %d", #X, res); \
+     error("curl_easy_perform() failed: %s (%d)", curl_easy_strerror(res), res); \
      }
 
 cIptvProtocolCurl::cIptvProtocolCurl()
 : streamUrlM(""),
   streamParamM(0),
+  streamPortM(0),
   mutexM(),
   handleM(NULL),
   multiM(NULL),
   headerListM(NULL),
   ringBufferM(new cRingBufferLinear(MEGABYTE(IptvConfig.GetTsBufferSize()),
                                     7 * TS_SIZE, false, "IPTV CURL")),
-  rtspControlM(),
+  rtspControlM(""),
   modeM(eModeUnknown),
+  timeoutM(),
   connectedM(false),
   pausedM(false)
 {
@@ -73,7 +75,7 @@ size_t cIptvProtocolCurl::WriteRtspCallback(void *ptrP, size_t sizeP, size_t nme
   //debug("cIptvProtocolCurl::%s(%zu)", __FUNCTION__, len);
 
   // Validate packet header ('$') and channel (0)
-  if (obj && (p[0] == 0x24 ) && (p[1] == 0)) {
+  if (obj && (p[0] == 0x24) && (p[1] == 0)) {
      int length = (p[2] << 8) | p[3];
      if (length > 3) {
         // Skip interleave header
@@ -114,17 +116,24 @@ size_t cIptvProtocolCurl::DescribeCallback(void *ptrP, size_t sizeP, size_t nmem
   size_t len = sizeP * nmembP;
   //debug("cIptvProtocolCurl::%s(%zu)", __FUNCTION__, len);
 
+  bool found = false;
   cString control = "";
   char *p = (char *)ptrP;
   char *r = strtok(p, "\r\n");
 
   while (r) {
     //debug("cIptvProtocolCurl::%s(%zu): %s", __FUNCTION__, len, r);
-    if (strstr(r, "a=control")) {
+    // Look for a media name: "video"
+    if (strstr(r, "m=video")) {
+       found = true;
+       }
+    // ... and find out its' attribute
+    if (found && strstr(r, "a=control")) {
        char *s = NULL;
-       if (sscanf(r, "a=control:%64ms", &s) == 1)
+       if (sscanf(r, "a=control:%255ms", &s) == 1)
           control = compactspace(s);
        free(s);
+       break;
        }
     r = strtok(NULL, "\r\n");
     }
@@ -155,8 +164,14 @@ size_t cIptvProtocolCurl::HeaderCallback(void *ptrP, size_t sizeP, size_t nmembP
 void cIptvProtocolCurl::SetRtspControl(const char *controlP)
 {
   cMutexLock MutexLock(&mutexM);
-  debug("cIptvProtocolCurl::%s(%s)", __FUNCTION__, controlP);
-  rtspControlM = controlP;
+  //debug("cIptvProtocolCurl::%s(%s)", __FUNCTION__, controlP);
+  cString protocol = ChangeCase(controlP, false).Truncate(7);
+  if (startswith(*protocol, "rtsp://")) {
+     streamUrlM = controlP;
+     rtspControlM = "";
+     }
+  else
+     rtspControlM = controlP;
 }
 
 bool cIptvProtocolCurl::PutData(unsigned char *dataP, int lenP)
@@ -238,10 +253,8 @@ bool cIptvProtocolCurl::Connect()
   // Initialize the curl session
   if (!handleM)
      handleM = curl_easy_init();
-  if (!multiM)
-     multiM = curl_multi_init();
 
-  if (handleM && multiM && !isempty(*streamUrlM)) {
+  if (handleM && !isempty(*streamUrlM)) {
      CURLcode res = CURLE_OK;
      cString netrc = cString::sprintf("%s/netrc", IptvConfig.GetConfigDirectory());
 
@@ -264,7 +277,8 @@ bool cIptvProtocolCurl::Connect()
      iptv_curl_easy_setopt(handleM, CURLOPT_NETRC, (long)CURL_NETRC_OPTIONAL);
      iptv_curl_easy_setopt(handleM, CURLOPT_NETRC_FILE, *netrc);
 
-     // Set timeout
+     // Set timeouts
+     iptv_curl_easy_setopt(handleM, CURLOPT_TIMEOUT, (long)eConnectTimeoutS);
      iptv_curl_easy_setopt(handleM, CURLOPT_CONNECTTIMEOUT, (long)eConnectTimeoutS);
 
      // Set user-agent
@@ -283,6 +297,10 @@ bool cIptvProtocolCurl::Connect()
             {
             cString uri, control, transport, range;
 
+            // Create the listening socket for UDP mode
+            if (!streamParamM)
+               OpenSocket(streamPortM);
+
             // Request server options
             uri = cString::sprintf("%s", *streamUrlM);
             iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_STREAM_URI, *uri);
@@ -300,8 +318,14 @@ bool cIptvProtocolCurl::Connect()
             iptv_curl_easy_setopt(handleM, CURLOPT_WRITEDATA, NULL);
 
             // Setup media stream
-            uri = cString::sprintf("%s/%s", *streamUrlM, *rtspControlM);
-            transport = "RTP/AVP/TCP;unicast;interleaved=0-1";
+            if (isempty(*rtspControlM))
+               uri = cString::sprintf("%s", *streamUrlM);
+            else
+               uri = cString::sprintf("%s/%s", *streamUrlM, *rtspControlM);
+            if (streamParamM)
+               transport = "RTP/AVP/TCP;unicast;interleaved=0-1";
+            else
+               transport = cString::sprintf("RTP/AVP;unicast;client_port=%d-%d", streamPortM, streamPortM + 1);
             iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_STREAM_URI, *uri);
             iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_TRANSPORT, *transport);
             iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_SETUP);
@@ -311,15 +335,20 @@ bool cIptvProtocolCurl::Connect()
             uri = cString::sprintf("%s/", *streamUrlM);
             range = "0.000-";
             iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_STREAM_URI, *uri);
-            iptv_curl_easy_setopt(handleM, CURLOPT_RANGE, *range);
+            //iptv_curl_easy_setopt(handleM, CURLOPT_RANGE, *range);
             iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_PLAY);
             iptv_curl_easy_perform(handleM);
 
             // Start receiving
-            iptv_curl_easy_setopt(handleM, CURLOPT_INTERLEAVEFUNCTION, cIptvProtocolCurl::WriteRtspCallback);
-            iptv_curl_easy_setopt(handleM, CURLOPT_INTERLEAVEDATA, this);
-            iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_RECEIVE);
-            iptv_curl_easy_perform(handleM);
+            if (streamParamM) {
+               iptv_curl_easy_setopt(handleM, CURLOPT_INTERLEAVEFUNCTION, cIptvProtocolCurl::WriteRtspCallback);
+               iptv_curl_easy_setopt(handleM, CURLOPT_INTERLEAVEDATA, this);
+               iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_RECEIVE);
+               iptv_curl_easy_perform(handleM);
+               }
+
+            // Don't add handle into multi set
+            isActiveM = true;
             }
             break;
 #endif
@@ -341,18 +370,34 @@ bool cIptvProtocolCurl::Connect()
             headerListM = curl_slist_append(headerListM, "Pragma: no-cache");
             headerListM = curl_slist_append(headerListM, "Expires: Mon, 26 Jul 1997 05:00:00 GMT");
             iptv_curl_easy_setopt(handleM, CURLOPT_HTTPHEADER, headerListM);
+
+            // Initialize multi set and add handle into it
+            if (!multiM)
+               multiM = curl_multi_init();
+            if (multiM)
+               curl_multi_add_handle(multiM, handleM);
             }
             break;
 
        case eModeFile:
+            {
+            // Set timeout
+            iptv_curl_easy_setopt(handleM, CURLOPT_TIMEOUT_MS, 10L);
+
+            // Initialize multi set and add handle into it
+            if (!multiM)
+               multiM = curl_multi_init();
+            if (multiM)
+               curl_multi_add_handle(multiM, handleM);
+            }
+            break;
+
        case eModeUnknown:
        default:
             break;
        }
 
-     // Add handle into multi set
-     curl_multi_add_handle(multiM, handleM);
-
+     timeoutM.Set(eKeepAliveIntervalMs);
      connectedM = true;
      return true;
      }
@@ -368,7 +413,14 @@ bool cIptvProtocolCurl::Disconnect()
      return true;
 
   // Terminate curl session
-  if (handleM && multiM) {
+  if (handleM) {
+     // Remove handle from multi set
+     if (multiM) {
+        curl_multi_remove_handle(multiM, handleM);
+        curl_multi_cleanup(multiM);
+        multiM = NULL;
+        }
+
      // Mode specific tricks
      switch (modeM) {
 #ifdef USE_RTSP
@@ -381,6 +433,9 @@ bool cIptvProtocolCurl::Disconnect()
             iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_TEARDOWN);
             iptv_curl_easy_perform(handleM);
             rtspControlM = "";
+            isActiveM = false;
+            // Close the listening socket
+            CloseSocket();
             }
             break;
 #endif
@@ -397,11 +452,8 @@ bool cIptvProtocolCurl::Disconnect()
         curl_slist_free_all(headerListM);
         headerListM = NULL;
         }
-     curl_multi_remove_handle(multiM, handleM);
      curl_easy_cleanup(handleM);
      handleM = NULL;
-     curl_multi_cleanup(multiM);
-     multiM = NULL;
      }
 
   ClearData();
@@ -428,55 +480,70 @@ int cIptvProtocolCurl::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
   int len = 0;
   if (ringBufferM) {
      // Fill up the buffer
-     if (handleM && multiM) {
+     if (handleM) {
         switch (modeM) {
 #ifdef USE_RTSP
           case eModeRtsp:
                {
                cMutexLock MutexLock(&mutexM);
                CURLcode res = CURLE_OK;
-               iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_RECEIVE);
-               iptv_curl_easy_perform(handleM);
-               // @todo - How to detect eof?
+
+               // Remember the heart beat
+               if (timeoutM.TimedOut()) {
+                  debug("cIptvProtocolCurl::%s(): KeepAlive", __FUNCTION__);
+                  cString uri = cString::sprintf("%s", *streamUrlM);
+                  iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_STREAM_URI, *uri);
+                  iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_OPTIONS);
+                  iptv_curl_easy_perform(handleM);
+                  timeoutM.Set(eKeepAliveIntervalMs);
+                  }
+
+               // Check whether UDP or TCP mode used
+               if (streamParamM) {
+                  iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_RECEIVE);
+                  iptv_curl_easy_perform(handleM);
+                  }
+               else
+                  return cIptvUdpSocket::Read(bufferAddrP, bufferLenP);
                }
                break;
 #endif
           case eModeFile:
           case eModeHttp:
           case eModeHttps:
-               {
-               CURLMcode res;
-               int running_handles;
+               if (multiM) {
+                  CURLMcode res;
+                  int running_handles;
 
-               do {
-                 cMutexLock MutexLock(&mutexM);
-                 res = curl_multi_perform(multiM, &running_handles);
-               } while (res == CURLM_CALL_MULTI_PERFORM);
+                  do {
+                    cMutexLock MutexLock(&mutexM);
+                    res = curl_multi_perform(multiM, &running_handles);
+                  } while (res == CURLM_CALL_MULTI_PERFORM);
 
-               // Use 20% threshold before continuing to filling up the buffer.
-               mutexM.Lock();
-               if (pausedM && (ringBufferM->Available() < (MEGABYTE(IptvConfig.GetTsBufferSize()) / 5))) {
-                  debug("cIptvProtocolCurl::%s(continue): free=%d available=%d", __FUNCTION__,
-                        ringBufferM->Free(), ringBufferM->Available());
-                  pausedM = false;
-                  curl_easy_pause(handleM, CURLPAUSE_CONT);
-                  }
-               mutexM.Unlock();
-
-               // Check if end of file
-               if (running_handles == 0) {
-                  int msgcount;
+                  // Use 20% threshold before continuing to filling up the buffer.
                   mutexM.Lock();
-                  CURLMsg *msg = curl_multi_info_read(multiM, &msgcount);
+                  if (pausedM && (ringBufferM->Available() < (MEGABYTE(IptvConfig.GetTsBufferSize()) / 5))) {
+                     debug("cIptvProtocolCurl::%s(continue): free=%d available=%d", __FUNCTION__,
+                           ringBufferM->Free(), ringBufferM->Available());
+                     pausedM = false;
+                     curl_easy_pause(handleM, CURLPAUSE_CONT);
+                     }
                   mutexM.Unlock();
-                  if (msg && (msg->msg == CURLMSG_DONE)) {
-                     debug("cIptvProtocolCurl::%s(done): %s (%d)", __FUNCTION__,
-                           curl_easy_strerror(msg->data.result), msg->data.result);
-                     Disconnect();
-                     Connect();
+
+                  // Check if end of file
+                  if (running_handles == 0) {
+                     int msgcount;
+                     mutexM.Lock();
+                     CURLMsg *msg = curl_multi_info_read(multiM, &msgcount);
+                     mutexM.Unlock();
+                     if (msg && (msg->msg == CURLMSG_DONE)) {
+                        debug("cIptvProtocolCurl::%s(done): %s (%d)", __FUNCTION__,
+                              curl_easy_strerror(msg->data.result), msg->data.result);
+                        Disconnect();
+                        Connect();
+                        }
                      }
                   }
-               }
                break;
 
           case eModeUnknown:
@@ -498,7 +565,7 @@ int cIptvProtocolCurl::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
   return len;
 }
 
-bool cIptvProtocolCurl::Set(const char* locationP, const int parameterP, const int indexP)
+bool cIptvProtocolCurl::SetSource(const char* locationP, const int parameterP, const int indexP)
 {
   debug("cIptvProtocolCurl::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
   if (!isempty(locationP)) {
@@ -518,14 +585,22 @@ bool cIptvProtocolCurl::Set(const char* locationP, const int parameterP, const i
      else
         modeM = eModeUnknown;
      debug("cIptvProtocolCurl::%s(): %s (%d)", __FUNCTION__, *protocol, modeM);
-     // Update stream parameter
-     streamParamM = parameterP;
+     // Update stream parameter - force UDP mode for RTSP
+     streamParamM = (modeM == eModeRtsp) ? 0 : parameterP;
+     // Update listen port
+     streamPortM = IptvConfig.GetProtocolBasePort() + indexP * 2;
      // Reconnect
      Connect();
      }
   return true;
 }
 
+bool cIptvProtocolCurl::SetPid(int pidP, int typeP, bool onP)
+{
+  //debug("cIptvProtocolCurl::%s(%d, %d, %d)", __FUNCTION__, pidP, typeP, onP);
+  return true;
+}
+
 cString cIptvProtocolCurl::GetInformation(void)
 {
   //debug("cIptvProtocolCurl::%s()", __FUNCTION__);

protocolcurl.h

@@ -16,8 +16,9 @@
 #include <vdr/tools.h>
 
 #include "protocolif.h"
+#include "socket.h"
 
-class cIptvProtocolCurl : public cIptvProtocolIf {
+class cIptvProtocolCurl : public cIptvUdpSocket, public cIptvProtocolIf {
 private:
   enum eModeType {
     eModeUnknown = 0,
@@ -28,8 +29,9 @@ private:
     eModeCount
   };
   enum {
-    eConnectTimeoutS       = 5,  // in seconds
-    eMaxDownloadSpeedMBits = 20  // in megabits per second
+    eConnectTimeoutS       = 5,     // in seconds
+    eMaxDownloadSpeedMBits = 20,    // in megabits per second
+    eKeepAliveIntervalMs   = 300000 // in milliseconds
   };
 
   static size_t WriteCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP);
@@ -39,6 +41,7 @@ private:
 
   cString streamUrlM;
   int streamParamM;
+  int streamPortM;
   cMutex mutexM;
   CURL *handleM;
   CURLM *multiM;
@@ -46,6 +49,7 @@ private:
   cRingBufferLinear *ringBufferM;
   cString rtspControlM;
   eModeType modeM;
+  cTimeMs timeoutM;
   bool connectedM;
   bool pausedM;
 
@@ -60,7 +64,8 @@ public:
   cIptvProtocolCurl();
   virtual ~cIptvProtocolCurl();
   int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
-  bool Set(const char* locationP, const int parameterP, const int indexP);
+  bool SetSource(const char* locationP, const int parameterP, const int indexP);
+  bool SetPid(int pidP, int typeP, bool onP);
   bool Open(void);
   bool Close(void);
   cString GetInformation(void);

protocolext.c

@@ -152,24 +152,30 @@ int cIptvProtocolExt::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
   return cIptvUdpSocket::Read(bufferAddrP, bufferLenP);
 }
 
-bool cIptvProtocolExt::Set(const char* locationP, const int parameterP, const int indexP)
+bool cIptvProtocolExt::SetSource(const char* locationP, const int parameterP, const int indexP)
 {
   debug("cIptvProtocolExt::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
   if (!isempty(locationP)) {
      struct stat stbuf;
      // Update script file and parameter
-     scriptFileM = cString::sprintf("%s/%s", IptvConfig.GetConfigDirectory(), locationP);
+     scriptFileM = cString::sprintf("%s/%s", IptvConfig.GetResourceDirectory(), locationP);
      if ((stat(*scriptFileM, &stbuf) != 0) || (strstr(*scriptFileM, "..") != 0)) {
         error("Non-existent or relative path script '%s'", *scriptFileM);
         return false;
         }
      scriptParameterM = parameterP;
      // Update listen port
-     streamPortM = IptvConfig.GetExtProtocolBasePort() + indexP;
+     streamPortM = IptvConfig.GetProtocolBasePort() + indexP * 2;
      }
   return true;
 }
 
+bool cIptvProtocolExt::SetPid(int pidP, int typeP, bool onP)
+{
+  //debug("cIptvProtocolExt::%s(%d, %d, %d)", __FUNCTION__, pidP, typeP, onP);
+  return true;
+}
+
 cString cIptvProtocolExt::GetInformation(void)
 {
   //debug("cIptvProtocolExt::%s()", __FUNCTION__);

protocolext.h

@@ -27,7 +27,8 @@ public:
   cIptvProtocolExt();
   virtual ~cIptvProtocolExt();
   int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
-  bool Set(const char* locationP, const int parameterP, const int indexP);
+  bool SetSource(const char* locationP, const int parameterP, const int indexP);
+  bool SetPid(int pidP, int typeP, bool onP);
   bool Open(void);
   bool Close(void);
   cString GetInformation(void);

protocolfile.c

@@ -95,7 +95,7 @@ bool cIptvProtocolFile::Close(void)
   return true;
 }
 
-bool cIptvProtocolFile::Set(const char* locationP, const int parameterP, const int indexP)
+bool cIptvProtocolFile::SetSource(const char* locationP, const int parameterP, const int indexP)
 {
   debug("cIptvProtocolFile::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
   if (!isempty(locationP)) {
@@ -110,6 +110,12 @@ bool cIptvProtocolFile::Set(const char* locationP, const int parameterP, const i
   return true;
 }
 
+bool cIptvProtocolFile::SetPid(int pidP, int typeP, bool onP)
+{
+  //debug("cIptvProtocolFile::%s(%d, %d, %d)", __FUNCTION__, pidP, typeP, onP);
+  return true;
+}
+
 cString cIptvProtocolFile::GetInformation(void)
 {
   //debug("cIptvProtocolFile::%s()", __FUNCTION__);

protocolfile.h

@@ -26,7 +26,8 @@ public:
   cIptvProtocolFile();
   virtual ~cIptvProtocolFile();
   int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
-  bool Set(const char* locationP, const int parameterP, const int indexP);
+  bool SetSource(const char* locationP, const int parameterP, const int indexP);
+  bool SetPid(int pidP, int typeP, bool onP);
   bool Open(void);
   bool Close(void);
   cString GetInformation(void);

protocolhttp.c

@@ -177,7 +177,7 @@ int cIptvProtocolHttp::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
   return cIptvTcpSocket::Read(bufferAddrP, bufferLenP);
 }
 
-bool cIptvProtocolHttp::Set(const char* locationP, const int parameterP, const int indexP)
+bool cIptvProtocolHttp::SetSource(const char* locationP, const int parameterP, const int indexP)
 {
   debug("cIptvProtocolHttp::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
   if (!isempty(locationP)) {
@@ -199,6 +199,12 @@ bool cIptvProtocolHttp::Set(const char* locationP, const int parameterP, const i
   return true;
 }
 
+bool cIptvProtocolHttp::SetPid(int pidP, int typeP, bool onP)
+{
+  //debug("cIptvProtocolHttp::%s(%d, %d, %d)", __FUNCTION__, pidP, typeP, onP);
+  return true;
+}
+
 cString cIptvProtocolHttp::GetInformation(void)
 {
   //debug("cIptvProtocolHttp::%s()", __FUNCTION__);

protocolhttp.h

@@ -28,7 +28,8 @@ public:
   cIptvProtocolHttp();
   virtual ~cIptvProtocolHttp();
   int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
-  bool Set(const char* locationP, const int parameterP, const int indexP);
+  bool SetSource(const char* locationP, const int parameterP, const int indexP);
+  bool SetPid(int pidP, int typeP, bool onP);
   bool Open(void);
   bool Close(void);
   cString GetInformation(void);

protocolif.h

@@ -13,7 +13,8 @@ public:
   cIptvProtocolIf() {}
   virtual ~cIptvProtocolIf() {}
   virtual int Read(unsigned char* bufferAddrP, unsigned int bufferLenP) = 0;
-  virtual bool Set(const char* locationP, const int parameterP, const int indexP) = 0;
+  virtual bool SetSource(const char* locationP, const int parameterP, const int indexP) = 0;
+  virtual bool SetPid(int pidP, int typeP, bool onP) = 0;
   virtual bool Open(void) = 0;
   virtual bool Close(void) = 0;
   virtual cString GetInformation(void) = 0;

protocoludp.c

@@ -70,7 +70,7 @@ int cIptvProtocolUdp::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
   return cIptvUdpSocket::Read(bufferAddrP, bufferLenP);
 }
 
-bool cIptvProtocolUdp::Set(const char* locationP, const int parameterP, const int indexP)
+bool cIptvProtocolUdp::SetSource(const char* locationP, const int parameterP, const int indexP)
 {
   debug("cIptvProtocolUdp::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
   if (!isempty(locationP)) {
@@ -103,6 +103,12 @@ bool cIptvProtocolUdp::Set(const char* locationP, const int parameterP, const in
   return true;
 }
 
+bool cIptvProtocolUdp::SetPid(int pidP, int typeP, bool onP)
+{
+  //debug("cIptvProtocolUdp::%s(%d, %d, %d)", __FUNCTION__, pidP, typeP, onP);
+  return true;
+}
+
 cString cIptvProtocolUdp::GetInformation(void)
 {
   //debug("cIptvProtocolUdp::%s()", __FUNCTION__);

protocoludp.h

@@ -23,7 +23,8 @@ public:
   cIptvProtocolUdp();
   virtual ~cIptvProtocolUdp();
   int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
-  bool Set(const char* locationP, const int parameterP, const int indexP);
+  bool SetSource(const char* locationP, const int parameterP, const int indexP);
+  bool SetPid(int pidP, int typeP, bool onP);
   bool Open(void);
   bool Close(void);
   cString GetInformation(void);

sectionfilter.c

@@ -238,9 +238,9 @@ cIptvSectionFilterHandler::cIptvSectionFilterHandler(int deviceIndexP, unsigned
 cIptvSectionFilterHandler::~cIptvSectionFilterHandler()
 {
   debug("cIptvSectionFilterHandler::%s(%d)", __FUNCTION__, deviceIndexM);
-  // Stop thread
-  if (Running())
-     Cancel(3);
+  Stop();
+
+  DELETE_POINTER(ringBufferM);
 
   // Destroy all filters
   cMutexLock MutexLock(&mutexM);
@@ -248,6 +248,15 @@ cIptvSectionFilterHandler::~cIptvSectionFilterHandler()
       Delete(i);
 }
 
+bool cIptvSectionFilterHandler::Stop(void)
+{
+  debug("cIptvSectionFilterHandler::%s(%d): entering", __FUNCTION__, deviceIndexM);
+  // Stop thread
+  if (Running())
+     Cancel(3);
+  return true;
+}
+
 void cIptvSectionFilterHandler::Action(void)
 {
   debug("cIptvSectionFilterHandler::%s(%d): entering", __FUNCTION__, deviceIndexM);
@@ -371,6 +380,20 @@ void cIptvSectionFilterHandler::Close(int handleP)
       }
 }
 
+int cIptvSectionFilterHandler::GetPid(int handleP)
+{
+  // Lock
+  cMutexLock MutexLock(&mutexM);
+  // Search the filter for data
+  for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
+      if (filtersM[i] && (handleP == filtersM[i]->GetFd())) {
+         debug("cIptvSectionFilterHandler::%s(%d): pid=%d handle=%d index=%d", __FUNCTION__, deviceIndexM, filtersM[i]->GetPid(), filtersM[i]->GetFd(), i);
+         return filtersM[i]->GetPid();
+         }
+      }
+  return -1;
+}
+
 void cIptvSectionFilterHandler::Write(uchar *bufferP, int lengthP)
 {
   //debug("cIptvSectionFilterHandler::%s(%d): length=%d", __FUNCTION__, deviceIndexM, lengthP);
@@ -381,4 +404,3 @@ void cIptvSectionFilterHandler::Write(uchar *bufferP, int lengthP)
         ringBufferM->ReportOverflow(lengthP - len);
      }
 }
-

sectionfilter.h

@@ -80,9 +80,11 @@ protected:
 public:
   cIptvSectionFilterHandler(int deviceIndexP, unsigned int bufferLenP);
   virtual ~cIptvSectionFilterHandler();
+  bool Stop(void);
   cString GetInformation(void);
   int Open(u_short pidP, u_char tidP, u_char maskP);
   void Close(int handleP);
+  int GetPid(int handleP);
   void Write(u_char *bufferP, int lengthP);
 };
 

setup.c

@@ -115,7 +115,7 @@ cIptvPluginSetup::cIptvPluginSetup()
   debug("cIptvPluginSetup::%s()", __FUNCTION__);
   tsBufferSizeM = IptvConfig.GetTsBufferSize();
   tsBufferPrefillM = IptvConfig.GetTsBufferPrefillRatio();
-  extProtocolBasePortM = IptvConfig.GetExtProtocolBasePort();
+  protocolBasePortM = IptvConfig.GetProtocolBasePort();
   sectionFilteringM = IptvConfig.GetSectionFiltering();
   numDisabledFiltersM = IptvConfig.GetDisabledFiltersCount();
   if (numDisabledFiltersM > SECTION_FILTER_TABLE_SIZE)
@@ -136,20 +136,20 @@ void cIptvPluginSetup::Setup(void)
   Clear();
   helpM.Clear();
 
-  Add(new cMenuEditIntItem( tr("TS buffer size [MB]"), &tsBufferSizeM, 1, 4));
+  Add(new cMenuEditIntItem(tr("TS buffer size [MB]"), &tsBufferSizeM, 1, 4));
   helpM.Append(tr("Define a ringbuffer size for transport streams in megabytes.\n\nSmaller sizes help memory consumption, but are more prone to buffer overflows."));
 
-  Add(new cMenuEditIntItem( tr("TS buffer prefill ratio [%]"), &tsBufferPrefillM, 0, 40));
+  Add(new cMenuEditIntItem(tr("TS buffer prefill ratio [%]"), &tsBufferPrefillM, 0, 40));
   helpM.Append(tr("Define a prefill ratio of the ringbuffer for transport streams before data is transferred to VDR.\n\nThis is useful if streaming media over a slow or unreliable connection."));
 
-  Add(new cMenuEditIntItem( tr("EXT protocol base port"), &extProtocolBasePortM, 0, 0xFFF7));
-  helpM.Append(tr("Define a base port used by EXT protocol.\n\nThe port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."));
+  Add(new cMenuEditIntItem(tr("Protocol base port"), &protocolBasePortM, 0, 0xFFFF - MAXDEVICES * 2));
+  helpM.Append(tr("Define a base port used by CURL/EXT protocol.\n\nThe port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."));
 
   Add(new cMenuEditBoolItem(tr("Use section filtering"), &sectionFilteringM));
   helpM.Append(tr("Define whether the section filtering shall be used.\n\nSection filtering means that IPTV plugin tries to parse and provide VDR with secondary data about the currently active stream. VDR can then use this data for providing various functionalities such as automatic pid change detection and EPG etc.\nEnabling this feature does not affect streams that do not contain section data."));
 
   if (sectionFilteringM) {
-     Add(new cMenuEditIntItem( tr("Disable filters"), &numDisabledFiltersM, 0, SECTION_FILTER_TABLE_SIZE));
+     Add(new cMenuEditIntItem(tr("Disable filters"), &numDisabledFiltersM, 0, SECTION_FILTER_TABLE_SIZE));
      helpM.Append(tr("Define number of section filters to be disabled.\n\nCertain section filters might cause some unwanted behaviour to VDR such as time being falsely synchronized. By black-listing the filters here useful section data can be left intact for VDR to process."));
 
      for (int i = 0; i < numDisabledFiltersM; ++i) {
@@ -219,13 +219,13 @@ void cIptvPluginSetup::Store(void)
   // Store values into setup.conf
   SetupStore("TsBufferSize", tsBufferSizeM);
   SetupStore("TsBufferPrefill", tsBufferPrefillM);
-  SetupStore("ExtProtocolBasePort", extProtocolBasePortM);
+  SetupStore("ExtProtocolBasePort", protocolBasePortM);
   SetupStore("SectionFiltering", sectionFilteringM);
   StoreFilters("DisabledFilters", disabledFilterIndexesM);
   // Update global config
   IptvConfig.SetTsBufferSize(tsBufferSizeM);
   IptvConfig.SetTsBufferPrefillRatio(tsBufferPrefillM);
-  IptvConfig.SetExtProtocolBasePort(extProtocolBasePortM);
+  IptvConfig.SetProtocolBasePort(protocolBasePortM);
   IptvConfig.SetSectionFiltering(sectionFilteringM);
   for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i)
       IptvConfig.SetDisabledFilters(i, disabledFilterIndexesM[i]);

setup.h

@@ -17,7 +17,7 @@ class cIptvPluginSetup : public cMenuSetupPage
 private:
   int tsBufferSizeM;
   int tsBufferPrefillM;
-  int extProtocolBasePortM;
+  int protocolBasePortM;
   int sectionFilteringM;
   int numDisabledFiltersM;
   int disabledFilterIndexesM[SECTION_FILTER_TABLE_SIZE];

sidscanner.c

@@ -71,15 +71,21 @@ void cSidScanner::Process(u_short pidP, u_char tidP, const u_char *dataP, int le
             if (ts.getTransportStreamId() != channelIdM.Tid()) {
                debug("cSidScanner::%s(): tsid=%d", __FUNCTION__, ts.getTransportStreamId());
                newTid = ts.getTransportStreamId();
+               tidFoundM = true;
+               }
+            if (ts.getOriginalNetworkId() != channelIdM.Nid()) {
+               debug("cSidScanner::%s(): onid=%d", __FUNCTION__, ts.getOriginalNetworkId());
+               newNid = ts.getOriginalNetworkId();
+               nidFoundM = true;
                }
-            tidFoundM = true;
             break; // default to the first one
             }
-        if (nit.getNetworkId() != channelIdM.Nid()) {
-           debug("cSidScanner::%s(): nid=%d", __FUNCTION__, ts.getTransportStreamId());
+        // fallback for network id if not found already
+        if (!nidFoundM && (nit.getNetworkId() != channelIdM.Nid())) {
+           debug("cSidScanner::%s(): nid=%d", __FUNCTION__, nit.getNetworkId());
            newNid = nit.getNetworkId();
+           nidFoundM = true;
            }
-        nidFoundM = true;
         }
      }
   if ((newSid >= 0) || (newNid >= 0) || (newTid >= 0)) {

socket.c

@@ -36,7 +36,7 @@ cIptvSocket::~cIptvSocket()
 
 bool cIptvSocket::OpenSocket(const int portP, const bool isUdpP)
 {
-  debug("cIptvSocket::%s()", __FUNCTION__);
+  debug("cIptvSocket::%s(%d, %d)", __FUNCTION__, portP, isUdpP);
   // If socket is there already and it is bound to a different port, it must
   // be closed first
   if (portP != socketPortM) {

source.c

@@ -58,6 +58,7 @@ bool cIptvTransponderParameters::Parse(const char *strP)
   if (strP && *strP) {
      const char *delim = "|";
      char *str = strdup(strP);
+     char *p = str;
      char *saveptr = NULL;
      char *token = NULL;
      bool found_s = false;
@@ -120,9 +121,9 @@ bool cIptvTransponderParameters::Parse(const char *strP)
      if (found_s && found_p && found_f && found_u && found_a)
         result = true;
      else
-        error("Invalid channel parameters: %s", str);
+        error("Invalid channel parameters: %s", p);
 
-     free(str);
+     free(p);
      }
 
   return (result);
@@ -135,8 +136,6 @@ const char *cIptvSourceParam::allowedProtocolCharsS = " abcdefghijklmnopqrstuvwx
 cIptvSourceParam::cIptvSourceParam(char sourceP, const char *descriptionP)
   : cSourceParam(sourceP, descriptionP),
     paramM(0),
-    nidM(0),
-    tidM(0),
     ridM(0),
     dataM(),
     itpM()
@@ -154,8 +153,6 @@ void cIptvSourceParam::SetData(cChannel *channelP)
 {
   debug("cIptvSourceParam::%s(%s)", __FUNCTION__, channelP->Parameters());
   dataM = *channelP;
-  nidM = dataM.Nid();
-  tidM = dataM.Tid();
   ridM = dataM.Rid();
   itpM.Parse(dataM.Parameters());
   paramM = 0;
@@ -165,21 +162,19 @@ void cIptvSourceParam::GetData(cChannel *channelP)
 {
   debug("cIptvSourceParam::%s(%s)", __FUNCTION__, channelP->Parameters());
   channelP->SetTransponderData(channelP->Source(), channelP->Frequency(), dataM.Srate(), itpM.ToString(Source()), true);
-  channelP->SetId(nidM, tidM, channelP->Sid(), ridM);
+  channelP->SetId(channelP->Nid(), channelP->Tid(), channelP->Sid(), ridM);
 }
 
 cOsdItem *cIptvSourceParam::GetOsdItem(void)
 {
   debug("cIptvSourceParam::%s()", __FUNCTION__);
   switch (paramM++) {
-    case  0: return new cMenuEditIntItem( tr("Nid"),              &nidM, 0);
-    case  1: return new cMenuEditIntItem( tr("Tid"),              &tidM, 0);
-    case  2: return new cMenuEditIntItem( tr("Rid"),              &ridM, 0);
-    case  3: return new cMenuEditBoolItem(tr("Scan section ids"), &itpM.sidScanM);
-    case  4: return new cMenuEditBoolItem(tr("Scan pids"),        &itpM.pidScanM);
-    case  5: return new cMenuEditStraItem(tr("Protocol"),         &itpM.protocolM,  ELEMENTS(protocolsM),  protocolsM);
-    case  6: return new cMenuEditStrItem( tr("Address"),           itpM.addressM,   sizeof(itpM.addressM), allowedProtocolCharsS);
-    case  7: return new cMenuEditIntItem( tr("Parameter"),        &itpM.parameterM, 0,                     0xFFFF);
+    case  0: return new cMenuEditIntItem( tr("Rid"),              &ridM, 0);
+    case  1: return new cMenuEditBoolItem(tr("Scan section ids"), &itpM.sidScanM);
+    case  2: return new cMenuEditBoolItem(tr("Scan pids"),        &itpM.pidScanM);
+    case  3: return new cMenuEditStraItem(tr("Protocol"),         &itpM.protocolM,  ELEMENTS(protocolsM),  protocolsM);
+    case  4: return new cMenuEditStrItem( tr("Address"),           itpM.addressM,   sizeof(itpM.addressM), allowedProtocolCharsS);
+    case  5: return new cMenuEditIntItem( tr("Parameter"),        &itpM.parameterM, 0,                     0xFFFF);
     default: return NULL;
     }
   return NULL;

source.h

@@ -51,8 +51,6 @@ class cIptvSourceParam : public cSourceParam
 {
 private:
   int paramM;
-  int nidM;
-  int tidM;
   int ridM;
   cChannel dataM;
   cIptvTransponderParameters itpM;

statistics.c

@@ -58,7 +58,11 @@ cIptvPidStatistics::cIptvPidStatistics()
   mutexM()
 {
   debug("cIptvPidStatistics::%s()", __FUNCTION__);
-  memset(mostActivePidsM, 0, sizeof(mostActivePidsM));
+  const int numberOfElements = sizeof(mostActivePidsM) / sizeof(pidStruct);
+  for (int i = 0; i < numberOfElements; ++i) {
+      mostActivePidsM[i].pid = -1;
+      mostActivePidsM[i].dataAmount = 0L;
+      }
 }
 
 cIptvPidStatistics::~cIptvPidStatistics()
@@ -70,12 +74,13 @@ cString cIptvPidStatistics::GetPidStatistic()
 {
   //debug("cIptvPidStatistics::%s()", __FUNCTION__);
   cMutexLock MutexLock(&mutexM);
+  const int numberOfElements = sizeof(mostActivePidsM) / sizeof(pidStruct);
   uint64_t elapsed = timerM.Elapsed(); /* in milliseconds */
   timerM.Set();
   cString s("Active pids:\n");
-  for (unsigned int i = 0; i < IPTV_STATS_ACTIVE_PIDS_COUNT; ++i) {
-      if (mostActivePidsM[i].pid) {
-         long bitrate = elapsed ? (long)(1000.0L * mostActivePidsM[i].DataAmount / KILOBYTE(1) / elapsed) : 0L;
+  for (int i = 0; i < numberOfElements; ++i) {
+      if (mostActivePidsM[i].pid >= 0) {
+         long bitrate = elapsed ? (long)(1000.0L * mostActivePidsM[i].dataAmount / KILOBYTE(1) / elapsed) : 0L;
          if (!IptvConfig.GetUseBytes())
             bitrate *= 8;
          s = cString::sprintf("%sPid %d: %4d (%4ld k%s/s)\n", *s, i,
@@ -83,7 +88,10 @@ cString cIptvPidStatistics::GetPidStatistic()
                               IptvConfig.GetUseBytes() ? "B" : "bit");
          }
       }
-  memset(mostActivePidsM, 0, sizeof(mostActivePidsM));
+  for (int i = 0; i < numberOfElements; ++i) {
+      mostActivePidsM[i].pid = -1;
+      mostActivePidsM[i].dataAmount = 0L;
+      }
   return s;
 }
 
@@ -92,14 +100,14 @@ int cIptvPidStatistics::SortPids(const void* data1P, const void* data2P)
   //debug("cIptvPidStatistics::%s()", __FUNCTION__);
   const pidStruct *comp1 = reinterpret_cast<const pidStruct*>(data1P);
   const pidStruct *comp2 = reinterpret_cast<const pidStruct*>(data2P);
-  if (comp1->DataAmount > comp2->DataAmount)
+  if (comp1->dataAmount > comp2->dataAmount)
      return -1;
-  if (comp1->DataAmount < comp2->DataAmount)
+  if (comp1->dataAmount < comp2->dataAmount)
      return 1;
   return 0;
 }
 
-void cIptvPidStatistics::AddPidStatistic(u_short pidP, long payloadP)
+void cIptvPidStatistics::AddPidStatistic(int pidP, long payloadP)
 {
   //debug("cIptvPidStatistics::%s(%ld, %ld)", __FUNCTION__, pidP, payloadP);
   cMutexLock MutexLock(&mutexM);
@@ -107,7 +115,7 @@ void cIptvPidStatistics::AddPidStatistic(u_short pidP, long payloadP)
   // If our statistic already is in the array, update it and quit
   for (int i = 0; i < numberOfElements; ++i) {
       if (mostActivePidsM[i].pid == pidP) {
-         mostActivePidsM[i].DataAmount += payloadP;
+         mostActivePidsM[i].dataAmount += payloadP;
          // Now re-sort the array and quit
          qsort(mostActivePidsM, numberOfElements, sizeof(pidStruct), SortPids);
          return;
@@ -115,9 +123,9 @@ void cIptvPidStatistics::AddPidStatistic(u_short pidP, long payloadP)
       }
   // Apparently our pid isn't in the array. Replace the last element with this
   // one if new payload is greater
-  if (mostActivePidsM[numberOfElements - 1].DataAmount < payloadP) {
+  if (mostActivePidsM[numberOfElements - 1].dataAmount < payloadP) {
       mostActivePidsM[numberOfElements - 1].pid = pidP;
-      mostActivePidsM[numberOfElements - 1].DataAmount = payloadP;
+      mostActivePidsM[numberOfElements - 1].dataAmount = payloadP;
      // Re-sort
      qsort(mostActivePidsM, numberOfElements, sizeof(pidStruct), SortPids);
      }

statistics.h

@@ -35,12 +35,12 @@ public:
   cString GetPidStatistic();
 
 protected:
-  void AddPidStatistic(u_short pidP, long payloadP);
+  void AddPidStatistic(int pidP, long payloadP);
 
 private:
   struct pidStruct {
-    u_short pid;
-    long DataAmount;
+    int  pid;
+    long dataAmount;
   };
   pidStruct mostActivePidsM[IPTV_STATS_ACTIVE_PIDS_COUNT];
   cTimeMs timerM;

streamer.c

@@ -79,7 +79,7 @@ bool cIptvStreamer::Close(void)
   return true;
 }
 
-bool cIptvStreamer::Set(const char* locationP, const int parameterP, const int indexP, cIptvProtocolIf* protocolP)
+bool cIptvStreamer::SetSource(const char* locationP, const int parameterP, const int indexP, cIptvProtocolIf* protocolP)
 {
   debug("cIptvStreamer::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
   if (!isempty(locationP)) {
@@ -89,16 +89,24 @@ bool cIptvStreamer::Set(const char* locationP, const int parameterP, const int i
            protocolM->Close();
         protocolM = protocolP;
         if (protocolM) {
-           protocolM->Set(locationP, parameterP, indexP);
+           protocolM->SetSource(locationP, parameterP, indexP);
            protocolM->Open();
            }
         }
      else if (protocolM)
-        protocolM->Set(locationP, parameterP, indexP);
+        protocolM->SetSource(locationP, parameterP, indexP);
      }
   return true;
 }
 
+bool cIptvStreamer::SetPid(int pidP, int typeP, bool onP)
+{
+  debug("cIptvStreamer::%s(%d, %d, %d)", __FUNCTION__, pidP, typeP, onP);
+  if (protocolM)
+     return protocolM->SetPid(pidP, typeP, onP);
+  return true;
+}
+
 cString cIptvStreamer::GetInformation(void)
 {
   //debug("cIptvStreamer::%s()", __FUNCTION__);

streamer.h

@@ -30,7 +30,8 @@ protected:
 public:
   cIptvStreamer(cIptvDeviceIf &deviceP, unsigned int packetLenP);
   virtual ~cIptvStreamer();
-  bool Set(const char* locationP, const int parameterP, const int indexP, cIptvProtocolIf* protocolP);
+  bool SetSource(const char* locationP, const int parameterP, const int indexP, cIptvProtocolIf* protocolP);
+  bool SetPid(int pidP, int typeP, bool onP);
   bool Open(void);
   bool Close(void);
   cString GetInformation(void);