Fixed installation target bugs (Thanks to Alexander Grothe).

Changed default external script directory from the configuration to the resource.

HISTORY

@@ -177,3 +177,69 @@ VDR Plugin 'iptv' Revision History
 
 - Optimized reading from UDP sockets.
 - Fixed ProvidesChannel method.
+
+2012-07-10: Version 1.0.1
+
+- Added FreeBSD support (Thanks to Jürgen Lock).
+
+2012-09-30: Version 1.1.0
+
+- Updated for vdr-1.7.30.
+- Added support for source-specific multicasts (SSM).
+- Changed default external script directory from the
+  configuration to the resource.
+
+2013-02-24: Version 1.2.0
+
+- Updated for vdr-1.7.38.
+- Added a new CURL protocol for HTTP/HTTPS.
+
+2013-03-06: Version 1.2.1
+
+- Fixed bugs found in the CURL implementation (Thanks
+  to Jeremy Hall).
+- Fixed the channel editor.
+
+
+==================================
+VDR Plugin 'iptv' Revision History
+==================================
+
+2013-04-01: Version 2.0.0
+
+- Updated for vdr-2.0.0.
+- Enabled I/O throttling and tweaked buffer timeouts.
+- 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).

Makefile

@@ -2,18 +2,22 @@
 # Makefile for IPTV plugin
 #
 
-# Debugging on/off 
+# Debugging on/off
+
 #IPTV_DEBUG = 1
 
+# Default shell for EXT protocol
+
+#IPTV_EXTSHELL = /bin/bash
+
 # Strip debug symbols?  Set eg. to /bin/true if not
+
 STRIP = strip
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
+
 PLUGIN = iptv
 
 ### The version number of this plugin (taken from the main source file):
@@ -21,45 +25,58 @@ PLUGIN = iptv
 VERSION = $(shell grep 'const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$5 }' | sed -e 's/[";]//g')
 GITTAG  = $(shell git describe --always 2>/dev/null)
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O3 -Wall -Wextra -Wswitch-default -Wfloat-equal -Wundef -Wpointer-arith -Wconversion -Wcast-align -Wredundant-decls -Wno-unused-parameter -Werror=overloaded-virtual -Wno-parentheses
-LDFLAGS  ?= -Wl,--as-needed
-
 ### The directory environment:
 
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
+# 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_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
 
-### Make sure that necessary options are included:
+### The compiler options:
 
--include $(VDRDIR)/Make.global
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
+
+### The version number of VDR's plugin API:
+
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include $(VDRDIR)/Make.config
-
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+-include $(PLGCFG)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
+### Libraries
+
+LIBS = $(shell curl-config --libs)
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ifdef IPTV_DEBUG
 DEFINES += -DDEBUG
 endif
 
+ifdef IPTV_EXTSHELL
+DEFINES += -DEXTSHELL='"$(IPTV_EXTSHELL)"'
+endif
+
 ifneq ($(strip $(GITTAG)),)
 DEFINES += -DGITVERSION='"-GIT-$(GITTAG)"'
 endif
@@ -69,61 +86,72 @@ all-redirect: all
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o config.o setup.o device.o streamer.o protocoludp.o \
-	protocolhttp.o protocolfile.o protocolext.o sectionfilter.o \
-	sidscanner.o pidscanner.o statistics.o common.o socket.o source.o
+OBJS = $(PLUGIN).o common.o config.o device.o pidscanner.o \
+	protocolcurl.o protocolext.o protocolfile.o protocolhttp.o \
+	protocoludp.o sectionfilter.o setup.o sidscanner.o socket.o \
+	source.o statistics.o streamer.o
 
 ### The main target:
 
-all: libvdr-$(PLUGIN).so i18n
+all: $(SOFILE) i18n
 
 ### Implicit rules:
 
-%.o: %.c Makefile
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
 ### Internationalization (I18N):
 
 PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name='vdr-$(PLUGIN)' --package-version='$(VERSION)' --msgid-bugs-address='<see README>' -o $@ `ls $^`
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	install -D -m644 $< $@
 
 .PHONY: i18n
-i18n: $(I18Nmsgs) $(I18Npot)
+i18n: $(I18Nmo) $(I18Npot)
+
+install-i18n: $(I18Nmsgs)
 
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+$(SOFILE): $(OBJS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
 ifndef IPTV_DEBUG
 	@$(STRIP) $@
 endif
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+install-lib: $(SOFILE)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+
+install-conf:
+	@mkdir -p $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)
+	@mkdir -p $(DESTDIR)$(RESDIR)/plugins/$(PLUGIN)
+	@cp -pn $(PLUGIN)/* $(DESTDIR)$(RESDIR)/plugins/$(PLUGIN)/
+
+install: install-lib install-i18n install-conf
 
 dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
@@ -134,7 +162,9 @@ dist: $(I18Npo) clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
 
-cppcheck: $(OBJS)
-	@cppcheck --enable=information,style,unusedFunction -v -f $(OBJS:%.o=%.c)
+.PHONY: cppcheck
+cppcheck:
+	@cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.c)

README

@@ -17,7 +17,8 @@ See the file COPYING for more information.
 
 Requirements:
 
-DVB compatible MPEG1/2 or H.264 network video streams.
+- Libcurl - the multiprotocol file transfer library
+  http://curl.haxx.se/libcurl/
 
 Description:
 
@@ -40,14 +41,8 @@ MP3 radio streams, mms video streams and so on.
 
 Installation:
 
-cd /put/your/path/here/VDR/PLUGINS/src
 tar -xzf /put/your/path/here/vdr-iptv-X.Y.Z.tgz
-ln -s iptv-X.Y.Z iptv
-cd /put/your/path/here/VDR
-cp -R PLUGINS/src/iptv/iptv /path/to/vdrconf/plugins/
-make
-make plugins
-./vdr -P iptv
+make -C iptv-X.Y.Z install
 
 Setup menu:
 
@@ -58,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
@@ -88,18 +85,27 @@ Configuration:
 
 - channels.conf
 
-  TV4;IPTV:40:S=1|P=0|F=EXT|U=iptvstream.sh|A=0:I:0:0:680:0:0:4:0:0:0
-  TV3;IPTV:30:S=0|P=1|F=FILE|U=/video/stream.ts|A=5:I:0:514:670:2321:0:3:0:0:0
-  TV2;IPTV:20:S=0|P=1|F=HTTP|U=127.0.0.1/TS/2|A=3000:I:0:513:660:2321:0:2:0:0:0
+  TV6;IPTV:60:S=1|P=0|F=EXT|U=iptvstream.sh|A=0:I:0:0:680:0:0:6:0:0:0
+  TV5;IPTV:50:S=0|P=1|F=FILE|U=/video/stream.ts|A=5:I:0:514:670:2321:0:5:0:0:0
+  TV4;IPTV:40:S=0|P=1|F=HTTP|U=127.0.0.1/TS/2|A=3000:I:0:513:660:2321:0:4:0:0:0
+  TV3;IPTV:30:S=1|P=0|F=CURL|U=http%3A//foo%3Abar@127.0.0.1%3A3000/TS/2|A=0:I:0:512:650:2321:0:3:0:0:0
+  TV2;IPTV:20:S=1|P=0|F=UDP|U=127.0.0.1@127.0.0.1|A=1234:I:0:512:650:2321:0:2:0:0:0
   TV1;IPTV:10:S=1|P=0|F=UDP|U=127.0.0.1|A=1234:I:0:512:650:2321:0:1:0:0:0
-           ^  ^   ^   ^     ^           ^    ^
-           |  |   |   |     |           |    Source type ("I")
-           |  |   |   |     |           Stream parameter (multicast port
-           |  |   |   |     |           number, HTTP port number, file delay
-           |  |   |   |     |           (ms), script parameter)
-           |  |   |   |     Stream address (multicast address, URL, file
-           |  |   |   |     location, script location)
-           |  |   |   Stream protocol ("UDP", "HTTP", "FILE", "EXT")
+           ^  ^   ^   ^     ^           ^      ^
+           |  |   |   |     |           |      Source type ("I")
+           |  |   |   |     |           Stream parameter
+           |  |   |   |     |            UDP:  multicast port
+           |  |   |   |     |            CURL: <<to be defined>>
+           |  |   |   |     |            HTTP: HTTP port number
+           |  |   |   |     |            FILE: file delay (ms)
+           |  |   |   |     |            EXT:  script parameter
+           |  |   |   |     Stream address
+           |  |   |   |      UDP:  multicast [source@]group address
+           |  |   |   |      CURL: HTTP/HTTPS URL; colons (%3A) and pipes (%7C) shall be URL encoded
+           |  |   |   |      HTTP: URL; missing the scheme name part and possible port declaration
+           |  |   |   |      FILE: file location
+           |  |   |   |      EXT:  script location
+           |  |   |   Stream protocol ("UDP", "CURL", "HTTP", "FILE", "EXT")
            |  |   Pid scanner ("0" disable, "1" enable)
            |  Section id (Sid/Nid/Tid) scanner ("0" disable, "1" enable)
            Unique enumeration
@@ -119,15 +125,15 @@ External streaming:
 
 - To watch an externally received channel add an EXT entry to channels.conf
   and specify a script name and parameter. The specified script is executed
-  from plugin configuration directory when VDR tunes to the channel. The
-  specified script parameter is passed to the script and it can be used to
-  select for example between different URLs.
+  from plugin resource directory when VDR tunes to the channel. The specified
+  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
@@ -161,12 +167,26 @@ 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.
 
+- Source-specific multicast (SSM) can be enabled by defining both the source
+  address and the group address separated by a '@' character. This will use
+  IGMP v3 protocol:
+  "U=<source address>@<group address>"
+
+- The CURL implementation supports only RTSP/HTTP/HTTPS protocols and an
+  optional netrc configuration file for authentication:
+  $(CONFDIR)/iptv/netrc
+
+- 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.c

@@ -5,58 +5,74 @@
  *
  */
 
+#include <ctype.h>
 #include <vdr/tools.h>
 #include "common.h"
 
-uint16_t ts_pid(const uint8_t *buf)
+uint16_t ts_pid(const uint8_t *bufP)
 {
-  return (uint16_t)(((buf[1] & 0x1f) << 8) + buf[2]);
+  return (uint16_t)(((bufP[1] & 0x1f) << 8) + bufP[2]);
 }
 
-uint8_t payload(const uint8_t *tsp)
+uint8_t payload(const uint8_t *bufP)
 {
-  if (!(tsp[3] & 0x10))        // no payload?
+  if (!(bufP[3] & 0x10)) // no payload?
      return 0;
 
-  if (tsp[3] & 0x20) { // adaptation field?
-     if (tsp[4] > 183) // corrupted data?
+  if (bufP[3] & 0x20) {  // adaptation field?
+     if (bufP[4] > 183)  // corrupted data?
         return 0;
      else
-        return (uint8_t)((184 - 1) - tsp[4]);
+        return (uint8_t)((184 - 1) - bufP[4]);
      }
 
   return 184;
 }
 
-const char *id_pid(const u_short Pid)
+const char *id_pid(const u_short pidP)
 {
   for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i) {
-      if (Pid == section_filter_table[i].pid)
+      if (pidP == section_filter_table[i].pid)
          return section_filter_table[i].tag;
       }
   return "---";
 }
 
-int select_single_desc(int descriptor, const int usecs, const bool selectWrite)
+int select_single_desc(int descriptorP, const int usecsP, const bool selectWriteP)
 {
   // Wait for data
   struct timeval tv;
   tv.tv_sec = 0;
-  tv.tv_usec = usecs;
+  tv.tv_usec = usecsP;
   // Use select
-  fd_set fds;
-  FD_ZERO(&fds);
-  FD_SET(descriptor, &fds);
-  int retval = 0;
-  if (selectWrite)
-     retval = select(descriptor + 1, NULL, &fds, NULL, &tv);
+  fd_set infd;
+  fd_set outfd;
+  fd_set errfd;
+  FD_ZERO(&infd);
+  FD_ZERO(&outfd);
+  FD_ZERO(&errfd);
+  FD_SET(descriptorP, &errfd);
+  if (selectWriteP)
+     FD_SET(descriptorP, &outfd);
   else
-     retval = select(descriptor + 1, &fds, NULL, NULL, &tv);
+     FD_SET(descriptorP, &infd);
+  int retval = select(descriptorP + 1, &infd, &outfd, &errfd, &tv);
   // Check if error
   ERROR_IF_RET(retval < 0, "select()", return retval);
   return retval;
 }
 
+cString ChangeCase(const cString &strP, bool upperP)
+{
+  cString res(strP);
+  char *p = (char *)*res;
+  while (p && *p) {
+        *p = upperP ? toupper(*p) : tolower(*p);
+        ++p;
+        }
+  return res;
+}
+
 const section_filter_table_type section_filter_table[SECTION_FILTER_TABLE_SIZE] =
 {
   /* description              tag    pid   tid   mask */
@@ -68,4 +84,3 @@ const section_filter_table_type section_filter_table[SECTION_FILTER_TABLE_SIZE]
   {trNOOP("EIT (0x6X)"),      "EIT", 0x12, 0x60, 0xF0},
   {trNOOP("TDT (0x70)"),      "TDT", 0x14, 0x70, 0xFF},
 };
-

common.h

@@ -14,9 +14,11 @@
 
 #ifdef DEBUG
 #define debug(x...) dsyslog("IPTV: " x);
+#define info(x...)  isyslog("IPTV: " x);
 #define error(x...) esyslog("ERROR: " x);
 #else
 #define debug(x...) ;
+#define info(x...)  isyslog("IPTV: " x);
 #define error(x...) esyslog("ERROR: " x);
 #endif
 
@@ -38,11 +40,12 @@
 
 #define SECTION_FILTER_TABLE_SIZE       7
 
-#define ERROR_IF_FUNC(exp, errstr, func, ret) \
+#define ERROR_IF_FUNC(exp, errstr, func, ret)                     \
   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;                                                      \
         }                                                         \
@@ -64,10 +67,11 @@
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 
-uint16_t ts_pid(const uint8_t *buf);
-uint8_t payload(const uint8_t *tsp);
-const char *id_pid(const u_short Pid);
-int select_single_desc(int descriptor, const int usecs, const bool selectWrite);
+uint16_t ts_pid(const uint8_t *bufP);
+uint8_t payload(const uint8_t *bufP);
+const char *id_pid(const u_short pidP);
+int select_single_desc(int descriptorP, const int usecsP, const bool selectWriteP);
+cString ChangeCase(const cString &strP, bool upperP);
 
 struct section_filter_table_type {
   const char *description;

config.c

@@ -10,38 +10,45 @@
 cIptvConfig IptvConfig;
 
 cIptvConfig::cIptvConfig(void)
-: tsBufferSize(2),
-  tsBufferPrefillRatio(0),
-  extProtocolBasePort(4321),
-  useBytes(1),
-  sectionFiltering(1)
+: tsBufferSizeM(2),
+  tsBufferPrefillRatioM(0),
+  protocolBasePortM(4321),
+  useBytesM(1),
+  sectionFilteringM(1)
 {
-  for (unsigned int i = 0; i < ARRAY_SIZE(disabledFilters); ++i)
-      disabledFilters[i] = -1;
-  memset(configDirectory, '\0', sizeof(configDirectory));
+  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
 {
   unsigned int n = 0;
-  while ((n < ARRAY_SIZE(disabledFilters) && (disabledFilters[n] != -1)))
+  while ((n < ARRAY_SIZE(disabledFiltersM) && (disabledFiltersM[n] != -1)))
         n++;
   return n;
 }
 
-int cIptvConfig::GetDisabledFilters(unsigned int Index) const
+int cIptvConfig::GetDisabledFilters(unsigned int indexP) const
 {
-  return (Index < ARRAY_SIZE(disabledFilters)) ? disabledFilters[Index] : -1;
+  return (indexP < ARRAY_SIZE(disabledFiltersM)) ? disabledFiltersM[indexP] : -1;
 }
 
-void cIptvConfig::SetDisabledFilters(unsigned int Index, int Number)
+void cIptvConfig::SetDisabledFilters(unsigned int indexP, int numberP)
 {
-  if (Index < ARRAY_SIZE(disabledFilters))
-     disabledFilters[Index] = Number;
+  if (indexP < ARRAY_SIZE(disabledFiltersM))
+     disabledFiltersM[indexP] = numberP;
 }
 
 void cIptvConfig::SetConfigDirectory(const char *directoryP)
 {
-  debug("cIptvConfig::SetConfigDirectory(%s)\n", directoryP);
-  ERROR_IF(!realpath(directoryP, configDirectory), "Cannot canonicalize configuration directory");
+  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

@@ -14,31 +14,34 @@
 class cIptvConfig
 {
 private:
-  unsigned int tsBufferSize;
-  unsigned int tsBufferPrefillRatio;
-  unsigned int extProtocolBasePort;
-  unsigned int useBytes;
-  unsigned int sectionFiltering;
-  int disabledFilters[SECTION_FILTER_TABLE_SIZE];
-  char configDirectory[PATH_MAX];
+  unsigned int tsBufferSizeM;
+  unsigned int tsBufferPrefillRatioM;
+  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 tsBufferSize; }
-  unsigned int GetTsBufferPrefillRatio(void) const { return tsBufferPrefillRatio; }
-  unsigned int GetExtProtocolBasePort(void) const { return extProtocolBasePort; }
-  unsigned int GetUseBytes(void) const { return useBytes; }
-  unsigned int GetSectionFiltering(void) const { return sectionFiltering; }
-  const char *GetConfigDirectory(void) const { return configDirectory; }
+  unsigned int GetTsBufferSize(void) const { return tsBufferSizeM; }
+  unsigned int GetTsBufferPrefillRatio(void) const { return tsBufferPrefillRatioM; }
+  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 Index) const;
-  void SetTsBufferSize(unsigned int Size) { tsBufferSize = Size; }
-  void SetTsBufferPrefillRatio(unsigned int Ratio) { tsBufferPrefillRatio = Ratio; }
-  void SetExtProtocolBasePort(unsigned int PortNumber) { extProtocolBasePort = PortNumber; }
-  void SetUseBytes(unsigned int On) { useBytes = On; }
-  void SetSectionFiltering(unsigned int On) { sectionFiltering = On; }
-  void SetDisabledFilters(unsigned int Index, int Number);
+  int GetDisabledFilters(unsigned int indexP) const;
+  void SetTsBufferSize(unsigned int sizeP) { tsBufferSizeM = sizeP; }
+  void SetTsBufferPrefillRatio(unsigned int ratioP) { tsBufferPrefillRatioM = ratioP; }
+  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

@@ -11,110 +11,113 @@
 
 #define IPTV_MAX_DEVICES MAXDEVICES
 
-static cIptvDevice * IptvDevices[IPTV_MAX_DEVICES] = { NULL };
+static cIptvDevice * IptvDevicesS[IPTV_MAX_DEVICES] = { NULL };
 
-unsigned int cIptvDevice::deviceCount = 0;
-
-cIptvDevice::cIptvDevice(unsigned int Index)
-: deviceIndex(Index),
-  dvrFd(-1),
-  isPacketDelivered(false),
-  isOpenDvr(false),
-  sidScanEnabled(false),
-  pidScanEnabled(false),
-  channelId(tChannelID::InvalidID)
+cIptvDevice::cIptvDevice(unsigned int indexP)
+: deviceIndexM(indexP),
+  dvrFdM(-1),
+  isPacketDeliveredM(false),
+  isOpenDvrM(false),
+  sidScanEnabledM(false),
+  pidScanEnabledM(false),
+  channelM()
 {
   unsigned int bufsize = (unsigned int)MEGABYTE(IptvConfig.GetTsBufferSize());
   bufsize -= (bufsize % TS_SIZE);
-  isyslog("creating IPTV device %d (CardIndex=%d)", deviceIndex, CardIndex());
-  tsBuffer = new cRingBufferLinear(bufsize + 1, TS_SIZE, false,
-                                   *cString::sprintf("IPTV %d", deviceIndex));
-  tsBuffer->SetTimeouts(10, 10);
+  isyslog("creating IPTV device %d (CardIndex=%d)", deviceIndexM, CardIndex());
+  tsBufferM = new cRingBufferLinear(bufsize + 1, TS_SIZE, false,
+                                   *cString::sprintf("IPTV TS %d", deviceIndexM));
+  if (tsBufferM) {
+     tsBufferM->SetTimeouts(100, 100);
+     tsBufferM->SetIoThrottle();
+     pIptvStreamerM = new cIptvStreamer(*this, tsBufferM->Free());
+     }
   ResetBuffering();
-  pUdpProtocol = new cIptvProtocolUdp();
-  pHttpProtocol = new cIptvProtocolHttp();
-  pFileProtocol = new cIptvProtocolFile();
-  pExtProtocol = new cIptvProtocolExt();
-  pIptvStreamer = new cIptvStreamer(tsBuffer, (100 * TS_SIZE));
-  pPidScanner = new cPidScanner();
-  // Initialize filter pointers
-  memset(secfilters, '\0', sizeof(secfilters));
+  pUdpProtocolM = new cIptvProtocolUdp();
+  pCurlProtocolM = new cIptvProtocolCurl();
+  pHttpProtocolM = new cIptvProtocolHttp();
+  pFileProtocolM = new cIptvProtocolFile();
+  pExtProtocolM = new cIptvProtocolExt();
+  pPidScannerM = new cPidScanner();
   // Start section handler for iptv device
+  pIptvSectionM = new cIptvSectionFilterHandler(deviceIndexM, bufsize + 1);
   StartSectionHandler();
   // Sid scanner must be created after the section handler
-  pSidScanner = new cSidScanner();
-  if (pSidScanner)
-     AttachFilter(pSidScanner);
+  AttachFilter(pSidScannerM = new cSidScanner());
   // Check if dvr fifo exists
   struct stat sb;
-  cString filename = cString::sprintf(IPTV_DVR_FILENAME, deviceIndex);
+  cString filename = cString::sprintf(IPTV_DVR_FILENAME, deviceIndexM);
   stat(filename, &sb);
   if (S_ISFIFO(sb.st_mode)) {
-     dvrFd = open(filename, O_RDWR | O_NONBLOCK);
-     if (dvrFd >= 0)
-        dsyslog("IPTV device %d redirecting input stream to '%s'", deviceIndex, *filename);
+     dvrFdM = open(filename, O_RDWR | O_NONBLOCK);
+     if (dvrFdM >= 0)
+        dsyslog("IPTV device %d redirecting input stream to '%s'", deviceIndexM, *filename);
      }
 }
 
 cIptvDevice::~cIptvDevice()
 {
-  debug("cIptvDevice::~cIptvDevice(%d)\n", deviceIndex);
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
   // Stop section handler of iptv device
   StopSectionHandler();
-  DELETE_POINTER(pIptvStreamer);
-  DELETE_POINTER(pUdpProtocol);
-  DELETE_POINTER(pHttpProtocol);
-  DELETE_POINTER(pFileProtocol);
-  DELETE_POINTER(pExtProtocol);
-  DELETE_POINTER(tsBuffer);
-  DELETE_POINTER(pPidScanner);
-  // Detach and destroy sid filter
-  if (pSidScanner) {
-     Detach(pSidScanner);
-     DELETE_POINTER(pSidScanner);
-     }
-  // Destroy all filters
-  for (int i = 0; i < eMaxSecFilterCount; ++i)
-      DeleteFilter(i);
+  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 (dvrFd >= 0) {
-     int fd = dvrFd;
-     dvrFd = -1;
+  if (dvrFdM >= 0) {
+     int fd = dvrFdM;
+     dvrFdM = -1;
      close(fd);
      }
 }
 
-bool cIptvDevice::Initialize(unsigned int DeviceCount)
+bool cIptvDevice::Initialize(unsigned int deviceCountP)
 {
-  debug("cIptvDevice::Initialize(): DeviceCount=%d\n", DeviceCount);
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceCountP);
   new cIptvSourceParam(IPTV_SOURCE_CHARACTER, "IPTV");
-  if (DeviceCount > IPTV_MAX_DEVICES)
-     DeviceCount = IPTV_MAX_DEVICES;
-  for (unsigned int i = 0; i < DeviceCount; ++i)
-      IptvDevices[i] = new cIptvDevice(i);
-  for (unsigned int i = DeviceCount; i < IPTV_MAX_DEVICES; ++i)
-      IptvDevices[i] = NULL;
+  if (deviceCountP > IPTV_MAX_DEVICES)
+     deviceCountP = IPTV_MAX_DEVICES;
+  for (unsigned int i = 0; i < deviceCountP; ++i)
+      IptvDevicesS[i] = new cIptvDevice(i);
+  for (unsigned int i = deviceCountP; i < IPTV_MAX_DEVICES; ++i)
+      IptvDevicesS[i] = NULL;
   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;
-  debug("cIptvDevice::Count()\n");
+  debug("cIptvDevice::%s()", __FUNCTION__);
   for (unsigned int i = 0; i < IPTV_MAX_DEVICES; ++i) {
-      if (IptvDevices[i] != NULL)
+      if (IptvDevicesS[i] != NULL)
          count++;
       }
   return count;
 }
 
-cIptvDevice *cIptvDevice::GetIptvDevice(int CardIndex)
+cIptvDevice *cIptvDevice::GetIptvDevice(int cardIndexP)
 {
-  //debug("cIptvDevice::GetIptvDevice(%d)\n", CardIndex);
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, cardIndexP);
   for (unsigned int i = 0; i < IPTV_MAX_DEVICES; ++i) {
-      if ((IptvDevices[i] != NULL) && (IptvDevices[i]->CardIndex() == CardIndex)) {
-         //debug("cIptvDevice::GetIptvDevice(%d): FOUND!\n", CardIndex);
-         return IptvDevices[i];
+      if (IptvDevicesS[i] && (IptvDevicesS[i]->CardIndex() == cardIndexP)) {
+         //debug("cIptvDevice::%s(%d): found!", __FUNCTION__, cardIndexP);
+         return IptvDevicesS[i];
          }
       }
   return NULL;
@@ -122,124 +125,112 @@ cIptvDevice *cIptvDevice::GetIptvDevice(int CardIndex)
 
 cString cIptvDevice::GetGeneralInformation(void)
 {
-  //debug("cIptvDevice::GetGeneralInformation(%d)\n", deviceIndex);
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
   return cString::sprintf("IPTV device: %d\nCardIndex: %d\nStream: %s\nStream bitrate: %s\n%sChannel: %s",
-                          deviceIndex, CardIndex(),
-                          pIptvStreamer ? *pIptvStreamer->GetInformation() : "",
-                          pIptvStreamer ? *pIptvStreamer->GetStreamerStatistic() : "",
+                          deviceIndexM, CardIndex(),
+                          pIptvStreamerM ? *pIptvStreamerM->GetInformation() : "",
+                          pIptvStreamerM ? *pIptvStreamerM->GetStreamerStatistic() : "",
                           *GetBufferStatistic(),
                           *Channels.GetByNumber(cDevice::CurrentChannel())->ToText());
 }
 
 cString cIptvDevice::GetPidsInformation(void)
 {
-  //debug("cIptvDevice::GetPidsInformation(%d)\n", deviceIndex);
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
   return GetPidStatistic();
 }
 
 cString cIptvDevice::GetFiltersInformation(void)
 {
-  //debug("cIptvDevice::GetFiltersInformation(%d)\n", deviceIndex);
-  unsigned int count = 0;
-  cString info("Active section filters:\n");
-  // loop through active section filters
-  for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
-      if (secfilters[i]) {
-         info = cString::sprintf("%sFilter %d: %s Pid=0x%02X (%s)\n", *info, i,
-                                 *secfilters[i]->GetSectionStatistic(), secfilters[i]->GetPid(),
-                                 id_pid(secfilters[i]->GetPid()));
-         if (++count > IPTV_STATS_ACTIVE_FILTERS_COUNT)
-            break;
-         }
-      }
-  return info;
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  return cString::sprintf("Active section filters:\n%s", pIptvSectionM ? *pIptvSectionM->GetInformation() : "");
 }
 
-cString cIptvDevice::GetInformation(unsigned int Page)
+cString cIptvDevice::GetInformation(unsigned int pageP)
 {
   // generate information string
-  cString info;
-  switch (Page) {
+  cString s;
+  switch (pageP) {
     case IPTV_DEVICE_INFO_GENERAL:
-         info = GetGeneralInformation();
+         s = GetGeneralInformation();
          break;
     case IPTV_DEVICE_INFO_PIDS:
-         info = GetPidsInformation();
+         s = GetPidsInformation();
          break;
     case IPTV_DEVICE_INFO_FILTERS:
-         info = GetFiltersInformation();
+         s = GetFiltersInformation();
          break;
     case IPTV_DEVICE_INFO_PROTOCOL:
-         info = pIptvStreamer ? *pIptvStreamer->GetInformation() : "";
+         s = pIptvStreamerM ? *pIptvStreamerM->GetInformation() : "";
          break;
     case IPTV_DEVICE_INFO_BITRATE:
-         info = pIptvStreamer ? *pIptvStreamer->GetStreamerStatistic() : "";
+         s = pIptvStreamerM ? *pIptvStreamerM->GetStreamerStatistic() : "";
          break;
     default:
-         info = cString::sprintf("%s%s%s",
-                                 *GetGeneralInformation(),
-                                 *GetPidsInformation(),
-                                 *GetFiltersInformation());
+         s = cString::sprintf("%s%s%s",
+                              *GetGeneralInformation(),
+                              *GetPidsInformation(),
+                              *GetFiltersInformation());
          break;
     }
-  return info;
+  return s;
 }
 
 cString cIptvDevice::DeviceType(void) const
 {
-  debug("cIptvDevice::DeviceType(%d)\n", deviceIndex);
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
   return "IPTV";
 }
 
 cString cIptvDevice::DeviceName(void) const
 {
-  debug("cIptvDevice::DeviceName(%d)\n", deviceIndex);
-  return cString::sprintf("IPTV %d", deviceIndex);
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  return cString::sprintf("IPTV %d", deviceIndexM);
 }
 
 int cIptvDevice::SignalStrength(void) const
 {
-  debug("cIptvDevice::SignalStrength(%d)\n", deviceIndex);
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
   return (100);
 }
 
 int cIptvDevice::SignalQuality(void) const
 {
-  debug("cIptvDevice::SignalQuality(%d)\n", deviceIndex);
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
   return (100);
 }
 
-bool cIptvDevice::ProvidesSource(int Source) const
+bool cIptvDevice::ProvidesSource(int sourceP) const
 {
-  debug("cIptvDevice::ProvidesSource(%d)\n", deviceIndex);
-  return (cSource::IsType(Source, IPTV_SOURCE_CHARACTER));
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  return (cSource::IsType(sourceP, IPTV_SOURCE_CHARACTER));
 }
 
-bool cIptvDevice::ProvidesTransponder(const cChannel *Channel) const
+bool cIptvDevice::ProvidesTransponder(const cChannel *channelP) const
 {
-  debug("cIptvDevice::ProvidesTransponder(%d)\n", deviceIndex);
-  return (ProvidesSource(Channel->Source()));
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  return (ProvidesSource(channelP->Source()));
 }
 
-bool cIptvDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
+bool cIptvDevice::ProvidesChannel(const cChannel *channelP, int priorityP, bool *needsDetachReceiversP) const
 {
   bool result = false;
-  bool hasPriority = Priority == IDLEPRIORITY || Priority > this->Priority();
+  bool hasPriority = (priorityP == IDLEPRIORITY) || (priorityP > this->Priority());
   bool needsDetachReceivers = false;
 
-  debug("cIptvDevice::ProvidesChannel(%d)\n", deviceIndex);
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
 
-  if (Channel && ProvidesTransponder(Channel)) {
+  if (channelP && ProvidesTransponder(channelP)) {
      result = hasPriority;
      if (Receiving()) {
-        if (Channel->GetChannelID() == channelId)
+        if (channelP->GetChannelID() == channelM.GetChannelID())
            result = true;
         else
            needsDetachReceivers = Receiving();
         }
      }
-  if (NeedsDetachReceivers)
-     *NeedsDetachReceivers = needsDetachReceivers;
+  if (needsDetachReceiversP)
+     *needsDetachReceiversP = needsDetachReceivers;
   return result;
 }
 
@@ -253,213 +244,239 @@ int cIptvDevice::NumProvidedSystems(void) const
   return 1;
 }
 
-bool cIptvDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
+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;
-  cIptvTransponderParameters itp(Channel->Parameters());
+  cIptvTransponderParameters itp(channelP->Parameters());
 
-  debug("cIptvDevice::SetChannelDevice(%d)\n", deviceIndex);
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
 
   if (isempty(itp.Address())) {
-     error("Unrecognized IPTV address: %s", Channel->Parameters());
+     error("Unrecognized IPTV address: %s", channelP->Parameters());
      return false;
      }
   switch (itp.Protocol()) {
     case cIptvTransponderParameters::eProtocolUDP:
-         protocol = pUdpProtocol;
+         protocol = pUdpProtocolM;
+         break;
+    case cIptvTransponderParameters::eProtocolCURL:
+         protocol = pCurlProtocolM;
          break;
     case cIptvTransponderParameters::eProtocolHTTP:
-         protocol = pHttpProtocol;
+         protocol = pHttpProtocolM;
          break;
     case cIptvTransponderParameters::eProtocolFILE:
-         protocol = pFileProtocol;
+         protocol = pFileProtocolM;
          break;
     case cIptvTransponderParameters::eProtocolEXT:
-         protocol = pExtProtocol;
+         protocol = pExtProtocolM;
          break;
     default:
-         error("Unrecognized IPTV protocol: %s", Channel->Parameters());
+         error("Unrecognized IPTV protocol: %s", channelP->Parameters());
          return false;
          break;
   }
-  sidScanEnabled = itp.SidScan() ? true : false;
-  pidScanEnabled = itp.PidScan() ? true : false;
-  if (pIptvStreamer->Set(itp.Address(), itp.Parameter(), deviceIndex, protocol)) {
-     channelId = Channel->GetChannelID();
-     if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
-        pSidScanner->SetChannel(channelId);
-     if (pidScanEnabled && pPidScanner)
-        pPidScanner->SetChannel(channelId);
+  sidScanEnabledM = itp.SidScan() ? true : false;
+  pidScanEnabledM = itp.PidScan() ? true : false;
+  if (pIptvStreamerM && pIptvStreamerM->SetSource(itp.Address(), itp.Parameter(), deviceIndexM, protocol)) {
+     channelM = *channelP;
+     if (sidScanEnabledM && pSidScannerM && IptvConfig.GetSectionFiltering())
+        pSidScannerM->SetChannel(channelM.GetChannelID());
+     if (pidScanEnabledM && pPidScannerM)
+        pPidScannerM->SetChannel(channelM.GetChannelID());
      }
   return true;
 }
 
-bool cIptvDevice::SetPid(cPidHandle *Handle, int Type, bool On)
+bool cIptvDevice::SetPid(cPidHandle *handleP, int typeP, bool onP)
 {
-  debug("cIptvDevice::SetPid(%d) Pid=%d Type=%d On=%d\n", deviceIndex, Handle->pid, Type, On);
+  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;
 }
 
-bool cIptvDevice::DeleteFilter(unsigned int Index)
+int cIptvDevice::OpenFilter(u_short pidP, u_char tidP, u_char maskP)
 {
-  if ((Index < eMaxSecFilterCount) && secfilters[Index]) {
-     //debug("cIptvDevice::DeleteFilter(%d) Index=%d\n", deviceIndex, Index);
-     cIptvSectionFilter *tmp = secfilters[Index];
-     secfilters[Index] = NULL;
-     delete tmp;
-     return true;
+  //debug("cIptvDevice::%s(%d): pid=%d tid=%d mask=%d", __FUNCTION__, deviceIndexM, pidP, tidP,  maskP);
+  if (pIptvSectionM && IptvConfig.GetSectionFiltering()) {
+     if (pIptvStreamerM)
+        pIptvStreamerM->SetPid(pidP, ptOther, true);
+     return pIptvSectionM->Open(pidP, tidP, maskP);
      }
-  return false;
-}
-
-bool cIptvDevice::IsBlackListed(u_short Pid, u_char Tid, u_char Mask) const
-{
-  //debug("cIptvDevice::IsBlackListed(%d) Pid=%d Tid=%02X Mask=%02X\n", deviceIndex, Pid, Tid, Mask);
-  // loop through section filter table
-  for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i) {
-      int index = IptvConfig.GetDisabledFilters(i);
-      // check if matches
-      if ((index >= 0) && (index < SECTION_FILTER_TABLE_SIZE) &&
-          (section_filter_table[index].pid == Pid) && (section_filter_table[index].tid == Tid) &&
-          (section_filter_table[index].mask == Mask)) {
-         //debug("cIptvDevice::IsBlackListed(%d) Found=%s\n", deviceIndex, section_filter_table[index].description);
-         return true;
-         }
-      }
-  return false;
-}
-
-int cIptvDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
-{
-  // Check if disabled by user
-  if (!IptvConfig.GetSectionFiltering())
-     return -1;
-  // Blacklist check, refuse certain filters
-  if (IsBlackListed(Pid, Tid, Mask))
-     return -1;
-  // Lock
-  cMutexLock MutexLock(&mutex);
-  // Search the next free filter slot
-  for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
-      if (!secfilters[i]) {
-         //debug("cIptvDevice::OpenFilter(%d): Pid=%d Tid=%02X Mask=%02X Index=%d\n", deviceIndex, Pid, Tid, Mask, i);
-         secfilters[i] = new cIptvSectionFilter(deviceIndex, i, Pid, Tid, Mask);
-         return secfilters[i]->GetReadDesc();
-         }
-      }
-  // No free filter slot found
   return -1;
 }
 
-void cIptvDevice::CloseFilter(int Handle)
+void cIptvDevice::CloseFilter(int handleP)
 {
-  // Lock
-  cMutexLock MutexLock(&mutex);
-  // Search the filter for deletion
-  for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
-      if (secfilters[i] && (Handle == secfilters[i]->GetReadDesc())) {
-         //debug("cIptvDevice::CloseFilter(%d): %d\n", deviceIndex, Handle);
-         DeleteFilter(i);
-         break;
-         }
-      }
+  //debug("cIptvDevice::%s(%d): handle=%d", __FUNCTION__, deviceIndexM, handleP);
+  if (pIptvSectionM) {
+     if (pIptvStreamerM)
+        pIptvStreamerM->SetPid(pIptvSectionM->GetPid(handleP), ptOther, false);
+     pIptvSectionM->Close(handleP);
+     }
 }
 
 bool cIptvDevice::OpenDvr(void)
 {
-  debug("cIptvDevice::OpenDvr(%d)\n", deviceIndex);
-  isPacketDelivered = false;
-  tsBuffer->Clear();
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  isPacketDeliveredM = false;
+  tsBufferM->Clear();
   ResetBuffering();
-  if (pIptvStreamer)
-     pIptvStreamer->Open();
-  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
-     pSidScanner->Open();
-  isOpenDvr = true;
+  if (pIptvStreamerM)
+     pIptvStreamerM->Open();
+  if (sidScanEnabledM && pSidScannerM && IptvConfig.GetSectionFiltering())
+     pSidScannerM->Open();
+  if (pidScanEnabledM && pPidScannerM)
+     pPidScannerM->Open();
+  isOpenDvrM = true;
   return true;
 }
 
 void cIptvDevice::CloseDvr(void)
 {
-  debug("cIptvDevice::CloseDvr(%d)\n", deviceIndex);
-  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
-     pSidScanner->Close();
-  if (pIptvStreamer)
-     pIptvStreamer->Close();
-  isOpenDvr = false;
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  if (pidScanEnabledM && pPidScannerM)
+     pPidScannerM->Close();
+  if (sidScanEnabledM && pSidScannerM)
+     pSidScannerM->Close();
+  if (pIptvStreamerM)
+     pIptvStreamerM->Close();
+  isOpenDvrM = false;
 }
 
-bool cIptvDevice::HasLock(int TimeoutMs)
+bool cIptvDevice::HasLock(int timeoutMsP) const
 {
-  //debug("cIptvDevice::HasLock(%d): %d\n", deviceIndex, TimeoutMs);
+  //debug("cIptvDevice::%s(%d): timeoutMs=%d", __FUNCTION__, deviceIndexM, timeoutMsP);
   return (!IsBuffering());
 }
 
+bool cIptvDevice::HasInternalCam(void)
+{
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  return false;
+}
+
 void cIptvDevice::ResetBuffering(void)
 {
-  debug("cIptvDevice::ResetBuffering(%d)\n", deviceIndex);
-  // pad prefill to multiple of TS_SIZE
-  tsBufferPrefill = (unsigned int)MEGABYTE(IptvConfig.GetTsBufferSize()) *
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  // Pad prefill to multiple of TS_SIZE
+  tsBufferPrefillM = (unsigned int)MEGABYTE(IptvConfig.GetTsBufferSize()) *
                     IptvConfig.GetTsBufferPrefillRatio() / 100;
-  tsBufferPrefill -= (tsBufferPrefill % TS_SIZE);
+  tsBufferPrefillM -= (tsBufferPrefillM % TS_SIZE);
 }
 
-bool cIptvDevice::IsBuffering(void)
+bool cIptvDevice::IsBuffering(void) const
 {
-  //debug("cIptvDevice::IsBuffering(%d): %d\n", deviceIndex);
-  if (tsBufferPrefill && tsBuffer->Available() < tsBufferPrefill)
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  if (tsBufferPrefillM && tsBufferM && tsBufferM->Available() < tsBufferPrefillM)
      return true;
   else
-     tsBufferPrefill = 0;
+     tsBufferPrefillM = 0;
   return false;
 }
 
-bool cIptvDevice::GetTSPacket(uchar *&Data)
+void cIptvDevice::WriteData(uchar *bufferP, int lengthP)
 {
-  //debug("cIptvDevice::GetTSPacket(%d)\n", deviceIndex);
-  if (tsBuffer && !IsBuffering()) {
-     if (isPacketDelivered) {
-        tsBuffer->Del(TS_SIZE);
-        isPacketDelivered = false;
-        // Update buffer statistics
-        AddBufferStatistic(TS_SIZE, tsBuffer->Available());
-        }
-     int Count = 0;
-     uchar *p = tsBuffer->Get(Count);
-     if (p && Count >= TS_SIZE) {
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  int len;
+  // Send data to dvr fifo
+  if (dvrFdM >= 0)
+     len = write(dvrFdM, bufferP, lengthP);
+  // Fill up TS buffer
+  if (tsBufferM) {
+     len = tsBufferM->Put(bufferP, lengthP);
+     if (len != lengthP)
+        tsBufferM->ReportOverflow(lengthP - len);
+     }
+  // Filter the sections
+  if (pIptvSectionM && IptvConfig.GetSectionFiltering())
+     pIptvSectionM->Write(bufferP, lengthP);
+}
+
+unsigned int cIptvDevice::CheckData(void)
+{
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  if (tsBufferM)
+     return (unsigned int)tsBufferM->Free();
+  return 0;
+}
+
+uchar *cIptvDevice::GetData(int *availableP)
+{
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  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;
                   }
                }
-           tsBuffer->Del(Count);
-           error("Skipped %d bytes to sync on TS packet\n", Count);
-           return false;
+           tsBufferM->Del(count);
+           error("Skipped %d bytes to sync on TS packet", count);
+           return NULL;
            }
-        isPacketDelivered = true;
-        Data = p;
+        isPacketDeliveredM = true;
+        if (availableP)
+           *availableP = count;
         // Update pid statistics
         AddPidStatistic(ts_pid(p), payload(p));
-        // Send data also to dvr fifo
-        if (dvrFd >= 0)
-           Count = (int)write(dvrFd, p, TS_SIZE);
-        // Analyze incomplete streams with built-in pid analyzer
-        if (pidScanEnabled && pPidScanner)
-           pPidScanner->Process(p);
-        // Lock
-        cMutexLock MutexLock(&mutex);
-        // Run the data through all filters
-        for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
-            if (secfilters[i])
-               secfilters[i]->Process(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

@@ -10,7 +10,9 @@
 
 #include <vdr/device.h>
 #include "common.h"
+#include "deviceif.h"
 #include "protocoludp.h"
+#include "protocolcurl.h"
 #include "protocolhttp.h"
 #include "protocolfile.h"
 #include "protocolext.h"
@@ -20,43 +22,42 @@
 #include "sidscanner.h"
 #include "statistics.h"
 
-class cIptvDevice : public cDevice, public cIptvPidStatistics, public cIptvBufferStatistics {
+class cIptvDevice : public cDevice, public cIptvPidStatistics, public cIptvBufferStatistics, public cIptvDeviceIf {
   // static ones
 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);
 
   // private parts
 private:
-  enum {
-    eMaxSecFilterCount = 32
-  };
-  unsigned int deviceIndex;
-  int dvrFd;
-  bool isPacketDelivered;
-  bool isOpenDvr;
-  bool sidScanEnabled;
-  bool pidScanEnabled;
-  cRingBufferLinear *tsBuffer;
-  int tsBufferPrefill;
-  tChannelID channelId;
-  cIptvProtocolUdp *pUdpProtocol;
-  cIptvProtocolHttp *pHttpProtocol;
-  cIptvProtocolFile *pFileProtocol;
-  cIptvProtocolExt *pExtProtocol;
-  cIptvStreamer *pIptvStreamer;
-  cPidScanner *pPidScanner;
-  cSidScanner *pSidScanner;
-  cMutex mutex;
-  cIptvSectionFilter *secfilters[eMaxSecFilterCount];
+  unsigned int deviceIndexM;
+  int dvrFdM;
+  bool isPacketDeliveredM;
+  bool isOpenDvrM;
+  bool sidScanEnabledM;
+  bool pidScanEnabledM;
+  cRingBufferLinear *tsBufferM;
+  mutable int tsBufferPrefillM;
+  cChannel channelM;
+  cIptvProtocolUdp *pUdpProtocolM;
+  cIptvProtocolCurl *pCurlProtocolM;
+  cIptvProtocolHttp *pHttpProtocolM;
+  cIptvProtocolFile *pFileProtocolM;
+  cIptvProtocolExt *pExtProtocolM;
+  cIptvStreamer *pIptvStreamerM;
+  cIptvSectionFilterHandler *pIptvSectionM;
+  cPidScanner *pPidScannerM;
+  cSidScanner *pSidScannerM;
+  cMutex mutexM;
 
   // constructor & destructor
 public:
-  cIptvDevice(unsigned int DeviceIndex);
+  cIptvDevice(unsigned int deviceIndexP);
   virtual ~cIptvDevice();
-  cString GetInformation(unsigned int Page = IPTV_DEVICE_INFO_ALL);
+  cString GetInformation(unsigned int pageP = IPTV_DEVICE_INFO_ALL);
 
   // copy and assignment constructors
 private:
@@ -71,11 +72,10 @@ private:
   // for channel parsing & buffering
 private:
   void ResetBuffering(void);
-  bool IsBuffering(void);
-  bool DeleteFilter(unsigned int Index);
-  bool IsBlackListed(u_short Pid, u_char Tid, u_char Mask) const;
+  bool IsBuffering(void) const;
 
   // for channel info
+public:
   virtual cString DeviceType(void) const;
   virtual cString DeviceName(void) const;
   virtual int SignalStrength(void) const;
@@ -83,29 +83,46 @@ private:
 
   // for channel selection
 public:
-  virtual bool ProvidesSource(int Source) const;
-  virtual bool ProvidesTransponder(const cChannel *Channel) const;
-  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
+  virtual bool ProvidesSource(int sourceP) const;
+  virtual bool ProvidesTransponder(const cChannel *channelP) const;
+  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 *Channel, bool LiveView);
+  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 *Handle, int Type, bool On);
+  virtual bool SetPid(cPidHandle *handleP, int typeP, bool onP);
   virtual bool OpenDvr(void);
   virtual void CloseDvr(void);
-  virtual bool GetTSPacket(uchar *&Data);
+  virtual bool GetTSPacket(uchar *&dataP);
 
   // for section filtering
 public:
-  virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
-  virtual void CloseFilter(int Handle);
+  virtual int OpenFilter(u_short pidP, u_char tidP, u_char maskP);
+  virtual void CloseFilter(int handleP);
 
   // for transponder lock
 public:
-  virtual bool HasLock(int);
+  virtual bool HasLock(int timeoutMsP) const;
+
+  // for common interface
+public:
+  virtual bool HasInternalCam(void);
+
+  // for internal device interface
+public:
+  virtual void WriteData(u_char *bufferP, int lengthP);
+  virtual unsigned int CheckData(void);
 };
 
 #endif // __IPTV_DEVICE_H

deviceif.h

@@ -0,0 +1,23 @@
+/*
+ * deviceif.h: IPTV plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __IPTV_DEVICEIF_H
+#define __IPTV_DEVICEIF_H
+
+class cIptvDeviceIf {
+public:
+  cIptvDeviceIf() {}
+  virtual ~cIptvDeviceIf() {}
+  virtual void WriteData(u_char *bufferP, int lengthP) = 0;
+  virtual unsigned int CheckData(void) = 0;
+
+private:
+  cIptvDeviceIf(const cIptvDeviceIf&);
+  cIptvDeviceIf& operator=(const cIptvDeviceIf&);
+};
+
+#endif // __IPTV_DEVICEIF_H

iptv.c

@@ -13,21 +13,21 @@
 #include "device.h"
 #include "iptvservice.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10727
-#error "VDR-1.7.27 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 20104
+#error "VDR-2.1.4 API version or greater is required!"
 #endif
 
 #ifndef GITVERSION
 #define GITVERSION ""
 #endif
 
-       const char VERSION[]     = "1.0.0" GITVERSION;
+       const char VERSION[]     = "2.1.1" GITVERSION;
 static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
 
 class cPluginIptv : public cPlugin {
 private:
-  unsigned int deviceCount;
-  int ParseFilters(const char *Value, int *Values);
+  unsigned int deviceCountM;
+  int ParseFilters(const char *valueP, int *filtersP);
 public:
   cPluginIptv(void);
   virtual ~cPluginIptv();
@@ -52,9 +52,9 @@ public:
   };
 
 cPluginIptv::cPluginIptv(void)
-: deviceCount(1)
+: deviceCountM(1)
 {
-  //debug("cPluginIptv::cPluginIptv()\n");
+  //debug("cPluginIptv::%s()", __FUNCTION__);
   // Initialize any member variables here.
   // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
   // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
@@ -62,20 +62,20 @@ cPluginIptv::cPluginIptv(void)
 
 cPluginIptv::~cPluginIptv()
 {
-  //debug("cPluginIptv::~cPluginIptv()\n");
+  //debug("cPluginIptv::%s()", __FUNCTION__);
   // Clean up after yourself!
 }
 
 const char *cPluginIptv::CommandLineHelp(void)
 {
-  debug("cPluginIptv::CommandLineHelp()\n");
+  debug("cPluginIptv::%s()", __FUNCTION__);
   // Return a string that describes all known command line options.
   return "  -d <num>, --devices=<number> number of devices to be created\n";
 }
 
 bool cPluginIptv::ProcessArgs(int argc, char *argv[])
 {
-  debug("cPluginIptv::ProcessArgs()\n");
+  debug("cPluginIptv::%s()", __FUNCTION__);
   // Implement command line argument processing here if applicable.
   static const struct option long_options[] = {
     { "devices", required_argument, NULL, 'd' },
@@ -86,7 +86,7 @@ bool cPluginIptv::ProcessArgs(int argc, char *argv[])
   while ((c = getopt_long(argc, argv, "d:", long_options, NULL)) != -1) {
     switch (c) {
       case 'd':
-           deviceCount = atoi(optarg);
+           deviceCountM = atoi(optarg);
            break;
       default:
            return false;
@@ -97,100 +97,114 @@ bool cPluginIptv::ProcessArgs(int argc, char *argv[])
 
 bool cPluginIptv::Initialize(void)
 {
-  debug("cPluginIptv::Initialize()\n");
+  debug("cPluginIptv::%s()", __FUNCTION__);
   // Initialize any background activities the plugin shall perform.
   IptvConfig.SetConfigDirectory(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N));
-  return cIptvDevice::Initialize(deviceCount);
+  IptvConfig.SetResourceDirectory(cPlugin::ResourceDirectory(PLUGIN_NAME_I18N));
+  return cIptvDevice::Initialize(deviceCountM);
 }
 
 bool cPluginIptv::Start(void)
 {
-  debug("cPluginIptv::Start()\n");
+  debug("cPluginIptv::%s()", __FUNCTION__);
   // 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);
+     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;
 }
 
 void cPluginIptv::Stop(void)
 {
-  debug("cPluginIptv::Stop()\n");
+  debug("cPluginIptv::%s()", __FUNCTION__);
   // Stop any background activities the plugin is performing.
+  cIptvDevice::Shutdown();
+  curl_global_cleanup();
 }
 
 void cPluginIptv::Housekeeping(void)
 {
-  //debug("cPluginIptv::Housekeeping()\n");
+  //debug("cPluginIptv::%s()", __FUNCTION__);
   // Perform any cleanup or other regular tasks.
 }
 
 void cPluginIptv::MainThreadHook(void)
 {
-  //debug("cPluginIptv::MainThreadHook()\n");
+  //debug("cPluginIptv::%s()", __FUNCTION__);
   // Perform actions in the context of the main program thread.
   // WARNING: Use with great care - see PLUGINS.html!
 }
 
 cString cPluginIptv::Active(void)
 {
-  //debug("cPluginIptv::Active()\n");
+  //debug("cPluginIptv::%s()", __FUNCTION__);
   // Return a message string if shutdown should be postponed
   return NULL;
 }
 
 time_t cPluginIptv::WakeupTime(void)
 {
-  //debug("cPluginIptv::WakeupTime()\n");
+  //debug("cPluginIptv::%s()", __FUNCTION__);
   // Return custom wakeup time for shutdown script
   return 0;
 }
 
 cOsdObject *cPluginIptv::MainMenuAction(void)
 {
-  //debug("cPluginIptv::MainMenuAction()\n");
+  //debug("cPluginIptv::%s()", __FUNCTION__);
   // Perform the action when selected from the main VDR menu.
   return NULL;
 }
 
 cMenuSetupPage *cPluginIptv::SetupMenu(void)
 {
-  debug("cPluginIptv::SetupMenu()\n");
+  debug("cPluginIptv::%s()", __FUNCTION__);
   // Return a setup menu in case the plugin supports one.
   return new cIptvPluginSetup();
 }
 
-int cPluginIptv::ParseFilters(const char *Value, int *Filters)
+int cPluginIptv::ParseFilters(const char *valueP, int *filtersP)
 {
-  debug("cPluginIptv::ParseFilters(): Value=%s\n", Value);
+  debug("cPluginIptv::%s(%s)", __FUNCTION__, valueP);
   char buffer[256];
   int n = 0;
-  while (Value && *Value && (n < SECTION_FILTER_TABLE_SIZE)) {
-    strn0cpy(buffer, Value, sizeof(buffer));
+  while (valueP && *valueP && (n < SECTION_FILTER_TABLE_SIZE)) {
+    strn0cpy(buffer, valueP, sizeof(buffer));
     int i = atoi(buffer);
-    //debug("cPluginIptv::ParseFilters(): Filters[%d]=%d\n", n, i);
+    //debug("cPluginIptv::%s(): filters[%d]=%d", __FUNCTION__, n, i);
     if (i >= 0)
-       Filters[n++] = i;
-    if ((Value = strchr(Value, ' ')) != NULL)
-       Value++;
+       filtersP[n++] = i;
+    if ((valueP = strchr(valueP, ' ')) != NULL)
+       valueP++;
     }
   return n;
 }
 
-bool cPluginIptv::SetupParse(const char *Name, const char *Value)
+bool cPluginIptv::SetupParse(const char *nameP, const char *valueP)
 {
-  debug("cPluginIptv::SetupParse()\n");
+  debug("cPluginIptv::%s()", __FUNCTION__);
   // Parse your own setup parameters and store their values.
-  if (!strcasecmp(Name, "TsBufferSize"))
-     IptvConfig.SetTsBufferSize(atoi(Value));
-  else if (!strcasecmp(Name, "TsBufferPrefill"))
-     IptvConfig.SetTsBufferPrefillRatio(atoi(Value));
-  else if (!strcasecmp(Name, "ExtProtocolBasePort"))
-     IptvConfig.SetExtProtocolBasePort(atoi(Value));
-  else if (!strcasecmp(Name, "SectionFiltering"))
-     IptvConfig.SetSectionFiltering(atoi(Value));
-  else if (!strcasecmp(Name, "DisabledFilters")) {
+  if (!strcasecmp(nameP, "TsBufferSize"))
+     IptvConfig.SetTsBufferSize(atoi(valueP));
+  else if (!strcasecmp(nameP, "TsBufferPrefill"))
+     IptvConfig.SetTsBufferPrefillRatio(atoi(valueP));
+  else if (!strcasecmp(nameP, "ExtProtocolBasePort"))
+     IptvConfig.SetProtocolBasePort(atoi(valueP));
+  else if (!strcasecmp(nameP, "SectionFiltering"))
+     IptvConfig.SetSectionFiltering(atoi(valueP));
+  else if (!strcasecmp(nameP, "DisabledFilters")) {
      int DisabledFilters[SECTION_FILTER_TABLE_SIZE];
      for (unsigned int i = 0; i < ARRAY_SIZE(DisabledFilters); ++i)
          DisabledFilters[i] = -1;
-     unsigned int DisabledFiltersCount = ParseFilters(Value, DisabledFilters);
+     unsigned int DisabledFiltersCount = ParseFilters(valueP, DisabledFilters);
      for (unsigned int i = 0; i < DisabledFiltersCount; ++i)
          IptvConfig.SetDisabledFilters(i, DisabledFilters[i]);
      }
@@ -199,12 +213,12 @@ bool cPluginIptv::SetupParse(const char *Name, const char *Value)
   return true;
 }
 
-bool cPluginIptv::Service(const char *Id, void *Data)
+bool cPluginIptv::Service(const char *idP, void *dataP)
 {
-  debug("cPluginIptv::Service()\n");
-  if (strcmp(Id,"IptvService-v1.0") == 0) {
-     if (Data) {
-        IptvService_v1_0 *data = (IptvService_v1_0*)Data;
+  debug("cPluginIptv::%s()", __FUNCTION__);
+  if (strcmp(idP,"IptvService-v1.0") == 0) {
+     if (dataP) {
+        IptvService_v1_0 *data = reinterpret_cast<IptvService_v1_0*>(dataP);
         cIptvDevice *dev = cIptvDevice::GetIptvDevice(data->cardIndex);
         if (!dev)
            return false;
@@ -218,7 +232,7 @@ bool cPluginIptv::Service(const char *Id, void *Data)
 
 const char **cPluginIptv::SVDRPHelpPages(void)
 {
-  debug("cPluginIptv::SVDRPHelpPages()\n");
+  debug("cPluginIptv::%s()", __FUNCTION__);
   static const char *HelpPages[] = {
     "INFO [ <page> ]\n"
     "    Print IPTV device information and statistics.\n"
@@ -231,26 +245,26 @@ const char **cPluginIptv::SVDRPHelpPages(void)
   return HelpPages;
 }
 
-cString cPluginIptv::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
+cString cPluginIptv::SVDRPCommand(const char *commandP, const char *optionP, int &replyCodeP)
 {
-  debug("cPluginIptv::SVDRPCommand(): Command=%s Option=%s\n", Command, Option);
-  if (strcasecmp(Command, "INFO") == 0) {
+  debug("cPluginIptv::%s(%s, %s)", __FUNCTION__, commandP, optionP);
+  if (strcasecmp(commandP, "INFO") == 0) {
      cIptvDevice *device = cIptvDevice::GetIptvDevice(cDevice::ActualDevice()->CardIndex());
      if (device) {
         int page = IPTV_DEVICE_INFO_ALL;
-        if (Option) {
-           page = atoi(Option);
+        if (optionP) {
+           page = atoi(optionP);
            if ((page < IPTV_DEVICE_INFO_ALL) || (page > IPTV_DEVICE_INFO_FILTERS))
               page = IPTV_DEVICE_INFO_ALL;
            }
         return device->GetInformation(page);
         }
      else {
-        ReplyCode = 550; // Requested action not taken
+        replyCodeP = 550; // Requested action not taken
         return cString("IPTV information not available!");
         }
      }
-  else if (strcasecmp(Command, "MODE") == 0) {
+  else if (strcasecmp(commandP, "MODE") == 0) {
      unsigned int mode = !IptvConfig.GetUseBytes();
      IptvConfig.SetUseBytes(mode);
      return cString::sprintf("IPTV information mode is: %s\n", mode ? "bytes" : "bits");

patches/vdr-1.7.27-disable_ca_updates.patch

@@ -1,11 +0,0 @@
-diff -Nru vdr-1.7.27-vanilla/pat.c vdr-1.7.27-disable_ca_updates/pat.c
---- vdr-1.7.27-vanilla/pat.c	2012-03-25 15:17:57.000000000 +0300
-+++ vdr-1.7.27-disable_ca_updates/pat.c	2012-03-31 20:42:14.000000000 +0300
-@@ -537,6 +537,7 @@
-             }
-         if (Setup.UpdateChannels >= 2) {
-            Channel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
-+           if (!cSource::IsType(Channel->Source(), 'I'))
-            Channel->SetCaIds(CaDescriptors->CaIds());
-            Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
-            }

pidscanner.c

@@ -14,106 +14,105 @@
 #define PIDSCANNER_PID_DELTA_COUNT 100   /* minimum count of pid samples for audio/video only pid detection */
 
 cPidScanner::cPidScanner(void)
-: timeout(0),
-  channelId(tChannelID::InvalidID),
-  process(true),
-  Vpid(0xFFFF),
-  Apid(0xFFFF),
-  numVpids(0),
-  numApids(0)
+: timeoutM(0),
+  channelIdM(tChannelID::InvalidID),
+  processM(true),
+  vPidM(0xFFFF),
+  aPidM(0xFFFF),
+  numVpidsM(0),
+  numApidsM(0)
 {
-  debug("cPidScanner::cPidScanner()\n");
+  debug("cPidScanner::%s()", __FUNCTION__);
 }
 
 cPidScanner::~cPidScanner()
 {
-  debug("cPidScanner::~cPidScanner()\n");
+  debug("cPidScanner::%s()", __FUNCTION__);
 }
 
-void cPidScanner::SetChannel(const tChannelID &ChannelId)
+void cPidScanner::SetChannel(const tChannelID &channelIdP)
 {
-  debug("cPidScanner::SetChannel(): %s\n", *ChannelId.ToString());
-  channelId = ChannelId;
-  Vpid = 0xFFFF;
-  numVpids = 0;
-  Apid = 0xFFFF;
-  numApids = 0;
-  process = true;
-  timeout.Set(PIDSCANNER_TIMEOUT_IN_MS);
+  debug("cPidScanner::%s(%s)", __FUNCTION__, *channelIdP.ToString());
+  channelIdM = channelIdP;
+  vPidM = 0xFFFF;
+  numVpidsM = 0;
+  aPidM = 0xFFFF;
+  numApidsM = 0;
+  processM = true;
 }
 
-void cPidScanner::Process(const uint8_t* buf)
+void cPidScanner::Process(const uint8_t* bufP)
 {
-  //debug("cPidScanner::Process()\n");
-  if (!process)
+  //debug("cPidScanner::%s()", __FUNCTION__);
+  if (!processM)
      return;
 
   // Stop scanning after defined timeout
-  if (timeout.TimedOut()) {
-     debug("cPidScanner::Process: Timed out determining pids\n");
-     process = false;
+  if (timeoutM.TimedOut()) {
+     debug("cPidScanner::%s(): timed out determining pids", __FUNCTION__);
+     processM = false;
   }
 
   // Verify TS packet
-  if (buf[0] != 0x47) {
-     error("Not TS packet: 0x%X\n", buf[0]);
+  if (bufP[0] != 0x47) {
+     error("Not TS packet: 0x%02X", bufP[0]);
      return;
      }
 
   // Found TS packet
-  int pid = ts_pid(buf);
-  int xpid = (buf[1] << 8 | buf[2]);
+  int pid = ts_pid(bufP);
+  int xpid = (bufP[1] << 8 | bufP[2]);
 
   // Check if payload available
-  uint8_t count = payload(buf);
+  uint8_t count = payload(bufP);
   if (count == 0)
      return;
 
   if (xpid & 0x4000) {
      // Stream start (Payload Unit Start Indicator)
-     uchar *d = (uint8_t*)buf;
+     uchar *d = (uint8_t*)bufP;
      d += 4;
      // pointer to payload
-     if (buf[3] & 0x20)
+     if (bufP[3] & 0x20)
         d += d[0] + 1;
      // Skip adaption field
-     if (buf[3] & 0x10) {
+     if (bufP[3] & 0x10) {
         // Payload present
         if ((d[0] == 0) && (d[1] == 0) && (d[2] == 1)) {
            // PES packet start
            int sid = d[3];
            // Stream ID
            if ((sid >= 0xC0) && (sid <= 0xDF)) {
-              if (pid < Apid) {
-                 debug("cPidScanner::Process: Found lower Apid: 0x%X instead of 0x%X\n", pid, Apid);
-                 Apid = pid;
-                 numApids = 1;
+              if (pid < aPidM) {
+                 debug("cPidScanner::%s(): found lower Apid: 0x%X instead of 0x%X", __FUNCTION__, pid, aPidM);
+                 aPidM = pid;
+                 numApidsM = 1;
                  }
-              else if (pid == Apid) {
-                 ++numApids;
-                 debug("cPidScanner::Process: Incrementing Apids, now at %d\n", numApids);
+              else if (pid == aPidM) {
+                 ++numApidsM;
+                 debug("cPidScanner::%s(): incrementing Apids, now at %d", __FUNCTION__, numApidsM);
                  }
               }
            else if ((sid >= 0xE0) && (sid <= 0xEF)) {
-              if (pid < Vpid) {
-                 debug("cPidScanner::Process: Found lower Vpid: 0x%X instead of 0x%X\n", pid, Vpid);
-                 Vpid = pid;
-                 numVpids = 1;
+              if (pid < vPidM) {
+                 debug("cPidScanner::%s(): found lower Vpid: 0x%X instead of 0x%X", __FUNCTION__, pid, vPidM);
+                 vPidM = pid;
+                 numVpidsM = 1;
                  }
-              else if (pid == Vpid) {
-                 ++numVpids;
-                 debug("cPidScanner::Process: Incrementing Vpids, now at %d\n", numVpids);
+              else if (pid == vPidM) {
+                 ++numVpidsM;
+                 debug("cPidScanner::%s(): incrementing Vpids, now at %d", __FUNCTION__, numVpidsM);
                  }
               }
            }
-        if (((numVpids >= PIDSCANNER_VPID_COUNT) && (numApids >= PIDSCANNER_APID_COUNT)) ||
-            (abs(numApids - numVpids) >= PIDSCANNER_PID_DELTA_COUNT)) {
+        if (((numVpidsM >= PIDSCANNER_VPID_COUNT) && (numApidsM >= PIDSCANNER_APID_COUNT)) ||
+            (abs(numApidsM - numVpidsM) >= PIDSCANNER_PID_DELTA_COUNT)) {
            // Lock channels for pid updates
            if (!Channels.Lock(true, 10)) {
-              timeout.Set(PIDSCANNER_TIMEOUT_IN_MS);
+              timeoutM.Set(PIDSCANNER_TIMEOUT_IN_MS);
               return;
               }
-           cChannel *IptvChannel = Channels.GetByChannelID(channelId);
+           cChannel *IptvChannel = Channels.GetByChannelID(channelIdM);
            if (IptvChannel) {
               int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
               int Atypes[MAXAPIDS + 1] = { 0 };
@@ -127,18 +126,18 @@ void cPidScanner::Process(const uint8_t* buf)
               int Ppid = IptvChannel->Ppid();
               int Tpid = IptvChannel->Tpid();
               bool foundApid = false;
-              if (numVpids < PIDSCANNER_VPID_COUNT)
-                 Vpid = 0; // No detected video pid
-              else if (numApids < PIDSCANNER_APID_COUNT)
-                 Apid = 0; // No detected audio pid
+              if (numVpidsM < PIDSCANNER_VPID_COUNT)
+                 vPidM = 0; // No detected video pid
+              else if (numApidsM < PIDSCANNER_APID_COUNT)
+                 aPidM = 0; // No detected audio pid
               for (unsigned int i = 0; i < MAXAPIDS; ++i) {
                   Apids[i] = IptvChannel->Apid(i);
                   Atypes[i] = IptvChannel->Atype(i);
-                  if (Apids[i] && (Apids[i] == Apid))
+                  if (Apids[i] && (Apids[i] == aPidM))
                      foundApid = true;
                   }
               if (!foundApid) {
-                 Apids[0] = Apid;
+                 Apids[0] = aPidM;
                  Atypes[0] = 4;
                  }
               for (unsigned int i = 0; i < MAXDPIDS; ++i) {
@@ -147,11 +146,11 @@ void cPidScanner::Process(const uint8_t* buf)
                   }
               for (unsigned int i = 0; i < MAXSPIDS; ++i)
                   Spids[i] = IptvChannel->Spid(i);
-              debug("cPidScanner::Process(): Vpid=0x%04X, Apid=0x%04X\n", Vpid, Apid);
-              IptvChannel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
+              debug("cPidScanner::%s(): vpid=0x%04X, apid=0x%04X", __FUNCTION__, vPidM, aPidM);
+              IptvChannel->SetPids(vPidM, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
               }
            Channels.Unlock();
-           process = false;
+           processM = false;
            }
         }
      }

pidscanner.h

@@ -13,19 +13,27 @@
 
 class cPidScanner {
 private:
-  cTimeMs timeout;
-  tChannelID channelId;
-  bool process;
-  int Vpid;
-  int Apid;
-  int numVpids;
-  int numApids;
+  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;
+  int vPidM;
+  int aPidM;
+  int numVpidsM;
+  int numApidsM;
 
 public:
   cPidScanner(void);
   ~cPidScanner();
-  void SetChannel(const tChannelID &ChannelId);
-  void Process(const uint8_t* buf);
+  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 1.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0300\n"
-"PO-Revision-Date: 2012-06-03 06:03+0300\n"
+"POT-Creation-Date: 2014-03-09 03:09+0200\n"
+"PO-Revision-Date: 2014-03-09 03:09+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"
@@ -118,6 +118,9 @@ msgstr "Hilfe"
 msgid "UDP"
 msgstr "UDP"
 
+msgid "CURL"
+msgstr "CURL"
+
 msgid "HTTP"
 msgstr "HTTP"
 

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 1.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0300\n"
-"PO-Revision-Date: 2012-06-03 06:03+0300\n"
+"POT-Creation-Date: 2014-03-09 03:09+0200\n"
+"PO-Revision-Date: 2014-03-09 03:09+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"
@@ -133,6 +133,9 @@ msgstr "Opaste"
 msgid "UDP"
 msgstr "UDP"
 
+msgid "CURL"
+msgstr "CURL"
+
 msgid "HTTP"
 msgstr "HTTP"
 

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 1.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0300\n"
-"PO-Revision-Date: 2012-06-03 06:03+0300\n"
+"POT-Creation-Date: 2014-03-09 03:09+0200\n"
+"PO-Revision-Date: 2014-03-09 03:09+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"
@@ -135,6 +135,9 @@ msgstr "Aide"
 msgid "UDP"
 msgstr "UDP"
 
+msgid "CURL"
+msgstr "CURL"
+
 msgid "HTTP"
 msgstr "HTTP"
 

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 1.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0300\n"
-"PO-Revision-Date: 2012-06-03 06:03+0300\n"
+"POT-Creation-Date: 2014-03-09 03:09+0200\n"
+"PO-Revision-Date: 2014-03-09 03:09+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"
@@ -134,6 +134,9 @@ msgstr "Aiuto"
 msgid "UDP"
 msgstr "UDP"
 
+msgid "CURL"
+msgstr "CURL"
+
 msgid "HTTP"
 msgstr "HTTP"
 

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 1.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0300\n"
-"PO-Revision-Date: 2012-06-03 06:03+0300\n"
+"POT-Creation-Date: 2014-03-09 03:09+0200\n"
+"PO-Revision-Date: 2014-03-09 03:09+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"
@@ -133,6 +133,9 @@ msgstr "Help"
 msgid "UDP"
 msgstr "UDP"
 
+msgid "CURL"
+msgstr "CURL"
+
 msgid "HTTP"
 msgstr "HTTP"
 

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 1.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0300\n"
-"PO-Revision-Date: 2012-06-03 06:03+0300\n"
+"POT-Creation-Date: 2014-03-09 03:09+0200\n"
+"PO-Revision-Date: 2014-03-09 03:09+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"
@@ -119,6 +119,9 @@ msgstr "Справка"
 msgid "UDP"
 msgstr "UDP"
 
+msgid "CURL"
+msgstr "CURL"
+
 msgid "HTTP"
 msgstr "HTTP"
 

protocolcurl.c

@@ -0,0 +1,608 @@
+/*
+ * protocolcurl.c: IPTV plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#include "common.h"
+#include "config.h"
+#include "protocolcurl.h"
+
+#ifdef CURLOPT_RTSPHEADER
+#define USE_RTSP
+#endif
+
+#define iptv_curl_easy_setopt(X, Y, Z) \
+  if ((res = curl_easy_setopt((X), (Y), (Z))) != CURLE_OK) { \
+     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() 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(""),
+  modeM(eModeUnknown),
+  timeoutM(),
+  connectedM(false),
+  pausedM(false)
+{
+  debug("cIptvProtocolCurl::%s()", __FUNCTION__);
+  if (ringBufferM) {
+     ringBufferM->SetTimeouts(100, 0);
+     ringBufferM->SetIoThrottle();
+     }
+  Connect();
+}
+
+cIptvProtocolCurl::~cIptvProtocolCurl()
+{
+  debug("cIptvProtocolCurl::%s()", __FUNCTION__);
+  Disconnect();
+  // Free allocated memory
+  DELETE_POINTER(ringBufferM);
+}
+
+size_t cIptvProtocolCurl::WriteCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP)
+{
+  cIptvProtocolCurl *obj = reinterpret_cast<cIptvProtocolCurl *>(dataP);
+  size_t len = sizeP * nmembP;
+  //debug("cIptvProtocolCurl::%s(%zu)", __FUNCTION__, len);
+
+  if (obj && !obj->PutData((unsigned char *)ptrP, (int)len))
+     return CURL_WRITEFUNC_PAUSE;
+
+  return len;
+}
+
+size_t cIptvProtocolCurl::WriteRtspCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP)
+{
+  cIptvProtocolCurl *obj = reinterpret_cast<cIptvProtocolCurl *>(dataP);
+  size_t len = sizeP * nmembP;
+  unsigned char *p = (unsigned char *)ptrP;
+  //debug("cIptvProtocolCurl::%s(%zu)", __FUNCTION__, len);
+
+  // Validate packet header ('$') and channel (0)
+  if (obj && (p[0] == 0x24) && (p[1] == 0)) {
+     int length = (p[2] << 8) | p[3];
+     if (length > 3) {
+        // Skip interleave header
+        p += 4;
+        // http://tools.ietf.org/html/rfc3550
+        // http://tools.ietf.org/html/rfc2250
+        // Version
+        unsigned int v = (p[0] >> 6) & 0x03;
+        // Extension bit
+        unsigned int x = (p[0] >> 4) & 0x01;
+        // CSCR count
+        unsigned int cc = p[0] & 0x0F;
+        // Payload type: MPEG2 TS = 33
+        //unsigned int pt = p[1] & 0x7F;
+        // Header lenght
+        unsigned int headerlen = (3 + cc) * (unsigned int)sizeof(uint32_t);
+        // Check if extension
+        if (x) {
+           // Extension header length
+           unsigned int ehl = (((p[headerlen + 2] & 0xFF) << 8) |(p[headerlen + 3] & 0xFF));
+           // Update header length
+           headerlen += (ehl + 1) * (unsigned int)sizeof(uint32_t);
+           }
+        // Check that rtp is version 2 and payload contains multiple of TS packet data
+        if ((v == 2) && (((length - headerlen) % TS_SIZE) == 0) && (p[headerlen] == TS_SYNC_BYTE)) {
+           // Set argument point to payload in read buffer
+           obj->PutData(&p[headerlen], (length - headerlen));
+           }
+        }
+     }
+
+  return len;
+}
+
+size_t cIptvProtocolCurl::DescribeCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP)
+{
+  cIptvProtocolCurl *obj = reinterpret_cast<cIptvProtocolCurl *>(dataP);
+  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);
+    // 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:%255ms", &s) == 1)
+          control = compactspace(s);
+       free(s);
+       break;
+       }
+    r = strtok(NULL, "\r\n");
+    }
+
+  if (!isempty(*control) && obj)
+     obj->SetRtspControl(*control);
+
+  return len;
+}
+
+size_t cIptvProtocolCurl::HeaderCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP)
+{
+  //cIptvProtocolCurl *obj = reinterpret_cast<cIptvProtocolCurl *>(dataP);
+  size_t len = sizeP * nmembP;
+  //debug("cIptvProtocolCurl::%s(%zu)", __FUNCTION__, len);
+
+  char *p = (char *)ptrP;
+  char *r = strtok(p, "\r\n");
+
+  while (r) {
+    //debug("cIptvProtocolCurl::%s(%zu): %s", __FUNCTION__, len, r);
+    r = strtok(NULL, "\r\n");
+    }
+
+  return len;
+}
+
+void cIptvProtocolCurl::SetRtspControl(const char *controlP)
+{
+  cMutexLock MutexLock(&mutexM);
+  //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)
+{
+  cMutexLock MutexLock(&mutexM);
+  //debug("cIptvProtocolCurl::%s(%d)", __FUNCTION__, lenP);
+  if (pausedM)
+     return false;
+  if (ringBufferM && (lenP >= 0)) {
+     // Should we pause the transfer ?
+     if (ringBufferM->Free() < (2 * CURL_MAX_WRITE_SIZE)) {
+        debug("cIptvProtocolCurl::%s(pause): free=%d available=%d len=%d", __FUNCTION__,
+              ringBufferM->Free(), ringBufferM->Available(), lenP);
+        pausedM = true;
+        return false;
+        }
+     int p = ringBufferM->Put(dataP, lenP);
+     if (p != lenP)
+        ringBufferM->ReportOverflow(lenP - p);
+     }
+
+  return true;
+}
+
+void cIptvProtocolCurl::DelData(int lenP)
+{
+  cMutexLock MutexLock(&mutexM);
+  //debug("cIptvProtocolCurl::%s()", __FUNCTION__);
+  if (ringBufferM && (lenP >= 0))
+     ringBufferM->Del(lenP);
+}
+
+void cIptvProtocolCurl::ClearData()
+{
+  //debug("cIptvProtocolCurl::%s()", __FUNCTION__);
+  if (ringBufferM)
+     ringBufferM->Clear();
+}
+
+unsigned char *cIptvProtocolCurl::GetData(int &lenP)
+{
+  cMutexLock MutexLock(&mutexM);
+  //debug("cIptvProtocolCurl::%s()", __FUNCTION__);
+  unsigned char *p = NULL;
+  lenP = 0;
+  if (ringBufferM) {
+     int count = 0;
+     p = ringBufferM->Get(count);
+#if 0
+     if (p && count >= TS_SIZE) {
+        if (*p != TS_SYNC_BYTE) {
+           for (int i = 1; i < count; ++i) {
+               if (p[i] == TS_SYNC_BYTE) {
+                  count = i;
+                  break;
+                  }
+               }
+           error("IPTV skipped %d bytes to sync on TS packet", count);
+           ringBufferM->Del(count);
+           lenP = 0;
+           return NULL;
+           }
+        }
+#endif
+     count -= (count % TS_SIZE);
+     lenP = count;
+     }
+
+  return p;
+}
+
+bool cIptvProtocolCurl::Connect()
+{
+  cMutexLock MutexLock(&mutexM);
+  debug("cIptvProtocolCurl::%s()", __FUNCTION__);
+  if (connectedM)
+     return true;
+
+  // Initialize the curl session
+  if (!handleM)
+     handleM = curl_easy_init();
+
+  if (handleM && !isempty(*streamUrlM)) {
+     CURLcode res = CURLE_OK;
+     cString netrc = cString::sprintf("%s/netrc", IptvConfig.GetConfigDirectory());
+
+#ifdef DEBUG
+     // Verbose output
+     iptv_curl_easy_setopt(handleM, CURLOPT_VERBOSE, 1L);
+#endif
+
+     // Set callbacks
+     iptv_curl_easy_setopt(handleM, CURLOPT_WRITEFUNCTION, cIptvProtocolCurl::WriteCallback);
+     iptv_curl_easy_setopt(handleM, CURLOPT_WRITEDATA, this);
+     iptv_curl_easy_setopt(handleM, CURLOPT_HEADERFUNCTION, cIptvProtocolCurl::HeaderCallback);
+     iptv_curl_easy_setopt(handleM, CURLOPT_WRITEHEADER, this);
+
+     // No progress meter and no signaling
+     iptv_curl_easy_setopt(handleM, CURLOPT_NOPROGRESS, 1L);
+     iptv_curl_easy_setopt(handleM, CURLOPT_NOSIGNAL, 1L);
+
+     // Support netrc
+     iptv_curl_easy_setopt(handleM, CURLOPT_NETRC, (long)CURL_NETRC_OPTIONAL);
+     iptv_curl_easy_setopt(handleM, CURLOPT_NETRC_FILE, *netrc);
+
+     // Set timeouts
+     iptv_curl_easy_setopt(handleM, CURLOPT_TIMEOUT, (long)eConnectTimeoutS);
+     iptv_curl_easy_setopt(handleM, CURLOPT_CONNECTTIMEOUT, (long)eConnectTimeoutS);
+
+     // Set user-agent
+     iptv_curl_easy_setopt(handleM, CURLOPT_USERAGENT, *cString::sprintf("vdr-%s/%s", PLUGIN_NAME_I18N, VERSION));
+
+     // Set URL
+     char *p = curl_easy_unescape(handleM, *streamUrlM, 0, NULL);
+     streamUrlM = p;
+     curl_free(p);
+     iptv_curl_easy_setopt(handleM, CURLOPT_URL, *streamUrlM);
+
+     // Protocol specific initializations
+     switch (modeM) {
+#ifdef USE_RTSP
+       case eModeRtsp:
+            {
+            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);
+            iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_OPTIONS);
+            iptv_curl_easy_perform(handleM);
+
+            // Request session description - SDP is delivered in message body and not in the header!
+            iptv_curl_easy_setopt(handleM, CURLOPT_WRITEFUNCTION, cIptvProtocolCurl::DescribeCallback);
+            iptv_curl_easy_setopt(handleM, CURLOPT_WRITEDATA, this);
+            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_DESCRIBE);
+            iptv_curl_easy_perform(handleM);
+            iptv_curl_easy_setopt(handleM, CURLOPT_WRITEFUNCTION, NULL);
+            iptv_curl_easy_setopt(handleM, CURLOPT_WRITEDATA, NULL);
+
+            // Setup media stream
+            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);
+            iptv_curl_easy_perform(handleM);
+
+            // Start playing
+            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_RTSP_REQUEST, (long)CURL_RTSPREQ_PLAY);
+            iptv_curl_easy_perform(handleM);
+
+            // Start receiving
+            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
+       case eModeHttp:
+       case eModeHttps:
+            {
+            // Limit download speed (bytes/s)
+            iptv_curl_easy_setopt(handleM, CURLOPT_MAX_RECV_SPEED_LARGE, eMaxDownloadSpeedMBits * 131072L);
+
+            // Follow location
+            iptv_curl_easy_setopt(handleM, CURLOPT_FOLLOWLOCATION, 1L);
+
+            // Fail if HTTP return code is >= 400
+            iptv_curl_easy_setopt(handleM, CURLOPT_FAILONERROR, 1L);
+
+            // Set additional headers to prevent caching
+            headerListM = curl_slist_append(headerListM, "Cache-Control: no-store, no-cache, must-revalidate");
+            headerListM = curl_slist_append(headerListM, "Cache-Control: post-check=0, pre-check=0");
+            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;
+       }
+
+     timeoutM.Set(eKeepAliveIntervalMs);
+     connectedM = true;
+     return true;
+     }
+
+  return false;
+}
+
+bool cIptvProtocolCurl::Disconnect()
+{
+  cMutexLock MutexLock(&mutexM);
+  debug("cIptvProtocolCurl::%s()", __FUNCTION__);
+  if (!connectedM)
+     return true;
+
+  // Terminate curl session
+  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
+       case eModeRtsp:
+            {
+            CURLcode res = CURLE_OK;
+            // Teardown rtsp session
+            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_TEARDOWN);
+            iptv_curl_easy_perform(handleM);
+            rtspControlM = "";
+            isActiveM = false;
+            // Close the listening socket
+            CloseSocket();
+            }
+            break;
+#endif
+       case eModeHttp:
+       case eModeHttps:
+       case eModeFile:
+       case eModeUnknown:
+       default:
+            break;
+       }
+
+     // Cleanup curl stuff
+     if (headerListM) {
+        curl_slist_free_all(headerListM);
+        headerListM = NULL;
+        }
+     curl_easy_cleanup(handleM);
+     handleM = NULL;
+     }
+
+  ClearData();
+  connectedM = false;
+  return true;
+}
+
+bool cIptvProtocolCurl::Open(void)
+{
+  debug("cIptvProtocolCurl::%s()", __FUNCTION__);
+  return Connect();
+}
+
+bool cIptvProtocolCurl::Close(void)
+{
+  debug("cIptvProtocolCurl::%s()", __FUNCTION__);
+  Disconnect();
+  return true;
+}
+
+int cIptvProtocolCurl::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
+{
+  //debug("cIptvProtocolCurl::%s()", __FUNCTION__);
+  int len = 0;
+  if (ringBufferM) {
+     // Fill up the buffer
+     if (handleM) {
+        switch (modeM) {
+#ifdef USE_RTSP
+          case eModeRtsp:
+               {
+               cMutexLock MutexLock(&mutexM);
+               CURLcode res = CURLE_OK;
+
+               // 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:
+               if (multiM) {
+                  CURLMcode res;
+                  int running_handles;
+
+                  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;
+                     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:
+          default:
+               break;
+          }
+        }
+
+     // ... and try to empty it
+     unsigned char *p = GetData(len);
+     if (p && (len > 0)) {
+        len = min(len, (int)bufferLenP);
+        memcpy(bufferAddrP, p, len);
+        DelData(len);
+        //debug("cIptvProtocolCurl::%s(): get %d bytes", __FUNCTION__, len);
+        }
+     }
+
+  return len;
+}
+
+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)) {
+     // Disconnect
+     Disconnect();
+     // Update stream URL
+     streamUrlM = locationP;
+     cString protocol = ChangeCase(streamUrlM, false).Truncate(5);
+     if (startswith(*protocol, "rtsp"))
+        modeM = eModeRtsp;
+     else if (startswith(*protocol, "https"))
+        modeM = eModeHttps;
+     else if (startswith(*protocol, "http"))
+        modeM = eModeHttp;
+     else if (startswith(*protocol, "file"))
+        modeM = eModeFile;
+     else
+        modeM = eModeUnknown;
+     debug("cIptvProtocolCurl::%s(): %s (%d)", __FUNCTION__, *protocol, modeM);
+     // 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__);
+  return cString::sprintf("%s [%d]", *streamUrlM, streamParamM);
+}

protocolcurl.h

@@ -0,0 +1,76 @@
+/*
+ * protocolcurl.h: IPTV plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __IPTV_PROTOCOLCURL_H
+#define __IPTV_PROTOCOLCURL_H
+
+#include <curl/curl.h>
+#include <curl/easy.h>
+
+#include <vdr/ringbuffer.h>
+#include <vdr/thread.h>
+#include <vdr/tools.h>
+
+#include "protocolif.h"
+#include "socket.h"
+
+class cIptvProtocolCurl : public cIptvUdpSocket, public cIptvProtocolIf {
+private:
+  enum eModeType {
+    eModeUnknown = 0,
+    eModeHttp,
+    eModeHttps,
+    eModeRtsp,
+    eModeFile,
+    eModeCount
+  };
+  enum {
+    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);
+  static size_t WriteRtspCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP);
+  static size_t DescribeCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP);
+  static size_t HeaderCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP);
+
+  cString streamUrlM;
+  int streamParamM;
+  int streamPortM;
+  cMutex mutexM;
+  CURL *handleM;
+  CURLM *multiM;
+  struct curl_slist *headerListM;
+  cRingBufferLinear *ringBufferM;
+  cString rtspControlM;
+  eModeType modeM;
+  cTimeMs timeoutM;
+  bool connectedM;
+  bool pausedM;
+
+  bool Connect(void);
+  bool Disconnect(void);
+  bool PutData(unsigned char *dataP, int lenP);
+  void DelData(int lenP);
+  void ClearData(void);
+  unsigned char *GetData(int &lenP);
+
+public:
+  cIptvProtocolCurl();
+  virtual ~cIptvProtocolCurl();
+  int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
+  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);
+  void SetRtspControl(const char *controlP);
+};
+
+#endif // __IPTV_PROTOCOLCURL_H
+

protocolext.c

@@ -19,144 +19,165 @@
 #include "config.h"
 #include "protocolext.h"
 
+#ifndef EXTSHELL
+#define EXTSHELL "/bin/bash"
+#endif
+
 cIptvProtocolExt::cIptvProtocolExt()
-: pid(-1),
-  scriptFile(""),
-  scriptParameter(0),
-  streamPort(0)
+: pidM(-1),
+  scriptFileM(""),
+  scriptParameterM(0),
+  streamPortM(0)
 {
-  debug("cIptvProtocolExt::cIptvProtocolExt()\n");
+  debug("cIptvProtocolExt::%s()", __FUNCTION__);
 }
 
 cIptvProtocolExt::~cIptvProtocolExt()
 {
-  debug("cIptvProtocolExt::~cIptvProtocolExt()\n");
+  debug("cIptvProtocolExt::%s()", __FUNCTION__);
   // Drop the socket connection
   cIptvProtocolExt::Close();
 }
 
 void cIptvProtocolExt::ExecuteScript(void)
 {
-  debug("cIptvProtocolExt::ExecuteScript()\n");
+  debug("cIptvProtocolExt::%s()", __FUNCTION__);
   // Check if already executing
-  if (isActive || isempty(scriptFile))
+  if (isActiveM || isempty(scriptFileM))
      return;
-  if (pid > 0) {
+  if (pidM > 0) {
      error("Cannot execute script!");
      return;
      }
   // Let's fork
-  ERROR_IF_RET((pid = fork()) == -1, "fork()", return);
+  ERROR_IF_RET((pidM = fork()) == -1, "fork()", return);
   // Check if child process
-  if (pid == 0) {
+  if (pidM == 0) {
      // Close all dup'ed filedescriptors
      int MaxPossibleFileDescriptors = getdtablesize();
      for (int i = STDERR_FILENO + 1; i < MaxPossibleFileDescriptors; i++)
          close(i);
      // Execute the external script
-     cString cmd = cString::sprintf("%s %d %d", *scriptFile, scriptParameter, streamPort);
-     debug("cIptvProtocolExt::ExecuteScript(child): %s\n", *cmd);
-     if (execl("/bin/bash", "sh", "-c", *cmd, (char *)NULL) == -1) {
+     cString cmd = cString::sprintf("%s %d %d", *scriptFileM, scriptParameterM, streamPortM);
+     debug("cIptvProtocolExt::%s(child): %s", __FUNCTION__, *cmd);
+     // Create a new session for a process group
+     ERROR_IF_RET(setsid() == -1, "setsid()", _exit(-1));
+     if (execl(EXTSHELL, "sh", "-c", *cmd, (char *)NULL) == -1) {
         error("Script execution failed: %s", *cmd);
         _exit(-1);
         }
      _exit(0);
      }
   else {
-     debug("cIptvProtocolExt::ExecuteScript(): pid=%d\n", pid);
+     debug("cIptvProtocolExt::%s(): pid=%d", __FUNCTION__, pidM);
      }
 }
 
 void cIptvProtocolExt::TerminateScript(void)
 {
-  debug("cIptvProtocolExt::TerminateScript(): pid=%d\n", pid);
-  if (!isActive || isempty(scriptFile))
+  debug("cIptvProtocolExt::%s(): pid=%d", __FUNCTION__, pidM);
+  if (!isActiveM || isempty(scriptFileM))
      return;
-  if (pid > 0) {
+  if (pidM > 0) {
      const unsigned int timeoutms = 100;
      unsigned int waitms = 0;
-     siginfo_t waitStatus;
      bool waitOver = false;
-     // signal and wait for termination
-     int retval = kill(pid, SIGINT);
+     // Signal and wait for termination
+     int retval = killpg(pidM, SIGINT);
      ERROR_IF_RET(retval < 0, "kill()", waitOver = true);
      while (!waitOver) {
        retval = 0;
        waitms += timeoutms;
        if ((waitms % 2000) == 0) {
-          error("Script '%s' won't terminate - killing it!", *scriptFile);
-          kill(pid, SIGKILL);
+          error("Script '%s' won't terminate - killing it!", *scriptFileM);
+          killpg(pidM, SIGKILL);
           }
        // Clear wait status to make sure child exit status is accessible
-       memset(&waitStatus, '\0', sizeof(waitStatus));
-       // Wait for child termination
-       retval = waitid(P_PID, pid, &waitStatus, (WNOHANG | WEXITED));
+       // and wait for child termination
+#ifdef __FreeBSD__
+       int waitStatus = 0;
+       retval = waitpid(pidM, &waitStatus, WNOHANG);
+#else  // __FreeBSD__
+       siginfo_t waitStatus;
+       memset(&waitStatus, 0, sizeof(waitStatus));
+       retval = waitid(P_PID, pidM, &waitStatus, (WNOHANG | WEXITED));
+#endif // __FreeBSD__
        ERROR_IF_RET(retval < 0, "waitid()", waitOver = true);
        // These are the acceptable conditions under which child exit is
        // regarded as successful
-       if (!retval && waitStatus.si_pid && (waitStatus.si_pid == pid) &&
+#ifdef __FreeBSD__
+       if (retval > 0 && (WIFEXITED(waitStatus) || WIFSIGNALED(waitStatus))) {
+#else  // __FreeBSD__
+       if (!retval && waitStatus.si_pid && (waitStatus.si_pid == pidM) &&
           ((waitStatus.si_code == CLD_EXITED) || (waitStatus.si_code == CLD_KILLED))) {
-          debug("Child (%d) exited as expected\n", pid);
+#endif // __FreeBSD__
+          debug("cIptvProtocolExt::%s(): child (%d) exited as expected", __FUNCTION__, pidM);
           waitOver = true;
           }
        // Unsuccessful wait, avoid busy looping
        if (!waitOver)
           cCondWait::SleepMs(timeoutms);
        }
-     pid = -1;
+     pidM = -1;
      }
 }
 
 bool cIptvProtocolExt::Open(void)
 {
-  debug("cIptvProtocolExt::Open()\n");
+  debug("cIptvProtocolExt::%s()", __FUNCTION__);
   // Reject empty script files
-  if (!strlen(*scriptFile))
+  if (!strlen(*scriptFileM))
      return false;
   // Create the listening socket
-  OpenSocket(streamPort);
+  OpenSocket(streamPortM);
   // Execute the external script
   ExecuteScript();
-  isActive = true;
+  isActiveM = true;
   return true;
 }
 
 bool cIptvProtocolExt::Close(void)
 {
-  debug("cIptvProtocolExt::Close()\n");
+  debug("cIptvProtocolExt::%s()", __FUNCTION__);
   // Terminate the external script
   TerminateScript();
-  isActive = false;
+  isActiveM = false;
   // Close the socket
   CloseSocket();
   return true;
 }
 
-int cIptvProtocolExt::Read(unsigned char* BufferAddr, unsigned int BufferLen)
+int cIptvProtocolExt::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
 {
-  return cIptvUdpSocket::Read(BufferAddr, BufferLen);
+  return cIptvUdpSocket::Read(bufferAddrP, bufferLenP);
 }
 
-bool cIptvProtocolExt::Set(const char* Location, const int Parameter, const int Index)
+bool cIptvProtocolExt::SetSource(const char* locationP, const int parameterP, const int indexP)
 {
-  debug("cIptvProtocolExt::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
-  if (!isempty(Location)) {
+  debug("cIptvProtocolExt::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
+  if (!isempty(locationP)) {
      struct stat stbuf;
      // Update script file and parameter
-     scriptFile = cString::sprintf("%s/%s", IptvConfig.GetConfigDirectory(), Location);
-     if ((stat(*scriptFile, &stbuf) != 0) || (strstr(*scriptFile, "..") != 0)) {
-        error("Non-existent or relative path script '%s'", *scriptFile);
+     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;
         }
-     scriptParameter = Parameter;
+     scriptParameterM = parameterP;
      // Update listen port
-     streamPort = IptvConfig.GetExtProtocolBasePort() + Index;
+     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::GetInformation()");
-  return cString::sprintf("ext://%s:%d", *scriptFile, scriptParameter);
+  //debug("cIptvProtocolExt::%s()", __FUNCTION__);
+  return cString::sprintf("ext://%s:%d", *scriptFileM, scriptParameterM);
 }

protocolext.h

@@ -14,10 +14,10 @@
 
 class cIptvProtocolExt : public cIptvUdpSocket, public cIptvProtocolIf {
 private:
-  int pid;
-  cString scriptFile;
-  int scriptParameter;
-  int streamPort;
+  int pidM;
+  cString scriptFileM;
+  int scriptParameterM;
+  int streamPortM;
 
 private:
   void TerminateScript(void);
@@ -26,8 +26,9 @@ private:
 public:
   cIptvProtocolExt();
   virtual ~cIptvProtocolExt();
-  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
-  bool Set(const char* Location, const int Parameter, const int Index);
+  int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
+  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

@@ -15,73 +15,73 @@
 #include "protocolfile.h"
 
 cIptvProtocolFile::cIptvProtocolFile()
-: fileDelay(0),
-  fileStream(NULL),
-  isActive(false)
+: fileLocationM(strdup("")),
+  fileDelayM(0),
+  fileStreamM(NULL),
+  isActiveM(false)
 {
-  debug("cIptvProtocolFile::cIptvProtocolFile()\n");
-  fileLocation = strdup("");
+  debug("cIptvProtocolFile::%s()", __FUNCTION__);
 }
 
 cIptvProtocolFile::~cIptvProtocolFile()
 {
-  debug("cIptvProtocolFile::~cIptvProtocolFile()\n");
+  debug("cIptvProtocolFile::%s()", __FUNCTION__);
   // Drop open handles
   cIptvProtocolFile::Close();
   // Free allocated memory
-  free(fileLocation);
+  free(fileLocationM);
 }
 
 bool cIptvProtocolFile::OpenFile(void)
 {
-  debug("cIptvProtocolFile::OpenFile()\n");
+  debug("cIptvProtocolFile::%s()", __FUNCTION__);
   // Check that stream address is valid
-  if (!isActive && !isempty(fileLocation)) {
-     fileStream = fopen(fileLocation, "rb");
-     ERROR_IF_RET(!fileStream || ferror(fileStream), "fopen()", return false);
+  if (!isActiveM && !isempty(fileLocationM)) {
+     fileStreamM = fopen(fileLocationM, "rb");
+     ERROR_IF_RET(!fileStreamM || ferror(fileStreamM), "fopen()", return false);
      // Update active flag
-     isActive = true;
+     isActiveM = true;
      }
   return true;
 }
 
 void cIptvProtocolFile::CloseFile(void)
 {
-  debug("cIptvProtocolFile::CloseFile()\n");
+  debug("cIptvProtocolFile::%s()", __FUNCTION__);
   // Check that file stream is valid
-  if (isActive && !isempty(fileLocation)) {
-     fclose(fileStream);
+  if (isActiveM && !isempty(fileLocationM)) {
+     fclose(fileStreamM);
      // Update active flag
-     isActive = false;
+     isActiveM = false;
      }
 }
 
-int cIptvProtocolFile::Read(unsigned char* BufferAddr, unsigned int BufferLen)
+int cIptvProtocolFile::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
 {
-   //debug("cIptvProtocolFile::Read()\n");
+   //debug("cIptvProtocolFile::%s()", __FUNCTION__);
    // Check errors
-   if (ferror(fileStream)) {
-      debug("Read error\n");
+   if (!fileStreamM || ferror(fileStreamM)) {
+      debug("cIptvProtocolFile::%s(): stream error", __FUNCTION__);
       return -1;
       }
    // Rewind if EOF
-   if (feof(fileStream))
-      rewind(fileStream);
+   if (feof(fileStreamM))
+      rewind(fileStreamM);
    // Sleep before reading the file stream to prevent aggressive busy looping
    // and prevent transfer ringbuffer overflows
-   if (fileDelay)
-      cCondWait::SleepMs(fileDelay);
+   if (fileDelayM)
+      cCondWait::SleepMs(fileDelayM);
    // This check is to prevent a race condition where file may be switched off
    // during the sleep and buffers are disposed. Check here that the plugin is
    // still active before accessing the buffers
-   if (isActive)
-      return (int)fread(BufferAddr, sizeof(unsigned char), BufferLen, fileStream);
+   if (isActiveM)
+      return (int)fread(bufferAddrP, sizeof(unsigned char), bufferLenP, fileStreamM);
    return -1;
 }
 
 bool cIptvProtocolFile::Open(void)
 {
-  debug("cIptvProtocolFile::Open()\n");
+  debug("cIptvProtocolFile::%s()", __FUNCTION__);
   // Open the file stream
   OpenFile();
   return true;
@@ -89,29 +89,35 @@ bool cIptvProtocolFile::Open(void)
 
 bool cIptvProtocolFile::Close(void)
 {
-  debug("cIptvProtocolFile::Close()\n");
+  debug("cIptvProtocolFile::%s()", __FUNCTION__);
   // Close the file stream
   CloseFile();
   return true;
 }
 
-bool cIptvProtocolFile::Set(const char* Location, const int Parameter, const int Index)
+bool cIptvProtocolFile::SetSource(const char* locationP, const int parameterP, const int indexP)
 {
-  debug("cIptvProtocolFile::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
-  if (!isempty(Location)) {
+  debug("cIptvProtocolFile::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
+  if (!isempty(locationP)) {
      // Close the file stream
      CloseFile();
      // Update stream address and port
-     fileLocation = strcpyrealloc(fileLocation, Location);
-     fileDelay = Parameter;
+     fileLocationM = strcpyrealloc(fileLocationM, locationP);
+     fileDelayM = parameterP;
      // Open the file for input
      OpenFile();
      }
   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::GetInformation()");
-  return cString::sprintf("file://%s:%d", fileLocation, fileDelay);
+  //debug("cIptvProtocolFile::%s()", __FUNCTION__);
+  return cString::sprintf("file://%s:%d", fileLocationM, fileDelayM);
 }

protocolfile.h

@@ -13,10 +13,10 @@
 
 class cIptvProtocolFile : public cIptvProtocolIf {
 private:
-  char* fileLocation;
-  int fileDelay;
-  FILE* fileStream;
-  bool isActive;
+  char* fileLocationM;
+  int fileDelayM;
+  FILE* fileStreamM;
+  bool isActiveM;
 
 private:
   bool OpenFile(void);
@@ -25,8 +25,9 @@ private:
 public:
   cIptvProtocolFile();
   virtual ~cIptvProtocolFile();
-  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
-  bool Set(const char* Location, const int Parameter, const int Index);
+  int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
+  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

@@ -19,30 +19,30 @@
 #include "protocolhttp.h"
 
 cIptvProtocolHttp::cIptvProtocolHttp()
-: streamAddr(strdup("")),
-  streamPath(strdup("/")),
-  streamPort(0)
+: streamAddrM(strdup("")),
+  streamPathM(strdup("/")),
+  streamPortM(0)
 {
-  debug("cIptvProtocolHttp::cIptvProtocolHttp()\n");
+  debug("cIptvProtocolHttp::%s()", __FUNCTION__);
 }
 
 cIptvProtocolHttp::~cIptvProtocolHttp()
 {
-  debug("cIptvProtocolHttp::~cIptvProtocolHttp()\n");
+  debug("cIptvProtocolHttp::%s()", __FUNCTION__);
   // Close the socket
   cIptvProtocolHttp::Close();
   // Free allocated memory
-  free(streamPath);
-  free(streamAddr);
+  free(streamPathM);
+  free(streamAddrM);
 }
 
 bool cIptvProtocolHttp::Connect(void)
 {
-  debug("cIptvProtocolHttp::Connect()\n");
+  debug("cIptvProtocolHttp::%s()", __FUNCTION__);
   // Check that stream address is valid
-  if (!isActive && !isempty(streamAddr) && !isempty(streamPath)) {
+  if (!isActiveM && !isempty(streamAddrM) && !isempty(streamPathM)) {
      // Ensure that socket is valid and connect
-     OpenSocket(streamPort, streamAddr);
+     OpenSocket(streamPortM, streamAddrM);
      if (!ConnectSocket()) {
         CloseSocket();
         return false;
@@ -53,9 +53,11 @@ bool cIptvProtocolHttp::Connect(void)
                                        "User-Agent: vdr-%s/%s\r\n"
                                        "Range: bytes=0-\r\n"
                                        "Connection: Close\r\n"
-                                       "\r\n", streamPath, streamAddr, PLUGIN_NAME_I18N, VERSION);
-     debug("Sending http request: %s\n", *buffer);
-     if (!Write(*buffer, (unsigned int)strlen(*buffer))) {
+                                       "\r\n", streamPathM, streamAddrM,
+                                       PLUGIN_NAME_I18N, VERSION);
+     unsigned int len = strlen(*buffer);
+     debug("cIptvProtocolHttp::%s(): requesting %d: %s", __FUNCTION__, len, *buffer);
+     if (!Write(*buffer, len)) {
         CloseSocket();
         return false;
         }
@@ -65,33 +67,33 @@ bool cIptvProtocolHttp::Connect(void)
         return false;
         }
      // Update active flag
-     isActive = true;
+     isActiveM = true;
      }
   return true;
 }
 
 bool cIptvProtocolHttp::Disconnect(void)
 {
-  debug("cIptvProtocolHttp::Disconnect()\n");
-  if (isActive) {
+  debug("cIptvProtocolHttp::%s()", __FUNCTION__);
+  if (isActiveM) {
      // Close the socket
      CloseSocket();
      // Update active flag
-     isActive = false;
+     isActiveM = false;
      }
   return true;
 }
 
-bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
-                                      unsigned int &recvLen)
+bool cIptvProtocolHttp::GetHeaderLine(char* destP, unsigned int destLenP,
+                                      unsigned int &recvLenP)
 {
-  debug("cIptvProtocolHttp::GetHeaderLine()\n");
+  debug("cIptvProtocolHttp::%s()", __FUNCTION__);
   bool linefeed = false;
   bool newline = false;
-  char *bufptr = dest;
-  recvLen = 0;
+  char *bufptr = destP;
+  recvLenP = 0;
 
-  if (!dest)
+  if (!destP)
      return false;
 
   while (!newline || !linefeed) {
@@ -106,18 +108,18 @@ bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
        // Saw just data or \r without \n
        else {
           linefeed = false;
-          ++recvLen;
+          ++recvLenP;
           }
        ++bufptr;
        // Check that buffer won't be exceeded
-       if (recvLen >= destLen) {
-          error("Header wouldn't fit into buffer\n");
-          recvLen = 0;
+       if (recvLenP >= destLenP) {
+          error("Header wouldn't fit into buffer");
+          recvLenP = 0;
           return false;
           }
        }
     else {
-       error("No HTTP response received in 500ms\n");
+       error("No HTTP response received in 500ms");
        return false;
        }
     }
@@ -126,7 +128,7 @@ bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
 
 bool cIptvProtocolHttp::ProcessHeaders(void)
 {
-  debug("cIptvProtocolHttp::ProcessHeaders()\n");
+  debug("cIptvProtocolHttp::%s()", __FUNCTION__);
   unsigned int lineLength = 0;
   int version = 0, response = 0;
   bool responseFound = false;
@@ -137,18 +139,18 @@ bool cIptvProtocolHttp::ProcessHeaders(void)
   snprintf(fmt, sizeof(fmt), "HTTP/1.%%%zui %%%zui ", sizeof(version) - 1, sizeof(response) - 1);
 
   while (!responseFound || lineLength != 0) {
-    memset(buf, '\0', sizeof(buf));
+    memset(buf, 0, sizeof(buf));
     if (!GetHeaderLine(buf, sizeof(buf), lineLength))
        return false;
     if (!responseFound && sscanf(buf, fmt, &version, &response) != 2) {
-       error("Expected HTTP header not found\n");
+       error("Expected HTTP header not found");
        continue;
        }
     else
        responseFound = true;
     // Allow only 'OK' and 'Partial Content'
     if ((response != 200) && (response != 206)) {
-       error("Invalid HTTP response (%d): %s\n", response, buf);
+       error("Invalid HTTP response (%d): %s", response, buf);
        return false;
        }
     }
@@ -157,49 +159,54 @@ bool cIptvProtocolHttp::ProcessHeaders(void)
 
 bool cIptvProtocolHttp::Open(void)
 {
-  debug("cIptvProtocolHttp::Open()\n");
+  debug("cIptvProtocolHttp::%s()", __FUNCTION__);
   // Connect the socket
   return Connect();
 }
 
 bool cIptvProtocolHttp::Close(void)
 {
-  debug("cIptvProtocolHttp::Close()\n");
+  debug("cIptvProtocolHttp::%s()", __FUNCTION__);
   // Disconnect the current stream
   Disconnect();
   return true;
 }
 
-int cIptvProtocolHttp::Read(unsigned char* BufferAddr, unsigned int BufferLen)
+int cIptvProtocolHttp::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
 {
-  return cIptvTcpSocket::Read(BufferAddr, BufferLen);
+  return cIptvTcpSocket::Read(bufferAddrP, bufferLenP);
 }
 
-bool cIptvProtocolHttp::Set(const char* Location, const int Parameter, const int Index)
+bool cIptvProtocolHttp::SetSource(const char* locationP, const int parameterP, const int indexP)
 {
-  debug("cIptvProtocolHttp::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
-  if (!isempty(Location)) {
+  debug("cIptvProtocolHttp::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
+  if (!isempty(locationP)) {
      // Disconnect the current socket
      Disconnect();
      // Update stream address, path and port
-     streamAddr = strcpyrealloc(streamAddr, Location);
-     char *path = strstr(streamAddr, "/");
+     streamAddrM = strcpyrealloc(streamAddrM, locationP);
+     char *path = strstr(streamAddrM, "/");
      if (path) {
-        streamPath = strcpyrealloc(streamPath, path);
+        streamPathM = strcpyrealloc(streamPathM, path);
         *path = 0;
         }
      else
-        streamPath = strcpyrealloc(streamPath, "/");
-     streamPort = Parameter;
-     //debug("http://%s:%d%s\n", streamAddr, streamPort, streamPath);
+        streamPathM = strcpyrealloc(streamPathM, "/");
+     streamPortM = parameterP;
      // Re-connect the socket
      Connect();
      }
   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::GetInformation()");
-  return cString::sprintf("http://%s:%d%s", streamAddr, streamPort, streamPath);
+  //debug("cIptvProtocolHttp::%s()", __FUNCTION__);
+  return cString::sprintf("http://%s:%d%s", streamAddrM, streamPortM, streamPathM);
 }

protocolhttp.h

@@ -14,21 +14,22 @@
 
 class cIptvProtocolHttp : public cIptvTcpSocket, public cIptvProtocolIf {
 private:
-  char* streamAddr;
-  char* streamPath;
-  int streamPort;
+  char* streamAddrM;
+  char* streamPathM;
+  int streamPortM;
 
 private:
   bool Connect(void);
   bool Disconnect(void);
-  bool GetHeaderLine(char* dest, unsigned int destLen, unsigned int &recvLen);
+  bool GetHeaderLine(char* destP, unsigned int destLenP, unsigned int &recvLenP);
   bool ProcessHeaders(void);
 
 public:
   cIptvProtocolHttp();
   virtual ~cIptvProtocolHttp();
-  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
-  bool Set(const char* Location, const int Parameter, const int Index);
+  int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
+  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

@@ -12,8 +12,9 @@ class cIptvProtocolIf {
 public:
   cIptvProtocolIf() {}
   virtual ~cIptvProtocolIf() {}
-  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen) = 0;
-  virtual bool Set(const char* Location, const int Parameter, const int Index) = 0;
+  virtual int Read(unsigned char* bufferAddrP, unsigned int bufferLenP) = 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

@@ -19,26 +19,29 @@
 #include "socket.h"
 
 cIptvProtocolUdp::cIptvProtocolUdp()
-: streamAddr(strdup("")),
-  streamPort(0)
+: isIGMPv3M(false),
+  sourceAddrM(strdup("")),
+  streamAddrM(strdup("")),
+  streamPortM(0)
 {
-  debug("cIptvProtocolUdp::cIptvProtocolUdp()\n");
+  debug("cIptvProtocolUdp::%s()", __FUNCTION__);
 }
 
 cIptvProtocolUdp::~cIptvProtocolUdp()
 {
-  debug("cIptvProtocolUdp::~cIptvProtocolUdp()\n");
+  debug("cIptvProtocolUdp::%s()", __FUNCTION__);
   // Drop the multicast group and close the socket
   cIptvProtocolUdp::Close();
   // Free allocated memory
-  free(streamAddr);
+  free(streamAddrM);
+  free(sourceAddrM);
 }
 
 bool cIptvProtocolUdp::Open(void)
 {
-  debug("cIptvProtocolUdp::Open(): streamAddr=%s\n", streamAddr);
-  OpenSocket(streamPort, inet_addr(streamAddr));
-  if (!isempty(streamAddr)) {
+  debug("cIptvProtocolUdp::%s(%s)", __FUNCTION__, streamAddrM);
+  OpenSocket(streamPortM, streamAddrM, sourceAddrM, isIGMPv3M);
+  if (!isempty(streamAddrM)) {
      // Join a new multicast group
      JoinMulticast();
      }
@@ -47,48 +50,69 @@ bool cIptvProtocolUdp::Open(void)
 
 bool cIptvProtocolUdp::Close(void)
 {
-  debug("cIptvProtocolUdp::Close(): streamAddr=%s\n", streamAddr);
-  if (!isempty(streamAddr)) {
+  debug("cIptvProtocolUdp::%s(%s)", __FUNCTION__, streamAddrM);
+  if (!isempty(streamAddrM)) {
      // Drop the multicast group
-     OpenSocket(streamPort, inet_addr(streamAddr));
+     OpenSocket(streamPortM, streamAddrM, sourceAddrM, isIGMPv3M);
      DropMulticast();
      }
   // Close the socket
   CloseSocket();
   // Do NOT reset stream and source addresses
-  //streamAddr = strcpyrealloc(streamAddr, "");
-  //streamPort = 0;
+  //sourceAddrM = strcpyrealloc(sourceAddrM, "");
+  //streamAddrM = strcpyrealloc(streamAddrM, "");
+  //streamPortM = 0;
   return true;
 }
 
-int cIptvProtocolUdp::Read(unsigned char* BufferAddr, unsigned int BufferLen)
+int cIptvProtocolUdp::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
 {
-  return cIptvUdpSocket::Read(BufferAddr, BufferLen);
+  return cIptvUdpSocket::Read(bufferAddrP, bufferLenP);
 }
 
-bool cIptvProtocolUdp::Set(const char* Location, const int Parameter, const int Index)
+bool cIptvProtocolUdp::SetSource(const char* locationP, const int parameterP, const int indexP)
 {
-  debug("cIptvProtocolUdp::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
-  if (!isempty(Location)) {
+  debug("cIptvProtocolUdp::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
+  if (!isempty(locationP)) {
      // Drop the multicast group
-     if (!isempty(streamAddr)) {
-        OpenSocket(streamPort, inet_addr(streamAddr));
+     if (!isempty(streamAddrM)) {
+        OpenSocket(streamPortM, streamAddrM, sourceAddrM, isIGMPv3M);
         DropMulticast();
         }
      // Update stream address and port
-     streamAddr = strcpyrealloc(streamAddr, Location);
-     streamPort = Parameter;
+     streamAddrM = strcpyrealloc(streamAddrM, locationP);
+     // <group address> or <source address>@<group address>
+     char *p = strstr(streamAddrM, "@");
+     if (p) {
+        *p = 0;
+        sourceAddrM = strcpyrealloc(sourceAddrM, streamAddrM);
+        streamAddrM = strcpyrealloc(streamAddrM, p + 1);
+        isIGMPv3M = true;
+        }
+     else {
+        sourceAddrM = strcpyrealloc(sourceAddrM, streamAddrM);
+        isIGMPv3M = false;
+        }
+     streamPortM = parameterP;
      // Join a new multicast group
-     if (!isempty(streamAddr)) {
-        OpenSocket(streamPort, inet_addr(streamAddr));
+     if (!isempty(streamAddrM)) {
+        OpenSocket(streamPortM, streamAddrM, sourceAddrM, isIGMPv3M);
         JoinMulticast();
         }
      }
   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::GetInformation()");
-  return cString::sprintf("udp://%s:%d", streamAddr, streamPort);
+  //debug("cIptvProtocolUdp::%s()", __FUNCTION__);
+  if (isIGMPv3M)
+     return cString::sprintf("udp://%s@%s:%d", sourceAddrM, streamAddrM, streamPortM);
+  return cString::sprintf("udp://%s:%d", streamAddrM, streamPortM);
 }

protocoludp.h

@@ -14,14 +14,17 @@
 
 class cIptvProtocolUdp : public cIptvUdpSocket, public cIptvProtocolIf {
 private:
-  char* streamAddr;
-  int streamPort;
+  bool isIGMPv3M;
+  char* sourceAddrM;
+  char* streamAddrM;
+  int streamPortM;
 
 public:
   cIptvProtocolUdp();
   virtual ~cIptvProtocolUdp();
-  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
-  bool Set(const char* Location, const int Parameter, const int Index);
+  int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
+  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

@@ -5,109 +5,103 @@
  *
  */
 
+#include "config.h"
 #include "sectionfilter.h"
 
-cIptvSectionFilter::cIptvSectionFilter(int DeviceIndex, int Index,
-                                       uint16_t Pid, uint8_t Tid, uint8_t Mask)
-: pusi_seen(0),
-  feedcc(0),
-  doneq(0),
-  secbuf(NULL),
-  secbufp(0),
-  seclen(0),
-  tsfeedp(0),
-  pid(Pid),
-  devid(DeviceIndex),
-  id(Index)
+cIptvSectionFilter::cIptvSectionFilter(int deviceIndexP, uint16_t pidP, uint8_t tidP, uint8_t maskP)
+: pusiSeenM(0),
+  feedCcM(0),
+  doneqM(0),
+  secBufM(NULL),
+  secBufpM(0),
+  secLenM(0),
+  tsFeedpM(0),
+  pidM(pidP),
+  deviceIndexM(deviceIndexP)
 {
-  //debug("cIptvSectionFilter::cIptvSectionFilter(%d, %d)\n", devid, id);
+  //debug("cIptvSectionFilter::%s(%d, %d)", __FUNCTION__, deviceIndexM, pidM);
   int i;
 
-  memset(secbuf_base, '\0', sizeof(secbuf_base));
-  memset(filter_value, '\0', sizeof(filter_value));
-  memset(filter_mask, '\0', sizeof(filter_mask));
-  memset(filter_mode, '\0', sizeof(filter_mode));
-  memset(maskandmode, '\0', sizeof(maskandmode));
-  memset(maskandnotmode, '\0', sizeof(maskandnotmode));
+  memset(secBufBaseM,     0, sizeof(secBufBaseM));
+  memset(filterValueM,    0, sizeof(filterValueM));
+  memset(filterMaskM,     0, sizeof(filterMaskM));
+  memset(filterModeM,     0, sizeof(filterModeM));
+  memset(maskAndModeM,    0, sizeof(maskAndModeM));
+  memset(maskAndNotModeM, 0, sizeof(maskAndNotModeM));
 
-  filter_value[0] = Tid;
-  filter_mask[0] = Mask;
+  filterValueM[0] = tidP;
+  filterMaskM[0] = maskP;
 
   // Invert the filter
   for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i)
-      filter_value[i] ^= 0xff;
+      filterValueM[i] ^= 0xFF;
 
-  uint8_t mask, mode, local_doneq = 0;
+  uint8_t mask, mode, doneq = 0;
   for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
-      mode = filter_mode[i];
-      mask = filter_mask[i];
-      maskandmode[i] = (uint8_t)(mask & mode);
-      maskandnotmode[i] = (uint8_t)(mask & ~mode);
-      local_doneq |= maskandnotmode[i];
+      mode = filterModeM[i];
+      mask = filterMaskM[i];
+      maskAndModeM[i] = (uint8_t)(mask & mode);
+      maskAndNotModeM[i] = (uint8_t)(mask & ~mode);
+      doneq |= maskAndNotModeM[i];
       }
-  doneq = local_doneq ? 1 : 0;
+  doneqM = doneq ? 1 : 0;
 
   // Create sockets
-  socket[0] = socket[1] = -1;
-  if (socketpair(AF_UNIX, SOCK_DGRAM, 0, socket) != 0) {
+  socketM[0] = socketM[1] = -1;
+  if (socketpair(AF_UNIX, SOCK_DGRAM, 0, socketM) != 0) {
      char tmp[64];
-     error("Opening section filter sockets failed (device=%d id=%d): %s\n", devid, id, strerror_r(errno, tmp, sizeof(tmp)));
+     error("Opening section filter sockets failed (device=%d pid=%d): %s", deviceIndexM, pidM, strerror_r(errno, tmp, sizeof(tmp)));
      }
-  else if ((fcntl(socket[0], F_SETFL, O_NONBLOCK) != 0) || (fcntl(socket[1], F_SETFL, O_NONBLOCK) != 0)) {
+  else if ((fcntl(socketM[0], F_SETFL, O_NONBLOCK) != 0) || (fcntl(socketM[1], F_SETFL, O_NONBLOCK) != 0)) {
      char tmp[64];
-     error("Setting section filter socket to non-blocking mode failed (device=%d id=%d): %s", devid, id, strerror_r(errno, tmp, sizeof(tmp)));
+     error("Setting section filter socket to non-blocking mode failed (device=%d pid=%d): %s", deviceIndexM, pidM, strerror_r(errno, tmp, sizeof(tmp)));
      }
 }
 
 cIptvSectionFilter::~cIptvSectionFilter()
 {
-  //debug("cIptvSectionFilter::~cIptvSectionfilter(%d, %d)\n", devid, id);
-  int tmp = socket[1];
-  socket[1] = -1;
+  //debug("cIptvSectionFilter::%s(%d, %d)", __FUNCTION__, deviceIndexM, pidM);
+  int tmp = socketM[1];
+  socketM[1] = -1;
   if (tmp >= 0)
      close(tmp);
-  tmp = socket[0];
-  socket[0] = -1;
+  tmp = socketM[0];
+  socketM[0] = -1;
   if (tmp >= 0)
      close(tmp);
-  secbuf = NULL;
+  secBufM = NULL;
 }
 
-int cIptvSectionFilter::GetReadDesc(void)
+inline uint16_t cIptvSectionFilter::GetLength(const uint8_t *dataP)
 {
-  return socket[0];
-}
-
-inline uint16_t cIptvSectionFilter::GetLength(const uint8_t *Data)
-{
-  return (uint16_t)(3 + ((Data[1] & 0x0f) << 8) + Data[2]);
+  return (uint16_t)(3 + ((dataP[1] & 0x0f) << 8) + dataP[2]);
 }
 
 void cIptvSectionFilter::New(void)
 {
-  tsfeedp = secbufp = seclen = 0;
-  secbuf = secbuf_base;
+  tsFeedpM = secBufpM = secLenM = 0;
+  secBufM = secBufBaseM;
 }
 
 int cIptvSectionFilter::Filter(void)
 {
-  if (secbuf) {
+  if (secBufM) {
      int i;
      uint8_t neq = 0;
 
      for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
-         uint8_t local_xor = (uint8_t)(filter_value[i] ^ secbuf[i]);
-         if (maskandmode[i] & local_xor)
+         uint8_t calcxor = (uint8_t)(filterValueM[i] ^ secBufM[i]);
+         if (maskAndModeM[i] & calcxor)
             return 0;
-         neq |= (maskandnotmode[i] & local_xor);
+         neq |= (maskAndNotModeM[i] & calcxor);
          }
 
-     if (doneq && !neq)
+     if (doneqM && !neq)
         return 0;
 
      // There is no data in the read socket, more can be written
-     if ((socket[0] >= 0) && (socket[1] >= 0) /*&& !select_single_desc(socket[0], 0, false)*/) {
-        ssize_t len = write(socket[1], secbuf, seclen);
+     if ((socketM[0] >= 0) && (socketM[1] >= 0) /*&& !select_single_desc(socketM[0], 0, false)*/) {
+        ssize_t len = write(socketM[1], secBufM, secLenM);
         ERROR_IF(len < 0, "write()");
         // Update statistics
         AddSectionStatistic(len, 1);
@@ -120,56 +114,56 @@ inline int cIptvSectionFilter::Feed(void)
 {
   if (Filter() < 0)
      return -1;
-  seclen = 0;
+  secLenM = 0;
   return 0;
 }
 
-int cIptvSectionFilter::CopyDump(const uint8_t *buf, uint8_t len)
+int cIptvSectionFilter::CopyDump(const uint8_t *bufP, uint8_t lenP)
 {
-  uint16_t limit, seclen_local, n;
+  uint16_t limit, seclen, n;
 
-  if (tsfeedp >= DMX_MAX_SECFEED_SIZE)
+  if (tsFeedpM >= DMX_MAX_SECFEED_SIZE)
      return 0;
 
-  if (tsfeedp + len > DMX_MAX_SECFEED_SIZE)
-     len = (uint8_t)(DMX_MAX_SECFEED_SIZE - tsfeedp);
+  if (tsFeedpM + lenP > DMX_MAX_SECFEED_SIZE)
+     lenP = (uint8_t)(DMX_MAX_SECFEED_SIZE - tsFeedpM);
 
-  if (len <= 0)
+  if (lenP <= 0)
      return 0;
 
-  memcpy(secbuf_base + tsfeedp, buf, len);
-  tsfeedp = uint16_t(tsfeedp + len);
+  memcpy(secBufBaseM + tsFeedpM, bufP, lenP);
+  tsFeedpM = uint16_t(tsFeedpM + lenP);
 
-  limit = tsfeedp;
+  limit = tsFeedpM;
   if (limit > DMX_MAX_SECFEED_SIZE)
      return -1; // internal error should never happen
 
   // Always set secbuf
-  secbuf = secbuf_base + secbufp;
+  secBufM = secBufBaseM + secBufpM;
 
-  for (n = 0; secbufp + 2 < limit; ++n) {
-      seclen_local = GetLength(secbuf);
-      if ((seclen_local <= 0) || (seclen_local > DMX_MAX_SECTION_SIZE) || ((seclen_local + secbufp) > limit))
+  for (n = 0; secBufpM + 2 < limit; ++n) {
+      seclen = GetLength(secBufM);
+      if ((seclen <= 0) || (seclen > DMX_MAX_SECTION_SIZE) || ((seclen + secBufpM) > limit))
          return 0;
-      seclen = seclen_local;
-      if (pusi_seen)
+      secLenM = seclen;
+      if (pusiSeenM)
          Feed();
-      secbufp = uint16_t(secbufp + seclen_local);
-      secbuf += seclen_local;
+      secBufpM = uint16_t(secBufpM + seclen);
+      secBufM += seclen;
       }
   return 0;
 }
 
-void cIptvSectionFilter::Process(const uint8_t* Data)
+void cIptvSectionFilter::Process(const uint8_t* dataP)
 {
-  if (Data[0] != TS_SYNC_BYTE)
+  if (dataP[0] != TS_SYNC_BYTE)
      return;
 
   // Stop if not the PID this filter is looking for
-  if (ts_pid(Data) != pid)
+  if (ts_pid(dataP) != pidM)
      return;
 
-  uint8_t count = payload(Data);
+  uint8_t count = payload(dataP);
 
   // Check if no payload or out of range
   if (count == 0)
@@ -178,41 +172,235 @@ void cIptvSectionFilter::Process(const uint8_t* Data)
   // Payload start
   uint8_t p = (uint8_t)(TS_SIZE - count);
 
-  uint8_t cc = (uint8_t)(Data[3] & 0x0f);
-  int ccok = ((feedcc + 1) & 0x0f) == cc;
-  feedcc = cc;
+  uint8_t cc = (uint8_t)(dataP[3] & 0x0f);
+  int ccok = ((feedCcM + 1) & 0x0f) == cc;
+  feedCcM = cc;
 
   int dc_i = 0;
-  if (Data[3] & 0x20) {
+  if (dataP[3] & 0x20) {
      // Adaption field present, check for discontinuity_indicator
-     if ((Data[4] > 0) && (Data[5] & 0x80))
+     if ((dataP[4] > 0) && (dataP[5] & 0x80))
         dc_i = 1;
      }
 
   if (!ccok || dc_i) {
-     // Discontinuity detected. Reset pusi_seen = 0 to
+     // Discontinuity detected. Reset pusiSeenM = 0 to
      // stop feeding of suspicious data until next PUSI=1 arrives
-     pusi_seen = 0;
+     pusiSeenM = 0;
      New();
      }
 
-  if (Data[1] & 0x40) {
+  if (dataP[1] & 0x40) {
      // PUSI=1 (is set), section boundary is here
-     if (count > 1 && Data[p] < count) {
-        const uint8_t *before = &Data[p + 1];
-        uint8_t before_len = Data[p];
+     if (count > 1 && dataP[p] < count) {
+        const uint8_t *before = &dataP[p + 1];
+        uint8_t before_len = dataP[p];
         const uint8_t *after = &before[before_len];
         uint8_t after_len = (uint8_t)(count - 1 - before_len);
         CopyDump(before, before_len);
 
-        // Before start of new section, set pusi_seen = 1
-        pusi_seen = 1;
+        // Before start of new section, set pusiSeenM = 1
+        pusiSeenM = 1;
         New();
         CopyDump(after, after_len);
         }
      }
   else {
      // PUSI=0 (is not set), no section boundary
-     CopyDump(&Data[p], count);
+     CopyDump(&dataP[p], count);
+     }
+}
+
+
+cIptvSectionFilterHandler::cIptvSectionFilterHandler(int deviceIndexP, unsigned int bufferLenP)
+: cThread("IPTV section handler", true),
+  mutexM(),
+  deviceIndexM(deviceIndexP),
+  processedM(false),
+  ringBufferM(new cRingBufferLinear(bufferLenP, TS_SIZE, false, *cString::sprintf("IPTV SECTION HANDLER %d", deviceIndexP)))
+{
+  debug("cIptvSectionFilterHandler::%s(%d)", __FUNCTION__, deviceIndexM);
+
+  // Initialize filter pointers
+  memset(filtersM, 0, sizeof(filtersM));
+
+  // Create input buffer
+  if (ringBufferM) {
+     ringBufferM->SetTimeouts(100, 100);
+     ringBufferM->SetIoThrottle();
+     }
+  else
+     error("Failed to allocate buffer for section filter handler (device=%d): ", deviceIndexM);
+
+  Start();
+}
+
+cIptvSectionFilterHandler::~cIptvSectionFilterHandler()
+{
+  debug("cIptvSectionFilterHandler::%s(%d)", __FUNCTION__, deviceIndexM);
+  Stop();
+
+  DELETE_POINTER(ringBufferM);
+
+  // Destroy all filters
+  cMutexLock MutexLock(&mutexM);
+  for (int i = 0; i < eMaxSecFilterCount; ++i)
+      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);
+  // Do the thread loop
+  while (Running()) {
+        // Read one TS packet
+        if (ringBufferM) {
+           int len = 0;
+           if (processedM) {
+              ringBufferM->Del(TS_SIZE);
+              processedM = false;
+              }
+           uchar *p = ringBufferM->Get(len);
+           if (p && (len >= TS_SIZE)) {
+              if (*p != TS_SYNC_BYTE) {
+                 for (int i = 1; i < len; ++i) {
+                     if (p[i] == TS_SYNC_BYTE) {
+                        len = i;
+                        break;
+                        }
+                     }
+                 ringBufferM->Del(len);
+                 debug("cIptvSectionFilterHandler::%s(%d): Skipped %d bytes to sync on TS packet", __FUNCTION__, deviceIndexM, len);
+                 continue;
+                 }
+              // Process TS packet through all filters
+              mutexM.Lock();
+              for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
+                  if (filtersM[i])
+                     filtersM[i]->Process(p);
+                  }
+              mutexM.Unlock();
+              processedM = true;
+              continue;
+              }
+           }
+        cCondWait::SleepMs(10); // to avoid busy loop and reduce cpu load
+        }
+  debug("cIptvSectionFilterHandler::%s(%d): exiting", __FUNCTION__, deviceIndexM);
+}
+
+cString cIptvSectionFilterHandler::GetInformation(void)
+{
+  //debug("cIptvSectionFilterHandler::%s(%d)", __FUNCTION__, deviceIndexM);
+  // loop through active section filters
+  cMutexLock MutexLock(&mutexM);
+  cString s = "";
+  unsigned int count = 0;
+  for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
+      if (filtersM[i]) {
+         s = cString::sprintf("%sFilter %d: %s Pid=0x%02X (%s)\n", *s, i,
+                              *filtersM[i]->GetSectionStatistic(), filtersM[i]->GetPid(),
+                              id_pid(filtersM[i]->GetPid()));
+         if (++count > IPTV_STATS_ACTIVE_FILTERS_COUNT)
+            break;
+         }
+      }
+  return s;
+}
+
+bool cIptvSectionFilterHandler::Delete(unsigned int indexP)
+{
+  //debug("cIptvSectionFilterHandler::%s(%d): index=%d", __FUNCTION__, deviceIndexM, indexP);
+  if ((indexP < eMaxSecFilterCount) && filtersM[indexP]) {
+     //debug("cIptvSectionFilterHandler::%s(%d): found %d", __FUNCTION__, deviceIndexM, indexP);
+     cIptvSectionFilter *tmp = filtersM[indexP];
+     filtersM[indexP] = NULL;
+     delete tmp;
+     return true;
+     }
+  return false;
+}
+
+bool cIptvSectionFilterHandler::IsBlackListed(u_short pidP, u_char tidP, u_char maskP) const
+{
+  //debug("cIptvSectionFilterHandler::%s(%d): pid=%d tid=%02X mask=%02X", __FUNCTION__, deviceIndexM, pidP, tidP, maskP);
+  // loop through section filter table
+  for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i) {
+      int index = IptvConfig.GetDisabledFilters(i);
+      // Check if matches
+      if ((index >= 0) && (index < SECTION_FILTER_TABLE_SIZE) &&
+          (section_filter_table[index].pid == pidP) && (section_filter_table[index].tid == tidP) &&
+          (section_filter_table[index].mask == maskP)) {
+         //debug("cIptvSectionFilterHandler::%s(%d): found %s", __FUNCTION__, deviceIndexM, section_filter_table[index].description);
+         return true;
+         }
+      }
+  return false;
+}
+
+int cIptvSectionFilterHandler::Open(u_short pidP, u_char tidP, u_char maskP)
+{
+  // Lock
+  cMutexLock MutexLock(&mutexM);
+  // Blacklist check, refuse certain filters
+  if (IsBlackListed(pidP, tidP, maskP))
+     return -1;
+  // Search the next free filter slot
+  for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
+      if (!filtersM[i]) {
+         filtersM[i] = new cIptvSectionFilter(deviceIndexM, pidP, tidP, maskP);
+         debug("cIptvSectionFilterHandler::%s(%d): pid=%d tid=%02X mask=%02X handle=%d index=%d", __FUNCTION__, deviceIndexM, pidP, tidP, maskP, filtersM[i]->GetFd(), i);
+         return filtersM[i]->GetFd();
+         }
+      }
+  // No free filter slot found
+  return -1;
+}
+
+void cIptvSectionFilterHandler::Close(int handleP)
+{
+  // Lock
+  cMutexLock MutexLock(&mutexM);
+  // Search the filter for deletion
+  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);
+         Delete(i);
+         break;
+         }
+      }
+}
+
+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);
+  // Fill up the buffer
+  if (ringBufferM) {
+     int len = ringBufferM->Put(bufferP, lengthP);
+     if (len != lengthP)
+        ringBufferM->ReportOverflow(lengthP - len);
      }
 }

sectionfilter.h

@@ -8,6 +8,9 @@
 #ifndef __IPTV_SECTIONFILTER_H
 #define __IPTV_SECTIONFILTER_H
 
+#ifdef __FreeBSD__
+#include <sys/socket.h>
+#endif // __FreeBSD__
 #include <vdr/device.h>
 
 #include "common.h"
@@ -21,42 +24,68 @@ private:
     DMX_MAX_SECFEED_SIZE = (DMX_MAX_SECTION_SIZE + TS_SIZE)
   };
 
-  int pusi_seen;
-  int feedcc;
-  int doneq;
+  int pusiSeenM;
+  int feedCcM;
+  int doneqM;
 
-  uint8_t *secbuf;
-  uint8_t secbuf_base[DMX_MAX_SECFEED_SIZE];
-  uint16_t secbufp;
-  uint16_t seclen;
-  uint16_t tsfeedp;
-  uint16_t pid;
+  uint8_t *secBufM;
+  uint8_t secBufBaseM[DMX_MAX_SECFEED_SIZE];
+  uint16_t secBufpM;
+  uint16_t secLenM;
+  uint16_t tsFeedpM;
+  uint16_t pidM;
 
-  int devid;
-  int id;
-  int socket[2];
+  int deviceIndexM;
+  int socketM[2];
 
-  uint8_t filter_value[DMX_MAX_FILTER_SIZE];
-  uint8_t filter_mask[DMX_MAX_FILTER_SIZE];
-  uint8_t filter_mode[DMX_MAX_FILTER_SIZE];
+  uint8_t filterValueM[DMX_MAX_FILTER_SIZE];
+  uint8_t filterMaskM[DMX_MAX_FILTER_SIZE];
+  uint8_t filterModeM[DMX_MAX_FILTER_SIZE];
 
-  uint8_t maskandmode[DMX_MAX_FILTER_SIZE];
-  uint8_t maskandnotmode[DMX_MAX_FILTER_SIZE];
+  uint8_t maskAndModeM[DMX_MAX_FILTER_SIZE];
+  uint8_t maskAndNotModeM[DMX_MAX_FILTER_SIZE];
 
-  inline uint16_t GetLength(const uint8_t *Data);
+  inline uint16_t GetLength(const uint8_t *dataP);
   void New(void);
   int Filter(void);
   inline int Feed(void);
-  int CopyDump(const uint8_t *buf, uint8_t len);
+  int CopyDump(const uint8_t *bufP, uint8_t lenP);
 
 public:
   // constructor & destructor
-  cIptvSectionFilter(int Index, int DeviceIndex, uint16_t Pid,
-                     uint8_t Tid, uint8_t Mask);
+  cIptvSectionFilter(int deviceIndexP, uint16_t pidP, uint8_t tidP, uint8_t maskP);
   virtual ~cIptvSectionFilter();
-  void Process(const uint8_t* Data);
-  int GetReadDesc(void);
-  uint16_t GetPid(void) const { return pid; }
+  void Process(const uint8_t* dataP);
+  int GetFd(void) { return socketM[0]; }
+  uint16_t GetPid(void) const { return pidM; }
+};
+
+class cIptvSectionFilterHandler : public cThread {
+private:
+  enum {
+    eMaxSecFilterCount = 32
+  };
+  cMutex mutexM;
+  int deviceIndexM;
+  bool processedM;
+  cRingBufferLinear *ringBufferM;
+  cIptvSectionFilter *filtersM[eMaxSecFilterCount];
+
+  bool Delete(unsigned int indexP);
+  bool IsBlackListed(u_short pidP, u_char tidP, u_char maskP) const;
+
+protected:
+  virtual void Action(void);
+
+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);
 };
 
 #endif // __IPTV_SECTIONFILTER_H

setup.c

@@ -21,22 +21,23 @@ private:
   enum {
     INFO_TIMEOUT_MS = 2000
   };
-  cString text;
-  cTimeMs timeout;
-  unsigned int page;
+  cString textM;
+  cTimeMs timeoutM;
+  unsigned int pageM;
   void UpdateInfo();
 
 public:
   cIptvMenuInfo();
   virtual ~cIptvMenuInfo();
   virtual void Display(void);
-  virtual eOSState ProcessKey(eKeys Key);
+  virtual eOSState ProcessKey(eKeys keyP);
 };
 
 cIptvMenuInfo::cIptvMenuInfo()
-:cOsdMenu(tr("IPTV Information")), text(""), timeout(), page(IPTV_DEVICE_INFO_GENERAL)
+:cOsdMenu(tr("IPTV Information")), textM(""), timeoutM(), pageM(IPTV_DEVICE_INFO_GENERAL)
 {
-  timeout.Set(INFO_TIMEOUT_MS);
+  SetMenuCategory(mcText);
+  timeoutM.Set(INFO_TIMEOUT_MS);
   UpdateInfo();
   SetHelp(tr("General"), tr("Pids"), tr("Filters"), tr("Bits/bytes"));
 }
@@ -49,24 +50,24 @@ void cIptvMenuInfo::UpdateInfo()
 {
   cIptvDevice *device = cIptvDevice::GetIptvDevice(cDevice::ActualDevice()->CardIndex());
   if (device)
-     text = device->GetInformation(page);
+     textM = device->GetInformation(pageM);
   else
-     text = cString(tr("IPTV information not available!"));
+     textM = cString(tr("IPTV information not available!"));
   Display();
-  timeout.Set(INFO_TIMEOUT_MS);
+  timeoutM.Set(INFO_TIMEOUT_MS);
 }
 
 void cIptvMenuInfo::Display(void)
 {
   cOsdMenu::Display();
-  DisplayMenu()->SetText(text, true);
-  if (*text)
-     cStatus::MsgOsdTextItem(text);
+  DisplayMenu()->SetText(textM, true);
+  if (*textM)
+     cStatus::MsgOsdTextItem(textM);
 }
 
-eOSState cIptvMenuInfo::ProcessKey(eKeys Key)
+eOSState cIptvMenuInfo::ProcessKey(eKeys keyP)
 {
-  switch (int(Key)) {
+  switch (int(keyP)) {
     case kUp|k_Repeat:
     case kUp:
     case kDown|k_Repeat:
@@ -75,30 +76,30 @@ eOSState cIptvMenuInfo::ProcessKey(eKeys Key)
     case kLeft:
     case kRight|k_Repeat:
     case kRight:
-                  DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
-                  cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft);
+                  DisplayMenu()->Scroll(NORMALKEY(keyP) == kUp || NORMALKEY(keyP) == kLeft, NORMALKEY(keyP) == kLeft || NORMALKEY(keyP) == kRight);
+                  cStatus::MsgOsdTextItem(NULL, NORMALKEY(keyP) == kUp || NORMALKEY(keyP) == kLeft);
                   return osContinue;
     default: break;
     }
 
-  eOSState state = cOsdMenu::ProcessKey(Key);
+  eOSState state = cOsdMenu::ProcessKey(keyP);
 
   if (state == osUnknown) {
-     switch (Key) {
+     switch (keyP) {
        case kOk:     return osBack;
-       case kRed:    page = IPTV_DEVICE_INFO_GENERAL;
+       case kRed:    pageM = IPTV_DEVICE_INFO_GENERAL;
                      UpdateInfo();
                      break;
-       case kGreen:  page = IPTV_DEVICE_INFO_PIDS;
+       case kGreen:  pageM = IPTV_DEVICE_INFO_PIDS;
                      UpdateInfo();
                      break;
-       case kYellow: page = IPTV_DEVICE_INFO_FILTERS;
+       case kYellow: pageM = IPTV_DEVICE_INFO_FILTERS;
                      UpdateInfo();
                      break;
        case kBlue:   IptvConfig.SetUseBytes(IptvConfig.GetUseBytes() ? 0 : 1);
                      UpdateInfo();
                      break;
-       default:      if (timeout.TimedOut())
+       default:      if (timeoutM.TimedOut())
                         UpdateInfo();
                      state = osContinue;
                      break;
@@ -111,18 +112,19 @@ eOSState cIptvMenuInfo::ProcessKey(eKeys Key)
 
 cIptvPluginSetup::cIptvPluginSetup()
 {
-  debug("cIptvPluginSetup::cIptvPluginSetup()\n");
-  tsBufferSize = IptvConfig.GetTsBufferSize();
-  tsBufferPrefill = IptvConfig.GetTsBufferPrefillRatio();
-  extProtocolBasePort = IptvConfig.GetExtProtocolBasePort();
-  sectionFiltering = IptvConfig.GetSectionFiltering();
-  numDisabledFilters = IptvConfig.GetDisabledFiltersCount();
-  if (numDisabledFilters > SECTION_FILTER_TABLE_SIZE)
-     numDisabledFilters = SECTION_FILTER_TABLE_SIZE;
+  debug("cIptvPluginSetup::%s()", __FUNCTION__);
+  tsBufferSizeM = IptvConfig.GetTsBufferSize();
+  tsBufferPrefillM = IptvConfig.GetTsBufferPrefillRatio();
+  protocolBasePortM = IptvConfig.GetProtocolBasePort();
+  sectionFilteringM = IptvConfig.GetSectionFiltering();
+  numDisabledFiltersM = IptvConfig.GetDisabledFiltersCount();
+  if (numDisabledFiltersM > SECTION_FILTER_TABLE_SIZE)
+     numDisabledFiltersM = SECTION_FILTER_TABLE_SIZE;
   for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i) {
-      disabledFilterIndexes[i] = IptvConfig.GetDisabledFilters(i);
-      disabledFilterNames[i] = tr(section_filter_table[i].description);
+      disabledFilterIndexesM[i] = IptvConfig.GetDisabledFilters(i);
+      disabledFilterNamesM[i] = tr(section_filter_table[i].description);
       }
+  SetMenuCategory(mcSetupPlugins);
   Setup();
   SetHelp(NULL, NULL, NULL, trVDR("Button$Info"));
 }
@@ -132,28 +134,28 @@ void cIptvPluginSetup::Setup(void)
   int current = Current();
 
   Clear();
-  help.Clear();
+  helpM.Clear();
 
-  Add(new cMenuEditIntItem( tr("TS buffer size [MB]"), &tsBufferSize, 1, 4));
-  help.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 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 [%]"), &tsBufferPrefill, 0, 40));
-  help.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("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"), &extProtocolBasePort, 0, 0xFFF7));
-  help.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"), &sectionFiltering));
-  help.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."));
+  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 (sectionFiltering) {
-     Add(new cMenuEditIntItem( tr("Disable filters"), &numDisabledFilters, 0, SECTION_FILTER_TABLE_SIZE));
-     help.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."));
+  if (sectionFilteringM) {
+     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 < numDisabledFilters; ++i) {
+     for (int i = 0; i < numDisabledFiltersM; ++i) {
          // TRANSLATORS: note the singular!
-         Add(new cMenuEditStraItem(tr("Disable filter"), &disabledFilterIndexes[i], SECTION_FILTER_TABLE_SIZE, disabledFilterNames));
-         help.Append(tr("Define an ill-behaving filter to be blacklisted."));
+         Add(new cMenuEditStraItem(tr("Disable filter"), &disabledFilterIndexesM[i], SECTION_FILTER_TABLE_SIZE, disabledFilterNamesM));
+         helpM.Append(tr("Define an ill-behaving filter to be blacklisted."));
          }
      }
 
@@ -163,68 +165,68 @@ void cIptvPluginSetup::Setup(void)
 
 eOSState cIptvPluginSetup::ShowInfo(void)
 {
-  debug("cIptvPluginSetup::ShowInfo()\n");
+  debug("cIptvPluginSetup::%s()", __FUNCTION__);
   if (HasSubMenu())
      return osContinue;
   return AddSubMenu(new cIptvMenuInfo());
 }
 
-eOSState cIptvPluginSetup::ProcessKey(eKeys Key)
+eOSState cIptvPluginSetup::ProcessKey(eKeys keyP)
 {
-  int oldsectionFiltering = sectionFiltering;
-  int oldNumDisabledFilters = numDisabledFilters;
-  eOSState state = cMenuSetupPage::ProcessKey(Key);
+  int oldsectionFiltering = sectionFilteringM;
+  int oldNumDisabledFilters = numDisabledFiltersM;
+  eOSState state = cMenuSetupPage::ProcessKey(keyP);
 
   if (state == osUnknown) {
-     switch (Key) {
+     switch (keyP) {
        case kBlue: return ShowInfo();
-       case kInfo: if (Current() < help.Size())
-                      return AddSubMenu(new cMenuText(cString::sprintf("%s - %s '%s'", tr("Help"), trVDR("Plugin"), PLUGIN_NAME_I18N), help[Current()]));
+       case kInfo: if (Current() < helpM.Size())
+                      return AddSubMenu(new cMenuText(cString::sprintf("%s - %s '%s'", tr("Help"), trVDR("Plugin"), PLUGIN_NAME_I18N), helpM[Current()]));
        default:    state = osContinue; break;
        }
      }
 
-  if ((Key != kNone) && ((numDisabledFilters != oldNumDisabledFilters) || (sectionFiltering != oldsectionFiltering))) {
-     while ((numDisabledFilters < oldNumDisabledFilters) && (oldNumDisabledFilters > 0))
-           disabledFilterIndexes[--oldNumDisabledFilters] = -1;
+  if ((keyP != kNone) && ((numDisabledFiltersM != oldNumDisabledFilters) || (sectionFilteringM != oldsectionFiltering))) {
+     while ((numDisabledFiltersM < oldNumDisabledFilters) && (oldNumDisabledFilters > 0))
+           disabledFilterIndexesM[--oldNumDisabledFilters] = -1;
      Setup();
      }
 
   return state;
 }
 
-void cIptvPluginSetup::StoreFilters(const char *Name, int *Values)
+void cIptvPluginSetup::StoreFilters(const char *nameP, int *valuesP)
 {
   char buffer[SECTION_FILTER_TABLE_SIZE * 4];
   char *q = buffer;
   for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i) {
       char s[3];
-      if (Values[i] < 0)
+      if (valuesP[i] < 0)
          break;
       if (q > buffer)
          *q++ = ' ';
-      snprintf(s, sizeof(s), "%d", Values[i]);
+      snprintf(s, sizeof(s), "%d", valuesP[i]);
       strncpy(q, s, strlen(s));
       q += strlen(s);
       }
   *q = 0;
-  debug("cIptvPluginSetup::StoreFilters(): %s=%s\n", Name, buffer);
-  SetupStore(Name, buffer);
+  debug("cIptvPluginSetup::%s(%s, %s)", __FUNCTION__, nameP, buffer);
+  SetupStore(nameP, buffer);
 }
 
 void cIptvPluginSetup::Store(void)
 {
   // Store values into setup.conf
-  SetupStore("TsBufferSize", tsBufferSize);
-  SetupStore("TsBufferPrefill", tsBufferPrefill);
-  SetupStore("ExtProtocolBasePort", extProtocolBasePort);
-  SetupStore("SectionFiltering", sectionFiltering);
-  StoreFilters("DisabledFilters", disabledFilterIndexes);
+  SetupStore("TsBufferSize", tsBufferSizeM);
+  SetupStore("TsBufferPrefill", tsBufferPrefillM);
+  SetupStore("ExtProtocolBasePort", protocolBasePortM);
+  SetupStore("SectionFiltering", sectionFilteringM);
+  StoreFilters("DisabledFilters", disabledFilterIndexesM);
   // Update global config
-  IptvConfig.SetTsBufferSize(tsBufferSize);
-  IptvConfig.SetTsBufferPrefillRatio(tsBufferPrefill);
-  IptvConfig.SetExtProtocolBasePort(extProtocolBasePort);
-  IptvConfig.SetSectionFiltering(sectionFiltering);
+  IptvConfig.SetTsBufferSize(tsBufferSizeM);
+  IptvConfig.SetTsBufferPrefillRatio(tsBufferPrefillM);
+  IptvConfig.SetProtocolBasePort(protocolBasePortM);
+  IptvConfig.SetSectionFiltering(sectionFilteringM);
   for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i)
-      IptvConfig.SetDisabledFilters(i, disabledFilterIndexes[i]);
+      IptvConfig.SetDisabledFilters(i, disabledFilterIndexesM[i]);
 }

setup.h

@@ -12,70 +12,24 @@
 #include <vdr/sourceparams.h>
 #include "common.h"
 
-class cIptvTransponderParameters
-{
-  friend class cIptvSourceParam;
-private:
-  int sidscan;
-  int pidscan;
-  int protocol;
-  char address[MaxFileName];
-  int parameter;
-public:
-  cIptvTransponderParameters(const char *Parameters = NULL);
-  int SidScan(void) const { return sidscan; }
-  int PidScan(void) const { return pidscan; }
-  int Protocol(void) const { return protocol; }
-  const char *Address(void) const { return address; }
-  int Parameter(void) const { return parameter; }
-  void SetSidScan(int SidScan) { sidscan = SidScan; }
-  void SetPidScan(int PidScan) { pidscan = PidScan; }
-  void SetProtocol(int Protocol) { protocol = Protocol; }
-  void SetAddress(const char *Address) { strncpy(address, Address, sizeof(address)); }
-  void SetParameter(int Parameter) { parameter = Parameter; }
-  cString ToString(char Type) const;
-  bool Parse(const char *s);
-};
-
-class cIptvSourceParam : public cSourceParam
-{
-private:
-  enum {
-    eProtocolUDP,
-    eProtocolHTTP,
-    eProtocolFILE,
-    eProtocolEXT,
-    eProtocolCount
-  };
-  int param;
-  cChannel data;
-  cIptvTransponderParameters itp;
-  const char *protocols[eProtocolCount];
-public:
-  cIptvSourceParam(char Source, const char *Description);
-  virtual void SetData(cChannel *Channel);
-  virtual void GetData(cChannel *Channel);
-  virtual cOsdItem *GetOsdItem(void);
-};
-
 class cIptvPluginSetup : public cMenuSetupPage
 {
 private:
-  int tsBufferSize;
-  int tsBufferPrefill;
-  int extProtocolBasePort;
-  int sectionFiltering;
-  int numDisabledFilters;
-  int disabledFilterIndexes[SECTION_FILTER_TABLE_SIZE];
-  const char *disabledFilterNames[SECTION_FILTER_TABLE_SIZE];
-  cVector<const char*> help;
+  int tsBufferSizeM;
+  int tsBufferPrefillM;
+  int protocolBasePortM;
+  int sectionFilteringM;
+  int numDisabledFiltersM;
+  int disabledFilterIndexesM[SECTION_FILTER_TABLE_SIZE];
+  const char *disabledFilterNamesM[SECTION_FILTER_TABLE_SIZE];
+  cVector<const char*> helpM;
 
   eOSState ShowInfo(void);
   void Setup(void);
-  void StoreFilters(const char *Name, int *Values);
+  void StoreFilters(const char *nameP, int *valuesP);
 
 protected:
-  virtual eOSState ProcessKey(eKeys Key);
+  virtual eOSState ProcessKey(eKeys keyP);
   virtual void Store(void);
 
 public:

sidscanner.c

@@ -11,90 +11,93 @@
 #include "sidscanner.h"
 
 cSidScanner::cSidScanner(void)
-: channelId(tChannelID::InvalidID),
-  sidFound(false),
-  nidFound(false),
-  tidFound(false)
+: channelIdM(tChannelID::InvalidID),
+  sidFoundM(false),
+  nidFoundM(false),
+  tidFoundM(false),
+  isActiveM(false)
 {
-  debug("cSidScanner::cSidScanner()\n");
+  debug("cSidScanner::%s()", __FUNCTION__);
   Set(0x00, 0x00);  // PAT
   Set(0x10, 0x40);  // NIT
 }
 
 cSidScanner::~cSidScanner()
 {
-  debug("cSidScanner::~cSidScanner()\n");
+  debug("cSidScanner::%s()", __FUNCTION__);
 }
 
-void cSidScanner::SetStatus(bool On)
+void cSidScanner::SetChannel(const tChannelID &channelIdP)
 {
-  debug("cSidScanner::SetStatus(): %d\n", On);
-  cFilter::SetStatus(On);
+  debug("cSidScanner::%s(%s)", __FUNCTION__, *channelIdP.ToString());
+  channelIdM = channelIdP;
+  sidFoundM = false;
+  nidFoundM = false;
+  tidFoundM = false;
 }
 
-void cSidScanner::SetChannel(const tChannelID &ChannelId)
-{
-  debug("cSidScanner::SetChannel(): %s\n", *ChannelId.ToString());
-  channelId = ChannelId;
-  sidFound = false;
-  nidFound = false;
-  tidFound = false;
-}
-
-void cSidScanner::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
+void cSidScanner::Process(u_short pidP, u_char tidP, const u_char *dataP, int lengthP)
 {
   int newSid = -1, newNid = -1, newTid = -1;
 
-  //debug("cSidScanner::Process()\n");
-  if (channelId.Valid()) {
-     if ((Pid == 0x00) && (Tid == 0x00)) {
-        debug("cSidScanner::Process(): Pid=%d Tid=%02X\n", Pid, Tid);
-        SI::PAT pat(Data, false);
+  //debug("cSidScanner::%s()", __FUNCTION__);
+  if (!isActiveM)
+     return;
+  if (channelIdM.Valid()) {
+     if ((pidP == 0x00) && (tidP == 0x00)) {
+        //debug("cSidScanner::%s(%d, %02X)", __FUNCTION__, pidP, tidP);
+        SI::PAT pat(dataP, false);
         if (!pat.CheckCRCAndParse())
            return;
         SI::PAT::Association assoc;
         for (SI::Loop::Iterator it; pat.associationLoop.getNext(assoc, it); ) {
             if (!assoc.isNITPid()) {
-               if (assoc.getServiceId() != channelId.Sid()) {
-                  debug("cSidScanner::Process(): Sid=%d\n", assoc.getServiceId());
+               if (assoc.getServiceId() != channelIdM.Sid()) {
+                  debug("cSidScanner::%s(): sid=%d", __FUNCTION__, assoc.getServiceId());
                   newSid = assoc.getServiceId();
                   }
-               sidFound = true;
+               sidFoundM = true;
                break;
                }
             }
         }
-     else if ((Pid == 0x10) && (Tid == 0x40)) {
-        debug("cSidScanner::Process(): Pid=%d Tid=%02X\n", Pid, Tid);
-        SI::NIT nit(Data, false);
+     else if ((pidP == 0x10) && (tidP == 0x40)) {
+        debug("cSidScanner::%s(%d, %02X)", __FUNCTION__, pidP, tidP);
+        SI::NIT nit(dataP, false);
         if (!nit.CheckCRCAndParse())
            return;
         SI::NIT::TransportStream ts;
         for (SI::Loop::Iterator it; nit.transportStreamLoop.getNext(ts, it); ) {
-            if (ts.getTransportStreamId() != channelId.Tid()) {
-               debug("cSidScanner::Process(): TSid=%d\n", ts.getTransportStreamId());
+            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;
                }
-            tidFound = true;
             break; // default to the first one
             }
-        if (nit.getNetworkId() != channelId.Nid()) {
-           debug("cSidScanner::Process(): Nid=%d\n", 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;
            }
-        nidFound = true; 
         }
      }
   if ((newSid >= 0) || (newNid >= 0) || (newTid >= 0)) {
      if (!Channels.Lock(true, 10))
         return;
-     cChannel *IptvChannel = Channels.GetByChannelID(channelId);
+     cChannel *IptvChannel = Channels.GetByChannelID(channelIdM);
      if (IptvChannel)
         IptvChannel->SetId((newNid < 0) ? IptvChannel->Nid() : newNid, (newTid < 0) ? IptvChannel->Tid() : newTid,
                            (newSid < 0) ? IptvChannel->Sid() : newSid, IptvChannel->Rid());
      Channels.Unlock();
      }
-  if (sidFound && nidFound && tidFound) {
+  if (sidFoundM && nidFoundM && tidFoundM) {
      SetChannel(tChannelID::InvalidID);
      SetStatus(false);
      }

sidscanner.h

@@ -13,21 +13,21 @@
 
 class cSidScanner : public cFilter {
 private:
-  tChannelID channelId;
-  bool sidFound;
-  bool nidFound;
-  bool tidFound;
+  tChannelID channelIdM;
+  bool sidFoundM;
+  bool nidFoundM;
+  bool tidFoundM;
+  bool isActiveM;
 
 protected:
-  virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
-  virtual void SetStatus(bool On);
+  virtual void Process(u_short pidP, u_char tidP, const u_char *dataP, int lengthP);
 
 public:
   cSidScanner(void);
   ~cSidScanner();
-  void SetChannel(const tChannelID &ChannelId);
-  void Open() { SetStatus(true); }
-  void Close() { SetStatus(false); }
+  void SetChannel(const tChannelID &channelIdP);
+  void Open()  { debug("cSidScanner::%s()", __FUNCTION__); isActiveM = true; }
+  void Close() { debug("cSidScanner::%s()", __FUNCTION__); isActiveM = false; }
 };
 
 #endif // __SIDSCANNER_H

socket.c

@@ -7,6 +7,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <net/if.h>
 #include <netdb.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -18,206 +19,284 @@
 #include "socket.h"
 
 cIptvSocket::cIptvSocket()
-: socketPort(0),
-  socketDesc(-1),
-  isActive(false)
+: socketPortM(0),
+  socketDescM(-1),
+  isActiveM(false)
 {
-  debug("cIptvSocket::cIptvSocket()\n");
-  memset(&sockAddr, '\0', sizeof(sockAddr));
+  debug("cIptvSocket::%s()", __FUNCTION__);
+  memset(&sockAddrM, 0, sizeof(sockAddrM));
 }
 
 cIptvSocket::~cIptvSocket()
 {
-  debug("cIptvSocket::~cIptvSocket()\n");
+  debug("cIptvSocket::%s()", __FUNCTION__);
   // Close the socket
   CloseSocket();
 }
 
-bool cIptvSocket::OpenSocket(const int Port, const bool isUdp)
+bool cIptvSocket::OpenSocket(const int portP, const bool isUdpP)
 {
-  debug("cIptvSocket::OpenSocket()\n");
+  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 (Port != socketPort) {
-     debug("cIptvSocket::OpenSocket(): Socket tear-down\n");
+  if (portP != socketPortM) {
+     debug("cIptvSocket::%s(): socket tear-down", __FUNCTION__);
      CloseSocket();
      }
   // Bind to the socket if it is not active already
-  if (socketDesc < 0) {
+  if (socketDescM < 0) {
      int yes = 1;
      // Create socket
-     if (isUdp)
-        socketDesc = socket(PF_INET, SOCK_DGRAM, 0);
+     if (isUdpP)
+        socketDescM = socket(PF_INET, SOCK_DGRAM, 0);
      else
-        socketDesc = socket(PF_INET, SOCK_STREAM, 0);
-     ERROR_IF_RET(socketDesc < 0, "socket()", return false);
+        socketDescM = socket(PF_INET, SOCK_STREAM, 0);
+     ERROR_IF_RET(socketDescM < 0, "socket()", return false);
      // Make it use non-blocking I/O to avoid stuck read calls
-     ERROR_IF_FUNC(fcntl(socketDesc, F_SETFL, O_NONBLOCK), "fcntl(O_NONBLOCK)",
+     ERROR_IF_FUNC(fcntl(socketDescM, F_SETFL, O_NONBLOCK), "fcntl(O_NONBLOCK)",
                    CloseSocket(), return false);
      // Allow multiple sockets to use the same PORT number
-     ERROR_IF_FUNC(setsockopt(socketDesc, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0, "setsockopt(SO_REUSEADDR)",
-                   CloseSocket(), return false);
+     ERROR_IF_FUNC(setsockopt(socketDescM, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0,
+                   "setsockopt(SO_REUSEADDR)", CloseSocket(), return false);
+#ifndef __FreeBSD__
      // Allow packet information to be fetched
-     ERROR_IF_FUNC(setsockopt(socketDesc, SOL_IP, IP_PKTINFO, &yes, sizeof(yes)) < 0, "setsockopt(IP_PKTINFO)",
-                   CloseSocket(), return false);
+     ERROR_IF_FUNC(setsockopt(socketDescM, SOL_IP, IP_PKTINFO, &yes, sizeof(yes)) < 0,
+                   "setsockopt(IP_PKTINFO)", CloseSocket(), return false);
+#endif // __FreeBSD__
      // Bind socket
-     memset(&sockAddr, '\0', sizeof(sockAddr));
-     sockAddr.sin_family = AF_INET;
-     sockAddr.sin_port = htons((uint16_t)(Port & 0xFFFF));
-     sockAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-     if (isUdp) {
-        int err = bind(socketDesc, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
-        ERROR_IF_FUNC(err < 0, "bind()", CloseSocket(), return false);
-        }
+     memset(&sockAddrM, 0, sizeof(sockAddrM));
+     sockAddrM.sin_family = AF_INET;
+     sockAddrM.sin_port = htons((uint16_t)(portP & 0xFFFF));
+     sockAddrM.sin_addr.s_addr = htonl(INADDR_ANY);
+     if (isUdpP)
+        ERROR_IF_FUNC(bind(socketDescM, (struct sockaddr *)&sockAddrM, sizeof(sockAddrM)) < 0,
+                      "bind()", CloseSocket(), return false);
      // Update socket port
-     socketPort = Port;
+     socketPortM = portP;
      }
   return true;
 }
 
 void cIptvSocket::CloseSocket(void)
 {
-  debug("cIptvSocket::CloseSocket()\n");
+  debug("cIptvSocket::%s()", __FUNCTION__);
   // Check if socket exists
-  if (socketDesc >= 0) {
-     close(socketDesc);
-     socketDesc = -1;
-     socketPort = 0;
-     memset(&sockAddr, 0, sizeof(sockAddr));
+  if (socketDescM >= 0) {
+     close(socketDescM);
+     socketDescM = -1;
+     socketPortM = 0;
+     memset(&sockAddrM, 0, sizeof(sockAddrM));
      }
 }
 
+bool cIptvSocket::CheckAddress(const char *addrP, in_addr_t *inAddrP)
+{
+  if (inAddrP) {
+     // First try only the IP address
+     *inAddrP = inet_addr(addrP);
+     if (*inAddrP == htonl(INADDR_NONE)) {
+        debug("cIptvSocket::%s(%s): cannot convert to address", __FUNCTION__, addrP);
+        // It may be a host name, get the name
+        struct hostent *host = gethostbyname(addrP);
+        if (!host) {
+           char tmp[64];
+           error("gethostbyname() failed: %s is not valid address: %s", addrP,
+                 strerror_r(h_errno, tmp, sizeof(tmp)));
+           return false;
+           }
+        *inAddrP = inet_addr(*host->h_addr_list);
+        }
+     return true;
+     }
+  return false;
+}
+
 // UDP socket class
 cIptvUdpSocket::cIptvUdpSocket()
-: streamAddr(INADDR_ANY)
+: streamAddrM(htonl(INADDR_ANY)),
+  sourceAddrM(htonl(INADDR_ANY)),
+  useIGMPv3M(false)
 {
-  debug("cIptvUdpSocket::cIptvUdpSocket()\n");
+  debug("cIptvUdpSocket::%s()", __FUNCTION__);
 }
 
 cIptvUdpSocket::~cIptvUdpSocket()
 {
-  debug("cIptvUdpSocket::~cIptvUdpSocket()\n");
+  debug("cIptvUdpSocket::%s()", __FUNCTION__);
 }
 
-bool cIptvUdpSocket::OpenSocket(const int Port, const in_addr_t StreamAddr)
+bool cIptvUdpSocket::OpenSocket(const int portP)
 {
-  debug("cIptvUdpSocket::OpenSocket()\n");
-  streamAddr = StreamAddr;
-  return cIptvSocket::OpenSocket(Port, true);
+  debug("cIptvUdpSocket::%s()", __FUNCTION__);
+  streamAddrM = htonl(INADDR_ANY);
+  sourceAddrM = htonl(INADDR_ANY);
+  useIGMPv3M = false;
+  return cIptvSocket::OpenSocket(portP, true);
+}
+
+bool cIptvUdpSocket::OpenSocket(const int portP, const char *streamAddrP, const char *sourceAddrP, bool useIGMPv3P)
+{
+  debug("cIptvUdpSocket::%s(%d, %s, %s, %d)", __FUNCTION__, portP, streamAddrP, sourceAddrP, useIGMPv3P);
+  CheckAddress(streamAddrP, &streamAddrM);
+  CheckAddress(sourceAddrP, &sourceAddrM);
+  useIGMPv3M = useIGMPv3P;
+  return cIptvSocket::OpenSocket(portP, true);
 }
 
 void cIptvUdpSocket::CloseSocket(void)
 {
-  debug("cIptvUdpSocket::CloseSocket()\n");
-  streamAddr = INADDR_ANY;
+  debug("cIptvUdpSocket::%s()", __FUNCTION__);
+  streamAddrM = htonl(INADDR_ANY);
+  sourceAddrM = htonl(INADDR_ANY);
+  useIGMPv3M = false;
   cIptvSocket::CloseSocket();
 }
 
 bool cIptvUdpSocket::JoinMulticast(void)
 {
-  debug("cIptvUdpSocket::JoinMulticast()\n");
+  debug("cIptvUdpSocket::%s()", __FUNCTION__);
   // Check if socket exists
-  if (!isActive && (socketDesc >= 0)) {
+  if (!isActiveM && (socketDescM >= 0)) {
      // Join a new multicast group
-     struct ip_mreq mreq;
-     mreq.imr_multiaddr.s_addr = streamAddr;
-     mreq.imr_interface.s_addr = htonl(INADDR_ANY);
-     ERROR_IF_RET(setsockopt(socketDesc, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0, "setsockopt(IP_ADD_MEMBERSHIP)", return false);
+     if (useIGMPv3M) {
+        // Source-specific multicast (SSM) is used
+        struct group_source_req gsr;
+        struct sockaddr_in *grp;
+        struct sockaddr_in *src;
+        gsr.gsr_interface = 0; // if_nametoindex("any") ?
+        grp = (struct sockaddr_in*)&gsr.gsr_group;
+        grp->sin_family = AF_INET;
+        grp->sin_addr.s_addr = streamAddrM;
+        grp->sin_port = 0;
+        src = (struct sockaddr_in*)&gsr.gsr_source;
+        src->sin_family = AF_INET;
+        src->sin_addr.s_addr = sourceAddrM;
+        src->sin_port = 0;
+        ERROR_IF_RET(setsockopt(socketDescM, SOL_IP, MCAST_JOIN_SOURCE_GROUP, &gsr, sizeof(gsr)) < 0, "setsockopt(MCAST_JOIN_SOURCE_GROUP)", return false);
+        }
+     else {
+        struct ip_mreq mreq;
+        mreq.imr_multiaddr.s_addr = streamAddrM;
+        mreq.imr_interface.s_addr = htonl(INADDR_ANY);
+        ERROR_IF_RET(setsockopt(socketDescM, SOL_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0, "setsockopt(IP_ADD_MEMBERSHIP)", return false);
+        }
      // Update multicasting flag
-     isActive = true;
+     isActiveM = true;
      }
   return true;
 }
 
 bool cIptvUdpSocket::DropMulticast(void)
 {
-  debug("cIptvUdpSocket::DropMulticast()\n");
+  debug("cIptvUdpSocket::%s()", __FUNCTION__);
   // Check if socket exists
-  if (isActive && (socketDesc >= 0)) {
+  if (isActiveM && (socketDescM >= 0)) {
      // Drop the existing multicast group
-     struct ip_mreq mreq;
-     mreq.imr_multiaddr.s_addr = streamAddr;
-     mreq.imr_interface.s_addr = htonl(INADDR_ANY);
-     ERROR_IF_RET(setsockopt(socketDesc, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0, "setsockopt(IP_DROP_MEMBERSHIP)", return false);
+     if (useIGMPv3M) {
+        // Source-specific multicast (SSM) is used
+        struct group_source_req gsr;
+        struct sockaddr_in *grp;
+        struct sockaddr_in *src;
+        gsr.gsr_interface = 0; // if_nametoindex("any") ?
+        grp = (struct sockaddr_in*)&gsr.gsr_group;
+        grp->sin_family = AF_INET;
+        grp->sin_addr.s_addr = streamAddrM;
+        grp->sin_port = 0;
+        src = (struct sockaddr_in*)&gsr.gsr_source;
+        src->sin_family = AF_INET;
+        src->sin_addr.s_addr = sourceAddrM;
+        src->sin_port = 0;
+        ERROR_IF_RET(setsockopt(socketDescM, SOL_IP, MCAST_LEAVE_SOURCE_GROUP, &gsr, sizeof(gsr)) < 0, "setsockopt(MCAST_LEAVE_SOURCE_GROUP)", return false);
+        }
+     else {
+        struct ip_mreq mreq;
+        mreq.imr_multiaddr.s_addr = streamAddrM;
+        mreq.imr_interface.s_addr = htonl(INADDR_ANY);
+        ERROR_IF_RET(setsockopt(socketDescM, SOL_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0, "setsockopt(IP_DROP_MEMBERSHIP)", return false);
+        }
      // Update multicasting flag
-     isActive = false;
+     isActiveM = false;
      }
   return true;
 }
 
 
-int cIptvUdpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
+int cIptvUdpSocket::Read(unsigned char *bufferAddrP, unsigned int bufferLenP)
 {
-  //debug("cIptvUdpSocket::Read()\n");
+  //debug("cIptvUdpSocket::%s()", __FUNCTION__);
   // Error out if socket not initialized
-  if (socketDesc <= 0) {
-     error("Invalid socket in %s\n", __FUNCTION__);
+  if (socketDescM <= 0) {
+     error("Invalid socket in cIptvUdpSocket::%s()", __FUNCTION__);
      return -1;
      }
   int len = 0;
   // Read data from socket in a loop
   do {
-    socklen_t addrlen = sizeof(sockAddr);
+    socklen_t addrlen = sizeof(sockAddrM);
     struct msghdr msgh;
-    struct cmsghdr *cmsg;
     struct iovec iov;
     char cbuf[256];
     len = 0;
     // Initialize iov and msgh structures
     memset(&msgh, 0, sizeof(struct msghdr));
-    iov.iov_base = BufferAddr;
-    iov.iov_len = BufferLen;
+    iov.iov_base = bufferAddrP;
+    iov.iov_len = bufferLenP;
     msgh.msg_control = cbuf;
     msgh.msg_controllen = sizeof(cbuf);
-    msgh.msg_name = &sockAddr;
+    msgh.msg_name = &sockAddrM;
     msgh.msg_namelen = addrlen;
     msgh.msg_iov  = &iov;
     msgh.msg_iovlen = 1;
     msgh.msg_flags = 0;
 
-    if (isActive && socketDesc && BufferAddr && (BufferLen > 0))
-       len = (int)recvmsg(socketDesc, &msgh, MSG_DONTWAIT);
+    if (isActiveM && socketDescM && bufferAddrP && (bufferLenP > 0))
+       len = (int)recvmsg(socketDescM, &msgh, MSG_DONTWAIT);
     else
        break;
     if (len > 0) {
+#ifndef __FreeBSD__
        // Process auxiliary received data and validate source address
-       for (cmsg = CMSG_FIRSTHDR(&msgh); cmsg != NULL; cmsg = CMSG_NXTHDR(&msgh, cmsg)) {
+       for (struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msgh); cmsg != NULL; cmsg = CMSG_NXTHDR(&msgh, cmsg)) {
            if ((cmsg->cmsg_level == SOL_IP) && (cmsg->cmsg_type == IP_PKTINFO)) {
               struct in_pktinfo *i = (struct in_pktinfo *)CMSG_DATA(cmsg);
-              if ((i->ipi_addr.s_addr == streamAddr) || (INADDR_ANY == streamAddr)) {
-                 if (BufferAddr[0] == TS_SYNC_BYTE)
+              if ((i->ipi_addr.s_addr == streamAddrM) || (htonl(INADDR_ANY) == streamAddrM)) {
+#endif // __FreeBSD__
+                 if (bufferAddrP[0] == TS_SYNC_BYTE)
                     return len;
                  else if (len > 3) {
-                    // http://www.networksorcery.com/enp/rfc/rfc2250.txt
-                    // version
-                    unsigned int v = (BufferAddr[0] >> 6) & 0x03;
-                    // extension bit
-                    unsigned int x = (BufferAddr[0] >> 4) & 0x01;
-                    // cscr count
-                    unsigned int cc = BufferAddr[0] & 0x0F;
-                    // payload type: MPEG2 TS = 33
-                    //unsigned int pt = readBuffer[1] & 0x7F;
-                    // header lenght
+                    // http://tools.ietf.org/html/rfc3550
+                    // http://tools.ietf.org/html/rfc2250
+                    // Version
+                    unsigned int v = (bufferAddrP[0] >> 6) & 0x03;
+                    // Extension bit
+                    unsigned int x = (bufferAddrP[0] >> 4) & 0x01;
+                    // CSCR count
+                    unsigned int cc = bufferAddrP[0] & 0x0F;
+                    // Payload type: MPEG2 TS = 33
+                    //unsigned int pt = bufferAddrP[1] & 0x7F;
+                    // Header lenght
                     unsigned int headerlen = (3 + cc) * (unsigned int)sizeof(uint32_t);
-                    // check if extension
+                    // Check if extension
                     if (x) {
-                       // extension header length
-                       unsigned int ehl = (((BufferAddr[headerlen + 2] & 0xFF) << 8) |
-                                           (BufferAddr[headerlen + 3] & 0xFF));
-                       // update header length
+                       // Extension header length
+                       unsigned int ehl = (((bufferAddrP[headerlen + 2] & 0xFF) << 8) |
+                                           (bufferAddrP[headerlen + 3] & 0xFF));
+                       // Update header length
                        headerlen += (ehl + 1) * (unsigned int)sizeof(uint32_t);
                        }
                     // Check that rtp is version 2 and payload contains multiple of TS packet data
                     if ((v == 2) && (((len - headerlen) % TS_SIZE) == 0) &&
-                        (BufferAddr[headerlen] == TS_SYNC_BYTE)) {
+                        (bufferAddrP[headerlen] == TS_SYNC_BYTE)) {
                        // Set argument point to payload in read buffer
-                       memmove(BufferAddr, &BufferAddr[headerlen], (len - headerlen));
+                       memmove(bufferAddrP, &bufferAddrP[headerlen], (len - headerlen));
                        return (len - headerlen);
                        }
                     }
+#ifndef __FreeBSD__
                  }
               }
            }
+#endif // __FreeBSD__
        }
     } while (len > 0);
   ERROR_IF_RET(len < 0 && errno != EAGAIN, "recvmsg()", return -1);
@@ -228,63 +307,42 @@ int cIptvUdpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
 // TCP socket class
 cIptvTcpSocket::cIptvTcpSocket()
 {
-  debug("cIptvTcpSocket::cIptvTcpSocket()\n");
+  debug("cIptvTcpSocket::%s()", __FUNCTION__);
 }
 
 cIptvTcpSocket::~cIptvTcpSocket()
 {
-  debug("cIptvTcpSocket::~cIptvTcpSocket()\n");
+  debug("cIptvTcpSocket::%s()", __FUNCTION__);
 }
 
-bool cIptvTcpSocket::OpenSocket(const int Port, const char *StreamAddr)
+bool cIptvTcpSocket::OpenSocket(const int portP, const char *streamAddrP)
 {
-  debug("cIptvTcpSocket::OpenSocket()\n");
-
+  debug("cIptvTcpSocket::%s(%d, %s)", __FUNCTION__, portP, streamAddrP);
   // Socket must be opened before setting the host address
-  bool retval = cIptvSocket::OpenSocket(Port, false);
-
-  // First try only the IP address
-  sockAddr.sin_addr.s_addr = inet_addr(StreamAddr);
-
-  if (sockAddr.sin_addr.s_addr == INADDR_NONE) {
-     debug("Cannot convert %s directly to internet address\n", StreamAddr);
-
-     // It may be a host name, get the name
-     struct hostent *host;
-     host = gethostbyname(StreamAddr);
-     if (!host) {
-        char tmp[64];
-        error("gethostbyname() failed: %s is not valid address: %s", StreamAddr, strerror_r(h_errno, tmp, sizeof(tmp)));
-        return false;
-        }
-
-     sockAddr.sin_addr.s_addr = inet_addr(*host->h_addr_list);
-     }
-
-  return retval;
+  return (cIptvSocket::OpenSocket(portP, false) && CheckAddress(streamAddrP, &sockAddrM.sin_addr.s_addr));
 }
 
 void cIptvTcpSocket::CloseSocket(void)
 {
-  debug("cIptvTcpSocket::CloseSocket()\n");
+  debug("cIptvTcpSocket::%s()", __FUNCTION__);
   cIptvSocket::CloseSocket();
 }
 
 bool cIptvTcpSocket::ConnectSocket(void)
 {
-  debug("cIptvTcpSocket::ConnectSocket()\n");
-  if (!isActive && (socketDesc >= 0)) {
-     int retval = connect(socketDesc, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
+  debug("cIptvTcpSocket::%s()", __FUNCTION__);
+  if (!isActiveM && (socketDescM >= 0)) {
+     int retval = connect(socketDescM, (struct sockaddr *)&sockAddrM, sizeof(sockAddrM));
      // Non-blocking sockets always report in-progress error when connected
      ERROR_IF_RET(retval < 0 && errno != EINPROGRESS, "connect()", return false);
      // Select with 800ms timeout on the socket completion, check if it is writable
-     retval = select_single_desc(socketDesc, 800000, true);
+     retval = select_single_desc(socketDescM, 800000, true);
      if (retval < 0)
         return retval;
      // Select has returned. Get socket errors if there are any
      retval = 0;
      socklen_t len = sizeof(retval);
-     getsockopt(socketDesc, SOL_SOCKET, SO_ERROR, &retval, &len);
+     getsockopt(socketDescM, SOL_SOCKET, SO_ERROR, &retval, &len);
      // If not any errors, then socket must be ready and connected
      if (retval != 0) {
         char tmp[64];
@@ -296,41 +354,41 @@ bool cIptvTcpSocket::ConnectSocket(void)
   return true;
 }
 
-int cIptvTcpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
+int cIptvTcpSocket::Read(unsigned char *bufferAddrP, unsigned int bufferLenP)
 {
-  //debug("cIptvTcpSocket::Read()\n");
+  //debug("cIptvTcpSocket::%s()", __FUNCTION__);
   // Error out if socket not initialized
-  if (socketDesc <= 0) {
-     error("Invalid socket in %s\n", __FUNCTION__);
+  if (socketDescM <= 0) {
+     error("Invalid socket in cIptvTcpSocket::%s()", __FUNCTION__);
      return -1;
      }
   int len = 0;
-  socklen_t addrlen = sizeof(sockAddr);
+  socklen_t addrlen = sizeof(sockAddrM);
   // Read data from socket
-  if (isActive && socketDesc && BufferAddr && (BufferLen > 0))
-     len = (int)recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
-                         (struct sockaddr *)&sockAddr, &addrlen);
+  if (isActiveM && socketDescM && bufferAddrP && (bufferLenP > 0))
+     len = (int)recvfrom(socketDescM, bufferAddrP, bufferLenP, MSG_DONTWAIT,
+                         (struct sockaddr *)&sockAddrM, &addrlen);
   return len;
 }
 
-bool cIptvTcpSocket::ReadChar(char* BufferAddr, unsigned int TimeoutMs)
+bool cIptvTcpSocket::ReadChar(char *bufferAddrP, unsigned int timeoutMsP)
 {
-  //debug("cIptvTcpSocket::ReadChar()\n");
+  //debug("cIptvTcpSocket::%s()", __FUNCTION__);
   // Error out if socket not initialized
-  if (socketDesc <= 0) {
-     error("Invalid socket in %s\n", __FUNCTION__);
+  if (socketDescM <= 0) {
+     error("Invalid socket in cIptvTcpSocket::%s()", __FUNCTION__);
      return false;
      }
-  socklen_t addrlen = sizeof(sockAddr);
+  socklen_t addrlen = sizeof(sockAddrM);
   // Wait 500ms for data
-  int retval = select_single_desc(socketDesc, 1000 * TimeoutMs, false);
+  int retval = select_single_desc(socketDescM, 1000 * timeoutMsP, false);
   // Check if error
   if (retval < 0)
      return false;
   // Check if data available
   else if (retval) {
-     retval = (int)recvfrom(socketDesc, BufferAddr, 1, MSG_DONTWAIT,
-                            (struct sockaddr *)&sockAddr, &addrlen);
+     retval = (int)recvfrom(socketDescM, bufferAddrP, 1, MSG_DONTWAIT,
+                            (struct sockaddr *)&sockAddrM, &addrlen);
      if (retval <= 0)
         return false;
      }
@@ -338,15 +396,15 @@ bool cIptvTcpSocket::ReadChar(char* BufferAddr, unsigned int TimeoutMs)
   return true;
 }
 
-bool cIptvTcpSocket::Write(const char* BufferAddr, unsigned int BufferLen)
+bool cIptvTcpSocket::Write(const char *bufferAddrP, unsigned int bufferLenP)
 {
-  //debug("cIptvTcpSocket::Write()\n");
+  //debug("cIptvTcpSocket::%s()", __FUNCTION__);
   // Error out if socket not initialized
-  if (socketDesc <= 0) {
-     error("Invalid socket in %s\n", __FUNCTION__);
+  if (socketDescM <= 0) {
+     error("Invalid socket in cIptvTcpSocket::%s()", __FUNCTION__);
      return false;
      }
-  ERROR_IF_RET(send(socketDesc, BufferAddr, BufferLen, 0) < 0, "send()", return false);
+  ERROR_IF_RET(send(socketDescM, bufferAddrP, bufferLenP, 0) < 0, "send()", return false);
 
   return true;
 }

socket.h

@@ -1,5 +1,5 @@
 /*
- * protocoludp.h: IPTV plugin for the Video Disk Recorder
+ * socket.h: IPTV plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
@@ -9,19 +9,23 @@
 #define __IPTV_SOCKET_H
 
 #include <arpa/inet.h>
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif // __FreeBSD__
 
 class cIptvSocket {
 private:
-  int socketPort;
+  int socketPortM;
 
 protected:
-  int socketDesc;
-  struct sockaddr_in sockAddr;
-  bool isActive;
+  int socketDescM;
+  struct sockaddr_in sockAddrM;
+  bool isActiveM;
 
 protected:
-  bool OpenSocket(const int Port, const bool isUdp);
+  bool OpenSocket(const int portP, const bool isUdpP);
   void CloseSocket(void);
+  bool CheckAddress(const char *addrP, in_addr_t *inAddrP);
 
 public:
   cIptvSocket();
@@ -30,13 +34,16 @@ public:
 
 class cIptvUdpSocket : public cIptvSocket {
 private:
-  in_addr_t streamAddr;
+  in_addr_t streamAddrM;
+  in_addr_t sourceAddrM;
+  bool useIGMPv3M;
 
 public:
   cIptvUdpSocket();
   virtual ~cIptvUdpSocket();
-  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen);
-  bool OpenSocket(const int Port, const in_addr_t StreamAddr = INADDR_ANY);
+  virtual int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
+  bool OpenSocket(const int Port);
+  bool OpenSocket(const int Port, const char *streamAddrP, const char *sourceAddrP, bool useIGMPv3P);
   void CloseSocket(void);
   bool JoinMulticast(void);
   bool DropMulticast(void);
@@ -46,12 +53,12 @@ class cIptvTcpSocket : public cIptvSocket {
 public:
   cIptvTcpSocket();
   virtual ~cIptvTcpSocket();
-  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen);
-  bool OpenSocket(const int Port, const char *StreamAddr);
+  virtual int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
+  bool OpenSocket(const int portP, const char *streamAddrP);
   void CloseSocket(void);
   bool ConnectSocket(void);
-  bool ReadChar(char* BufferAddr, unsigned int TimeoutMs);
-  bool Write(const char* BufferAddr, unsigned int BufferLen);
+  bool ReadChar(char* bufferAddrP, unsigned int timeoutMsP);
+  bool Write(const char* bufferAddrP, unsigned int bufferLenP);
 };
 
 #endif // __IPTV_SOCKET_H

source.c

@@ -5,33 +5,37 @@
  *
  */
 
+#include <ctype.h>
 #include "common.h"
 #include "source.h"
 
 // --- cIptvTransponderParameters --------------------------------------------
 
-cIptvTransponderParameters::cIptvTransponderParameters(const char *Parameters)
-: sidscan(0),
-  pidscan(0),
-  protocol(eProtocolUDP),
-  parameter(0)
+cIptvTransponderParameters::cIptvTransponderParameters(const char *parametersP)
+: sidScanM(0),
+  pidScanM(0),
+  protocolM(eProtocolUDP),
+  parameterM(0)
 {
-  debug("cIptvTransponderParameters::cIptvTransponderParameters(): Parameters=%s\n", Parameters);
+  debug("cIptvTransponderParameters::%s(%s)", __FUNCTION__, parametersP);
 
-  memset(&address, 0, sizeof(address));
-  Parse(Parameters);
+  memset(&addressM, 0, sizeof(addressM));
+  Parse(parametersP);
 }
 
-cString cIptvTransponderParameters::ToString(char Type) const
+cString cIptvTransponderParameters::ToString(char typeP) const
 {
-  debug("cIptvTransponderParameters::ToString() Type=%c\n", Type);
+  debug("cIptvTransponderParameters::%s(%c)", __FUNCTION__, typeP);
 
   const char *protocolstr;
 
-  switch (protocol) {
+  switch (protocolM) {
     case eProtocolEXT:
          protocolstr = "EXT";
          break;
+    case eProtocolCURL:
+         protocolstr = "CURL";
+         break;
     case eProtocolHTTP:
          protocolstr = "HTTP";
          break;
@@ -43,17 +47,18 @@ cString cIptvTransponderParameters::ToString(char Type) const
          protocolstr = "UDP";
          break;
   }
-  return cString::sprintf("S=%d|P=%d|F=%s|U=%s|A=%d", sidscan, pidscan, protocolstr, address, parameter);
+  return cString::sprintf("S=%d|P=%d|F=%s|U=%s|A=%d", sidScanM, pidScanM, protocolstr, addressM, parameterM);
 }
 
-bool cIptvTransponderParameters::Parse(const char *s)
+bool cIptvTransponderParameters::Parse(const char *strP)
 {
-  debug("cIptvTransponderParameters::Parse(): s=%s\n", s);
+  debug("cIptvTransponderParameters::%s(%s)", __FUNCTION__, strP);
   bool result = false;
 
-  if (s && *s) {
+  if (strP && *strP) {
      const char *delim = "|";
-     char *str = strdup(s);
+     char *str = strdup(strP);
+     char *p = str;
      char *saveptr = NULL;
      char *token = NULL;
      bool found_s = false;
@@ -67,39 +72,43 @@ bool cIptvTransponderParameters::Parse(const char *s)
        ++data;
        if (data && (*data == '=')) {
           ++data;
-          switch (*token) {
+          switch (toupper(*token)) {
             case 'S':
-                 sidscan = (int)strtol(data, (char **)NULL, 10);
+                 sidScanM = (int)strtol(data, (char **)NULL, 10);
                  found_s = true;
                  break;
             case 'P':
-                 pidscan = (int)strtol(data, (char **)NULL, 10);
+                 pidScanM = (int)strtol(data, (char **)NULL, 10);
                  found_p = true;
                  break;
             case 'F':
                  if (strstr(data, "UDP")) {
-                    protocol = eProtocolUDP;
+                    protocolM = eProtocolUDP;
+                    found_f = true;
+                    }
+                 else if (strstr(data, "CURL")) {
+                    protocolM = eProtocolCURL;
                     found_f = true;
                     }
                  else if (strstr(data, "HTTP")) {
-                    protocol = eProtocolHTTP;
+                    protocolM = eProtocolHTTP;
                     found_f = true;
                     }
                  else if (strstr(data, "FILE")) {
-                    protocol = eProtocolFILE;
+                    protocolM = eProtocolFILE;
                     found_f = true;
                     }
                  else if (strstr(data, "EXT")) {
-                    protocol = eProtocolEXT;
+                    protocolM = eProtocolEXT;
                     found_f = true;
                     }
                  break;
             case 'U':
-                 strn0cpy(address, data, sizeof(address));
+                 strn0cpy(addressM, data, sizeof(addressM));
                  found_u = true;
                  break;
             case 'A':
-                 parameter = (int)strtol(data, (char **)NULL, 10);
+                 parameterM = (int)strtol(data, (char **)NULL, 10);
                  found_a = true;
                  break;
             default:
@@ -112,9 +121,9 @@ bool cIptvTransponderParameters::Parse(const char *s)
      if (found_s && found_p && found_f && found_u && found_a)
         result = true;
      else
-        error("Invalid channel parameters: %s\n", str);
+        error("Invalid channel parameters: %s", p);
 
-     free(str);
+     free(p);
      }
 
   return (result);
@@ -122,54 +131,56 @@ bool cIptvTransponderParameters::Parse(const char *s)
 
 // --- cIptvSourceParam ------------------------------------------------------
 
-cIptvSourceParam::cIptvSourceParam(char Source, const char *Description)
-  : cSourceParam(Source, Description),
-    param(0),
-    nid(0),
-    tid(0),
-    rid(0),
-    data(),
-    itp()
-{
-  debug("cIptvSourceParam::cIptvSourceParam(): Source=%c Description=%s\n", Source, Description);
+const char *cIptvSourceParam::allowedProtocolCharsS = " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]()*+?{}/%@&=";
 
-  protocols[cIptvTransponderParameters::eProtocolUDP]  = tr("UDP");
-  protocols[cIptvTransponderParameters::eProtocolHTTP] = tr("HTTP");
-  protocols[cIptvTransponderParameters::eProtocolFILE] = tr("FILE");
-  protocols[cIptvTransponderParameters::eProtocolEXT]  = tr("EXT");
+cIptvSourceParam::cIptvSourceParam(char sourceP, const char *descriptionP)
+  : cSourceParam(sourceP, descriptionP),
+    paramM(0),
+    nidM(0),
+    tidM(0),
+    ridM(0),
+    dataM(),
+    itpM()
+{
+  debug("cIptvSourceParam::%s(%c, %s)", __FUNCTION__, sourceP, descriptionP);
+
+  protocolsM[cIptvTransponderParameters::eProtocolUDP]  = tr("UDP");
+  protocolsM[cIptvTransponderParameters::eProtocolCURL] = tr("CURL");
+  protocolsM[cIptvTransponderParameters::eProtocolHTTP] = tr("HTTP");
+  protocolsM[cIptvTransponderParameters::eProtocolFILE] = tr("FILE");
+  protocolsM[cIptvTransponderParameters::eProtocolEXT]  = tr("EXT");
 }
 
-void cIptvSourceParam::SetData(cChannel *Channel)
+void cIptvSourceParam::SetData(cChannel *channelP)
 {
-  debug("cIptvSourceParam::SetData(): Channel=%s)\n", Channel->Parameters());
-  data = *Channel;
-  nid = data.Nid();
-  tid = data.Tid();
-  rid = data.Rid();
-  itp.Parse(data.Parameters());
-  param = 0;
+  debug("cIptvSourceParam::%s(%s)", __FUNCTION__, channelP->Parameters());
+  dataM = *channelP;
+  nidM = dataM.Nid();
+  tidM = dataM.Tid();
+  ridM = dataM.Rid();
+  itpM.Parse(dataM.Parameters());
+  paramM = 0;
 }
 
-void cIptvSourceParam::GetData(cChannel *Channel)
+void cIptvSourceParam::GetData(cChannel *channelP)
 {
-  debug("cIptvSourceParam::GetData(): Channel=%s\n", Channel->Parameters());
-  data.SetTransponderData(Channel->Source(), Channel->Frequency(), data.Srate(), itp.ToString(Source()), true);
-  data.SetId(nid, tid, Channel->Sid(), rid);
-  *Channel = data;
+  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);
 }
 
 cOsdItem *cIptvSourceParam::GetOsdItem(void)
 {
-  debug("cIptvSourceParam::GetOsdItem()\n");
-  switch (param++) {
-    case  0: return new cMenuEditIntItem( tr("Nid"),              &nid, 0);
-    case  1: return new cMenuEditIntItem( tr("Tid"),              &tid, 0);
-    case  2: return new cMenuEditIntItem( tr("Rid"),              &rid, 0);
-    case  3: return new cMenuEditBoolItem(tr("Scan section ids"), &itp.sidscan);
-    case  4: return new cMenuEditBoolItem(tr("Scan pids"),        &itp.pidscan);
-    case  5: return new cMenuEditStraItem(tr("Protocol"),         &itp.protocol,  ELEMENTS(protocols), protocols);
-    case  6: return new cMenuEditStrItem( tr("Address"),           itp.address,   sizeof(itp.address));
-    case  7: return new cMenuEditIntItem( tr("Parameter"),        &itp.parameter, 0,                   0xFFFF);
+  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);
     default: return NULL;
     }
   return NULL;

source.h

@@ -17,50 +17,54 @@ class cIptvTransponderParameters
   friend class cIptvSourceParam;
 
 private:
-  int sidscan;
-  int pidscan;
-  int protocol;
-  char address[MaxFileName];
-  int parameter;
+  int sidScanM;
+  int pidScanM;
+  int protocolM;
+  char addressM[NAME_MAX + 1];
+  int parameterM;
 
 public:
   enum {
     eProtocolUDP,
+    eProtocolCURL,
     eProtocolHTTP,
     eProtocolFILE,
     eProtocolEXT,
     eProtocolCount
   };
-  cIptvTransponderParameters(const char *Parameters = NULL);
-  int SidScan(void) const { return sidscan; }
-  int PidScan(void) const { return pidscan; }
-  int Protocol(void) const { return protocol; }
-  const char *Address(void) const { return address; }
-  int Parameter(void) const { return parameter; }
-  void SetSidScan(int SidScan) { sidscan = SidScan; }
-  void SetPidScan(int PidScan) { pidscan = PidScan; }
-  void SetProtocol(int Protocol) { protocol = Protocol; }
-  void SetAddress(const char *Address) { strncpy(address, Address, sizeof(address)); }
-  void SetParameter(int Parameter) { parameter = Parameter; }
-  cString ToString(char Type) const;
-  bool Parse(const char *s);
+  cIptvTransponderParameters(const char *parametersP = NULL);
+  int SidScan(void) const { return sidScanM; }
+  int PidScan(void) const { return pidScanM; }
+  int Protocol(void) const { return protocolM; }
+  const char *Address(void) const { return addressM; }
+  int Parameter(void) const { return parameterM; }
+  void SetSidScan(int sidScanP) { sidScanM = sidScanP; }
+  void SetPidScan(int pidScanP) { pidScanM = pidScanP; }
+  void SetProtocol(int protocolP) { protocolM = protocolP; }
+  void SetAddress(const char *addressP) { strncpy(addressM, addressP, sizeof(addressM)); }
+  void SetParameter(int parameterP) { parameterM = parameterP; }
+  cString ToString(char typeP) const;
+  bool Parse(const char *strP);
 };
 
 class cIptvSourceParam : public cSourceParam
 {
 private:
-  int param;
-  int nid;
-  int tid;
-  int rid;
-  cChannel data;
-  cIptvTransponderParameters itp;
-  const char *protocols[cIptvTransponderParameters::eProtocolCount];
+  int paramM;
+  int nidM;
+  int tidM;
+  int ridM;
+  cChannel dataM;
+  cIptvTransponderParameters itpM;
+  const char *protocolsM[cIptvTransponderParameters::eProtocolCount];
+
+private:
+  static const char *allowedProtocolCharsS;
 
 public:
-  cIptvSourceParam(char Source, const char *Description);
-  virtual void SetData(cChannel *Channel);
-  virtual void GetData(cChannel *Channel);
+  cIptvSourceParam(char sourceP, const char *descriptionP);
+  virtual void SetData(cChannel *channelP);
+  virtual void GetData(cChannel *channelP);
   virtual cOsdItem *GetOsdItem(void);
 };
 

statistics.c

@@ -11,201 +11,209 @@
 #include "statistics.h"
 #include "config.h"
 
-// Section statistic class
+// Section statistics class
 cIptvSectionStatistics::cIptvSectionStatistics()
-: filteredData(0),
-  numberOfCalls(0),
-  timer(),
-  mutex()
+: filteredDataM(0),
+  numberOfCallsM(0),
+  timerM(),
+  mutexM()
 {
-  //debug("cIptvSectionStatistics::cIptvSectionStatistics()\n");
+  //debug("cIptvSectionStatistics::%s()", __FUNCTION__);
 }
 
 cIptvSectionStatistics::~cIptvSectionStatistics()
 {
-  //debug("cIptvSectionStatistics::~cIptvSectionStatistics()\n");
+  //debug("cIptvSectionStatistics::%s()", __FUNCTION__);
 }
 
 cString cIptvSectionStatistics::GetSectionStatistic()
 {
-  //debug("cIptvSectionStatistics::GetStatistic()\n");
-  cMutexLock MutexLock(&mutex);
-  uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
-  timer.Set();
-  long bitrate = elapsed ? (long)(1000.0L * filteredData / KILOBYTE(1) / elapsed) : 0L;
+  //debug("cIptvSectionStatistics::%s()", __FUNCTION__);
+  cMutexLock MutexLock(&mutexM);
+  uint64_t elapsed = timerM.Elapsed(); /* in milliseconds */
+  timerM.Set();
+  long bitrate = elapsed ? (long)(1000.0L * filteredDataM / KILOBYTE(1) / elapsed) : 0L;
   if (!IptvConfig.GetUseBytes())
      bitrate *= 8;
   // no trailing linefeed here!
-  cString info = cString::sprintf("%4ld (%4ld k%s/s)", numberOfCalls, bitrate,
-                                  IptvConfig.GetUseBytes() ? "B" : "bit");
-  filteredData = numberOfCalls = 0;
-  return info;
+  cString s = cString::sprintf("%4ld (%4ld k%s/s)", numberOfCallsM, bitrate,
+                               IptvConfig.GetUseBytes() ? "B" : "bit");
+  filteredDataM = numberOfCallsM = 0;
+  return s;
 }
 
-void cIptvSectionStatistics::AddSectionStatistic(long Bytes, long Calls)
+void cIptvSectionStatistics::AddSectionStatistic(long bytesP, long callsP)
 {
-  //debug("cIptvSectionStatistics::AddStatistic(Bytes=%ld, Calls=%ld)\n", Bytes, Calls); 
-  cMutexLock MutexLock(&mutex);
-  filteredData += Bytes;
-  numberOfCalls += Calls;
+  //debug("cIptvSectionStatistics::%s(%ld, %ld)", __FUNCTION__, bytesP, callsP);
+  cMutexLock MutexLock(&mutexM);
+  filteredDataM += bytesP;
+  numberOfCallsM += callsP;
 }
 
 // --- cIptvPidStatistics ----------------------------------------------------
 
-// Device statistic class
+// Device statistics class
 cIptvPidStatistics::cIptvPidStatistics()
-: timer(),
-  mutex()
+: timerM(),
+  mutexM()
 {
-  debug("cIptvPidStatistics::cIptvPidStatistics()\n");
-  memset(mostActivePids, '\0', sizeof(mostActivePids));
+  debug("cIptvPidStatistics::%s()", __FUNCTION__);
+  const int numberOfElements = sizeof(mostActivePidsM) / sizeof(pidStruct);
+  for (int i = 0; i < numberOfElements; ++i) {
+      mostActivePidsM[i].pid = -1;
+      mostActivePidsM[i].dataAmount = 0L;
+      }
 }
 
 cIptvPidStatistics::~cIptvPidStatistics()
 {
-  debug("cIptvPidStatistics::~cIptvPidStatistics()\n");
+  debug("cIptvPidStatistics::%s()", __FUNCTION__);
 }
 
 cString cIptvPidStatistics::GetPidStatistic()
 {
-  //debug("cIptvPidStatistics::GetStatistic()\n");
-  cMutexLock MutexLock(&mutex);
-  uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
-  timer.Set();
-  cString info("Active pids:\n");
-  for (unsigned int i = 0; i < IPTV_STATS_ACTIVE_PIDS_COUNT; ++i) {
-      if (mostActivePids[i].pid) {
-         long bitrate = elapsed ? (long)(1000.0L * mostActivePids[i].DataAmount / KILOBYTE(1) / elapsed) : 0L;
+  //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 (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;
-         info = cString::sprintf("%sPid %d: %4d (%4ld k%s/s)\n", *info, i,
-                                 mostActivePids[i].pid, bitrate,
-                                 IptvConfig.GetUseBytes() ? "B" : "bit");
+         s = cString::sprintf("%sPid %d: %4d (%4ld k%s/s)\n", *s, i,
+                              mostActivePidsM[i].pid, bitrate,
+                              IptvConfig.GetUseBytes() ? "B" : "bit");
          }
       }
-  memset(mostActivePids, '\0', sizeof(mostActivePids));
-  return info;
+  for (int i = 0; i < numberOfElements; ++i) {
+      mostActivePidsM[i].pid = -1;
+      mostActivePidsM[i].dataAmount = 0L;
+      }
+  return s;
 }
 
-int cIptvPidStatistics::SortPids(const void* data1, const void* data2)
+int cIptvPidStatistics::SortPids(const void* data1P, const void* data2P)
 {
-  //debug("cIptvPidStatistics::SortPids()\n");
-  pidStruct *comp1 = (pidStruct*)data1;
-  pidStruct *comp2 = (pidStruct*)data2;
-  if (comp1->DataAmount > comp2->DataAmount)
+  //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)
      return -1;
-  if (comp1->DataAmount < comp2->DataAmount)
+  if (comp1->dataAmount < comp2->dataAmount)
      return 1;
   return 0;
 }
 
-void cIptvPidStatistics::AddPidStatistic(u_short Pid, long Payload)
+void cIptvPidStatistics::AddPidStatistic(int pidP, long payloadP)
 {
-  //debug("cIptvPidStatistics::AddStatistic(pid=%ld, payload=%ld)\n", Pid, Payload);
-  cMutexLock MutexLock(&mutex);
-  const int numberOfElements = sizeof(mostActivePids) / sizeof(pidStruct);
+  //debug("cIptvPidStatistics::%s(%ld, %ld)", __FUNCTION__, pidP, payloadP);
+  cMutexLock MutexLock(&mutexM);
+  const int numberOfElements = sizeof(mostActivePidsM) / sizeof(pidStruct);
   // If our statistic already is in the array, update it and quit
   for (int i = 0; i < numberOfElements; ++i) {
-      if (mostActivePids[i].pid == Pid) {
-         mostActivePids[i].DataAmount += Payload;
+      if (mostActivePidsM[i].pid == pidP) {
+         mostActivePidsM[i].dataAmount += payloadP;
          // Now re-sort the array and quit
-         qsort(mostActivePids, numberOfElements, sizeof(pidStruct), SortPids);
+         qsort(mostActivePidsM, numberOfElements, sizeof(pidStruct), SortPids);
          return;
          }
       }
   // Apparently our pid isn't in the array. Replace the last element with this
   // one if new payload is greater
-  if (mostActivePids[numberOfElements - 1].DataAmount < Payload) {
-      mostActivePids[numberOfElements - 1].pid = Pid;
-      mostActivePids[numberOfElements - 1].DataAmount = Payload;
+  if (mostActivePidsM[numberOfElements - 1].dataAmount < payloadP) {
+      mostActivePidsM[numberOfElements - 1].pid = pidP;
+      mostActivePidsM[numberOfElements - 1].dataAmount = payloadP;
      // Re-sort
-     qsort(mostActivePids, numberOfElements, sizeof(pidStruct), SortPids);
+     qsort(mostActivePidsM, numberOfElements, sizeof(pidStruct), SortPids);
      }
 }
 
 // --- cIptvStreamerStatistics -----------------------------------------------
 
-// Streamer statistic class
+// Streamer statistics class
 cIptvStreamerStatistics::cIptvStreamerStatistics()
-: dataBytes(0),
-  timer(),
-  mutex()
+: dataBytesM(0),
+  timerM(),
+  mutexM()
 {
-  debug("cIptvStreamerStatistics::cIptvStreamerStatistics()\n");
+  debug("cIptvStreamerStatistics::%s()", __FUNCTION__);
 }
 
 cIptvStreamerStatistics::~cIptvStreamerStatistics()
 {
-  debug("cIptvStreamerStatistics::~cIptvStreamerStatistics()\n");
+  debug("cIptvStreamerStatistics::%s()", __FUNCTION__);
 }
 
 cString cIptvStreamerStatistics::GetStreamerStatistic()
 {
-  //debug("cIptvStreamerStatistics::GetStatistic()\n");
-  cMutexLock MutexLock(&mutex);
-  uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
-  timer.Set();
-  long bitrate = elapsed ? (long)(1000.0L * dataBytes / KILOBYTE(1) / elapsed) : 0L;
+  //debug("cIptvStreamerStatistics::%s()", __FUNCTION__);
+  cMutexLock MutexLock(&mutexM);
+  uint64_t elapsed = timerM.Elapsed(); /* in milliseconds */
+  timerM.Set();
+  long bitrate = elapsed ? (long)(1000.0L * dataBytesM / KILOBYTE(1) / elapsed) : 0L;
   if (!IptvConfig.GetUseBytes())
      bitrate *= 8;
-  cString info = cString::sprintf("%ld k%s/s", bitrate, IptvConfig.GetUseBytes() ? "B" : "bit");
-  dataBytes = 0;
-  return info;
+  cString s = cString::sprintf("%ld k%s/s", bitrate, IptvConfig.GetUseBytes() ? "B" : "bit");
+  dataBytesM = 0;
+  return s;
 }
 
-void cIptvStreamerStatistics::AddStreamerStatistic(long Bytes)
+void cIptvStreamerStatistics::AddStreamerStatistic(long bytesP)
 {
-  //debug("cIptvStreamerStatistics::AddStatistic(Bytes=%ld)\n", Bytes);
-  cMutexLock MutexLock(&mutex);
-  dataBytes += Bytes;
+  //debug("cIptvStreamerStatistics::%s(%ld)", __FUNCTION__, bytesP);
+  cMutexLock MutexLock(&mutexM);
+  dataBytesM += bytesP;
 }
 
 
-// Buffer statistic class
+// Buffer statistics class
 cIptvBufferStatistics::cIptvBufferStatistics()
-: dataBytes(0),
-  freeSpace(0),
-  usedSpace(0),
-  timer(),
-  mutex()
+: dataBytesM(0),
+  freeSpaceM(0),
+  usedSpaceM(0),
+  timerM(),
+  mutexM()
 {
-  debug("cIptvBufferStatistics::cIptvBufferStatistics()\n");
+  debug("cIptvBufferStatistics::%s()", __FUNCTION__);
 }
 
 cIptvBufferStatistics::~cIptvBufferStatistics()
 {
-  debug("cIptvBufferStatistics::~cIptvBufferStatistics()\n");
+  debug("cIptvBufferStatistics::%s()", __FUNCTION__);
 }
 
 cString cIptvBufferStatistics::GetBufferStatistic()
 {
-  //debug("cIptvBufferStatistics::GetStatistic()\n");
-  cMutexLock MutexLock(&mutex);
-  uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
-  timer.Set();
-  long bitrate = elapsed ? (long)(1000.0L * dataBytes / KILOBYTE(1) / elapsed) : 0L;
+  //debug("cIptvBufferStatistics::%s()", __FUNCTION__);
+  cMutexLock MutexLock(&mutexM);
+  uint64_t elapsed = timerM.Elapsed(); /* in milliseconds */
+  timerM.Set();
+  long bitrate = elapsed ? (long)(1000.0L * dataBytesM / KILOBYTE(1) / elapsed) : 0L;
   long totalSpace = MEGABYTE(IptvConfig.GetTsBufferSize());
-  float percentage = (float)((float)usedSpace / (float)totalSpace * 100.0);
+  float percentage = (float)((float)usedSpaceM / (float)totalSpace * 100.0);
   long totalKilos = totalSpace / KILOBYTE(1);
-  long usedKilos = usedSpace / KILOBYTE(1);
+  long usedKilos = usedSpaceM / KILOBYTE(1);
   if (!IptvConfig.GetUseBytes()) {
      bitrate *= 8;
      totalKilos *= 8;
      usedKilos *= 8;
      }
-  cString info = cString::sprintf("Buffer bitrate: %ld k%s/s\nBuffer usage: %ld/%ld k%s (%2.1f%%)\n", bitrate,
-                                  IptvConfig.GetUseBytes() ? "B" : "bit", usedKilos, totalKilos,
-                                  IptvConfig.GetUseBytes() ? "B" : "bit", percentage);
-  dataBytes = 0;
-  usedSpace = 0;
-  return info;
+  cString s = cString::sprintf("Buffer bitrate: %ld k%s/s\nBuffer usage: %ld/%ld k%s (%2.1f%%)\n", bitrate,
+                               IptvConfig.GetUseBytes() ? "B" : "bit", usedKilos, totalKilos,
+                               IptvConfig.GetUseBytes() ? "B" : "bit", percentage);
+  dataBytesM = 0;
+  usedSpaceM = 0;
+  return s;
 }
 
-void cIptvBufferStatistics::AddBufferStatistic(long Bytes, long Used)
+void cIptvBufferStatistics::AddBufferStatistic(long bytesP, long usedP)
 {
-  //debug("cIptvBufferStatistics::AddStatistic(Bytes=%ld, Used=%ld)\n", Bytes, Used);
-  cMutexLock MutexLock(&mutex);
-  dataBytes += Bytes;
-  if (Used > usedSpace)
-     usedSpace = Used;
+  //debug("cIptvBufferStatistics::%s(%ld, %ld)", __FUNCTION__, bytesP, usedP);
+  cMutexLock MutexLock(&mutexM);
+  dataBytesM += bytesP;
+  if (usedP > usedSpaceM)
+     usedSpaceM = usedP;
 }

statistics.h

@@ -18,13 +18,13 @@ public:
   cString GetSectionStatistic();
 
 protected:
-  void AddSectionStatistic(long Bytes, long Calls);
+  void AddSectionStatistic(long bytesP, long callsP);
 
 private:
-  long filteredData;
-  long numberOfCalls;
-  cTimeMs timer;
-  cMutex mutex;
+  long filteredDataM;
+  long numberOfCallsM;
+  cTimeMs timerM;
+  cMutex mutexM;
 };
 
 // Pid statistics
@@ -35,19 +35,19 @@ public:
   cString GetPidStatistic();
 
 protected:
-  void AddPidStatistic(u_short Pid, long Payload);
+  void AddPidStatistic(int pidP, long payloadP);
 
 private:
   struct pidStruct {
-    u_short pid;
-    long DataAmount;
+    int  pid;
+    long dataAmount;
   };
-  pidStruct mostActivePids[IPTV_STATS_ACTIVE_PIDS_COUNT];
-  cTimeMs timer;
-  cMutex mutex;
+  pidStruct mostActivePidsM[IPTV_STATS_ACTIVE_PIDS_COUNT];
+  cTimeMs timerM;
+  cMutex mutexM;
 
 private:
-  static int SortPids(const void* data1, const void* data2);
+  static int SortPids(const void* data1P, const void* data2P);
 };
 
 // Streamer statistics
@@ -58,12 +58,12 @@ public:
   cString GetStreamerStatistic();
 
 protected:
-  void AddStreamerStatistic(long Bytes);
+  void AddStreamerStatistic(long bytesP);
 
 private:
-  long dataBytes;
-  cTimeMs timer;
-  cMutex mutex;
+  long dataBytesM;
+  cTimeMs timerM;
+  cMutex mutexM;
 };
 
 // Buffer statistics
@@ -74,14 +74,14 @@ public:
   cString GetBufferStatistic();
 
 protected:
-  void AddBufferStatistic(long Bytes, long Used);
+  void AddBufferStatistic(long bytesP, long usedP);
 
 private:
-  long dataBytes;
-  long freeSpace;
-  long usedSpace;
-  cTimeMs timer;
-  cMutex mutex;
+  long dataBytesM;
+  long freeSpaceM;
+  long usedSpaceM;
+  cTimeMs timerM;
+  cMutex mutexM;
 };
 
 #endif // __IPTV_STATISTICS_H

streamer.c

@@ -5,67 +5,61 @@
  *
  */
 
-#include <vdr/thread.h>
-#include <vdr/ringbuffer.h>
-
 #include "common.h"
 #include "streamer.h"
 
-cIptvStreamer::cIptvStreamer(cRingBufferLinear* RingBuffer, unsigned int PacketLen)
+cIptvStreamer::cIptvStreamer(cIptvDeviceIf &deviceP, unsigned int packetLenP)
 : cThread("IPTV streamer"),
-  ringBuffer(RingBuffer),
-  packetBufferLen(PacketLen),
-  protocol(NULL)
+  sleepM(),
+  deviceM(&deviceP),
+  packetBufferLenM(packetLenP),
+  protocolM(NULL)
 {
-  debug("cIptvStreamer::cIptvStreamer(%d)\n", packetBufferLen);
+  debug("cIptvStreamer::%s(%d)", __FUNCTION__, packetBufferLenM);
   // Allocate packet buffer
-  packetBuffer = MALLOC(unsigned char, packetBufferLen);
-  if (packetBuffer)
-     memset(packetBuffer, 0, packetBufferLen);
+  packetBufferM = MALLOC(unsigned char, packetBufferLenM);
+  if (packetBufferM)
+     memset(packetBufferM, 0, packetBufferLenM);
   else
      error("MALLOC() failed for packet buffer");
 }
 
 cIptvStreamer::~cIptvStreamer()
 {
-  debug("cIptvStreamer::~cIptvStreamer()\n");
+  debug("cIptvStreamer::%s()", __FUNCTION__);
   // Close the protocol
   Close();
-  protocol = NULL;
-  ringBuffer = NULL;
+  protocolM = NULL;
   // Free allocated memory
-  free(packetBuffer);
+  free(packetBufferM);
 }
 
 void cIptvStreamer::Action(void)
 {
-  debug("cIptvStreamer::Action(): Entering\n");
+  debug("cIptvStreamer::%s(): entering", __FUNCTION__);
   // Increase priority
   //SetPriority(-1);
   // Do the thread loop
-  while (packetBuffer && Running()) {
+  while (packetBufferM && Running()) {
         int length = -1;
-        if (protocol)
-           length = protocol->Read(packetBuffer, packetBufferLen);
+        unsigned int size = min(deviceM->CheckData(), packetBufferLenM);
+        if (protocolM && (size > 0))
+           length = protocolM->Read(packetBufferM, size);
         if (length > 0) {
            AddStreamerStatistic(length);
-           if (ringBuffer) {
-              int p = ringBuffer->Put(packetBuffer, length);
-              if (p != length)
-                 ringBuffer->ReportOverflow(length - p);
-              }
+           deviceM->WriteData(packetBufferM, length);
            }
         else
-           sleep.Wait(10); // to avoid busy loop and reduce cpu load
+           sleepM.Wait(10); // to avoid busy loop and reduce cpu load
         }
-  debug("cIptvStreamer::Action(): Exiting\n");
+  debug("cIptvStreamer::%s(): exiting", __FUNCTION__);
 }
 
 bool cIptvStreamer::Open(void)
 {
-  debug("cIptvStreamer::Open()\n");
+  debug("cIptvStreamer::%s()", __FUNCTION__);
   // Open the protocol
-  if (protocol && !protocol->Open())
+  if (protocolM && !protocolM->Open())
      return false;
   // Start thread
   Start();
@@ -74,42 +68,50 @@ bool cIptvStreamer::Open(void)
 
 bool cIptvStreamer::Close(void)
 {
-  debug("cIptvStreamer::Close()\n");
+  debug("cIptvStreamer::%s()", __FUNCTION__);
   // Stop thread
-  sleep.Signal();
+  sleepM.Signal();
   if (Running())
      Cancel(3);
   // Close the protocol
-  if (protocol)
-     protocol->Close();
+  if (protocolM)
+     protocolM->Close();
   return true;
 }
 
-bool cIptvStreamer::Set(const char* Location, const int Parameter, const int Index, cIptvProtocolIf* Protocol)
+bool cIptvStreamer::SetSource(const char* locationP, const int parameterP, const int indexP, cIptvProtocolIf* protocolP)
 {
-  debug("cIptvStreamer::Set(): %s:%d\n", Location, Parameter);
-  if (!isempty(Location)) {
+  debug("cIptvStreamer::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
+  if (!isempty(locationP)) {
      // Update protocol and set location and parameter; Close the existing one if changed
-     if (protocol != Protocol) {
-        if (protocol)
-           protocol->Close();
-        protocol = Protocol;
-        if (protocol) {
-           protocol->Set(Location, Parameter, Index);
-           protocol->Open();
+     if (protocolM != protocolP) {
+        if (protocolM)
+           protocolM->Close();
+        protocolM = protocolP;
+        if (protocolM) {
+           protocolM->SetSource(locationP, parameterP, indexP);
+           protocolM->Open();
            }
         }
-     else if (protocol)
-        protocol->Set(Location, Parameter, Index);
+     else if (protocolM)
+        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::GetInformation()");
-  cString info;
-  if (protocol)
-     info = protocol->GetInformation();
-  return info;
+  //debug("cIptvStreamer::%s()", __FUNCTION__);
+  cString s;
+  if (protocolM)
+     s = protocolM->GetInformation();
+  return s;
 }

streamer.h

@@ -11,26 +11,27 @@
 #include <arpa/inet.h>
 
 #include <vdr/thread.h>
-#include <vdr/ringbuffer.h>
 
+#include "deviceif.h"
 #include "protocolif.h"
 #include "statistics.h"
 
 class cIptvStreamer : public cThread, public cIptvStreamerStatistics {
 private:
-  cRingBufferLinear* ringBuffer;
-  cCondWait sleep;
-  unsigned char* packetBuffer;
-  unsigned int packetBufferLen;
-  cIptvProtocolIf* protocol;
+  cCondWait sleepM;
+  cIptvDeviceIf* deviceM;
+  unsigned char* packetBufferM;
+  unsigned int packetBufferLenM;
+  cIptvProtocolIf* protocolM;
 
 protected:
   virtual void Action(void);
 
 public:
-  cIptvStreamer(cRingBufferLinear* RingBuffer, unsigned int PacketLen);
+  cIptvStreamer(cIptvDeviceIf &deviceP, unsigned int packetLenP);
   virtual ~cIptvStreamer();
-  bool Set(const char* Location, const int Parameter, const int Index, cIptvProtocolIf* Protocol);
+  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);