Added a character validation into the channel editor.

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

HISTORY

@@ -181,3 +181,15 @@ VDR Plugin 'iptv' Revision History
 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.

Makefile

@@ -2,24 +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
 
-# Install command
+STRIP = strip
-INSTALL = cp --remove-destination
 
 # 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):
@@ -27,40 +25,47 @@ 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 ?= ../../..
+# Use package data if installed...otherwise assume we're under the VDR source directory:
-LIBDIR ?= ../../lib
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(call PKGCFG,libdir)
+LOCDIR = $(call PKGCFG,locdir)
+PLGCFG = $(call PKGCFG,plgcfg)
+#
 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
+-include $(PLGCFG)
-
-### 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)
 
 ### 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
@@ -79,61 +84,67 @@ all-redirect: all
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o config.o setup.o device.o streamer.o protocoludp.o \
+OBJS = $(PLUGIN).o common.o config.o device.o pidscanner.o \
-	protocolhttp.o protocolfile.o protocolext.o sectionfilter.o \
+	protocolcurl.o protocolext.o protocolfile.o protocolhttp.o \
-	sidscanner.o pidscanner.o statistics.o common.o socket.o source.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
+%.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(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
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
+	install -D -m644 $< $@
-	cp $< $@
 
 .PHONY: i18n
-i18n: $(I18Nmsgs) $(I18Npot)
+i18n: $(I18Nmo) $(I18Npot)
+
+install-i18n: $(I18Nmsgs)
 
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
+$(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
 ifndef IPTV_DEBUG
 	@$(STRIP) $@
 endif
-	@$(INSTALL) $@ $(LIBDIR)/$@.$(APIVERSION)
+
+install-lib: $(SOFILE)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib install-i18n
 
 dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
@@ -144,7 +155,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)
+.PHONY: cppcheck
-	@cppcheck --enable=information,style,unusedFunction -v -f $(OBJS:%.o=%.c)
+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:
 
@@ -44,7 +45,7 @@ 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/
+cp -R PLUGINS/src/iptv/iptv /path/to/vdrresource/plugins/
 make
 make plugins
 ./vdr -P iptv
@@ -91,15 +92,24 @@ Configuration:
   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
+  TV1;IPTV:10: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:1:0:0:0
+  TV1;IPTV:10:S=1|P=0|F=UDP|U=127.0.0.1@127.0.0.1|A=1234:I:0:512:650:2321:0:1: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")
+           |  |   |   |     |           |      Source type ("I")
-           |  |   |   |     |           Stream parameter (multicast port
+           |  |   |   |     |           Stream parameter
-           |  |   |   |     |           number, HTTP port number, file delay
+           |  |   |   |     |            UDP:  multicast port
-           |  |   |   |     |           (ms), script parameter)
+           |  |   |   |     |            CURL: <<to be defined>>
-           |  |   |   |     Stream address (multicast address, URL, file
+           |  |   |   |     |            HTTP: HTTP port number
-           |  |   |   |     location, script location)
+           |  |   |   |     |            FILE: file delay (ms)
-           |  |   |   Stream protocol ("UDP", "HTTP", "FILE", "EXT")
+           |  |   |   |     |            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,9 +129,9 @@ 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
+  from plugin resource directory when VDR tunes to the channel. The specified
-  specified script parameter is passed to the script and it can be used to
+  script parameter is passed to the script and it can be used to select for
-  select for example between different URLs.
+  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
@@ -167,6 +177,16 @@ Notes:
 - 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 HTTP/HTTPS protocols and an optional
+  netrc configuration file for authentication:
+  $(CONFDIR)/iptv/netrc
+
+- CURL implementation
 Acknowledgements:
 
 - The IPTV section filtering code is derived from Linux kernel.

common.c

@@ -44,14 +44,18 @@ int select_single_desc(int descriptor, const int usecs, const bool selectWrite)
   tv.tv_sec = 0;
   tv.tv_usec = usecs;
   // Use select
-  fd_set fds;
+  fd_set infd;
-  FD_ZERO(&fds);
+  fd_set outfd;
-  FD_SET(descriptor, &fds);
+  fd_set errfd;
-  int retval = 0;
+  FD_ZERO(&infd);
+  FD_ZERO(&outfd);
+  FD_ZERO(&errfd);
+  FD_SET(descriptor, &errfd);
   if (selectWrite)
-     retval = select(descriptor + 1, NULL, &fds, NULL, &tv);
+     FD_SET(descriptor, &outfd);
   else
-     retval = select(descriptor + 1, &fds, NULL, NULL, &tv);
+     FD_SET(descriptor, &infd);
+  int retval = select(descriptor + 1, &infd, &outfd, &errfd, &tv);
   // Check if error
   ERROR_IF_RET(retval < 0, "select()", return retval);
   return retval;

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,15 +40,14 @@
 
 #define SECTION_FILTER_TABLE_SIZE       7
 
-#define ERROR_IF_FUNC(exp, errstr, func, ret) \
+#define ERROR_IF_FUNC(exp, errstr, func, ret)                     \
-  do {                                        \
+  do {                                                            \
-     if (exp) {                               \
+     if (exp) {                                                   \
-        char tmp[64];                         \
+        char tmp[64];                                             \
-        strerror_r(errno, tmp, sizeof(tmp));  \
+        error(errstr": %s", strerror_r(errno, tmp, sizeof(tmp))); \
-        error(errstr": %s", tmp);             \
+        func;                                                     \
-        func;                                 \
+        ret;                                                      \
-        ret;                                  \
+        }                                                         \
-        }                                     \
   } while (0)
 
 

config.c

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

config.h

@@ -14,30 +14,30 @@
 class cIptvConfig
 {
 private:
-  unsigned int tsBufferSize;
+  unsigned int tsBufferSizeM;
-  unsigned int tsBufferPrefillRatio;
+  unsigned int tsBufferPrefillRatioM;
-  unsigned int extProtocolBasePort;
+  unsigned int extProtocolBasePortM;
-  unsigned int useBytes;
+  unsigned int useBytesM;
-  unsigned int sectionFiltering;
+  unsigned int sectionFilteringM;
-  int disabledFilters[SECTION_FILTER_TABLE_SIZE];
+  int disabledFiltersM[SECTION_FILTER_TABLE_SIZE];
-  char configDirectory[PATH_MAX];
+  char configDirectoryM[PATH_MAX];
 
 public:
   cIptvConfig();
-  unsigned int GetTsBufferSize(void) const { return tsBufferSize; }
+  unsigned int GetTsBufferSize(void) const { return tsBufferSizeM; }
-  unsigned int GetTsBufferPrefillRatio(void) const { return tsBufferPrefillRatio; }
+  unsigned int GetTsBufferPrefillRatio(void) const { return tsBufferPrefillRatioM; }
-  unsigned int GetExtProtocolBasePort(void) const { return extProtocolBasePort; }
+  unsigned int GetExtProtocolBasePort(void) const { return extProtocolBasePortM; }
-  unsigned int GetUseBytes(void) const { return useBytes; }
+  unsigned int GetUseBytes(void) const { return useBytesM; }
-  unsigned int GetSectionFiltering(void) const { return sectionFiltering; }
+  unsigned int GetSectionFiltering(void) const { return sectionFilteringM; }
-  const char *GetConfigDirectory(void) const { return configDirectory; }
+  const char *GetConfigDirectory(void) const { return configDirectoryM; }
   unsigned int GetDisabledFiltersCount(void) const;
-  int GetDisabledFilters(unsigned int Index) const;
+  int GetDisabledFilters(unsigned int indexP) const;
-  void SetTsBufferSize(unsigned int Size) { tsBufferSize = Size; }
+  void SetTsBufferSize(unsigned int sizeP) { tsBufferSizeM = sizeP; }
-  void SetTsBufferPrefillRatio(unsigned int Ratio) { tsBufferPrefillRatio = Ratio; }
+  void SetTsBufferPrefillRatio(unsigned int ratioP) { tsBufferPrefillRatioM = ratioP; }
-  void SetExtProtocolBasePort(unsigned int PortNumber) { extProtocolBasePort = PortNumber; }
+  void SetExtProtocolBasePort(unsigned int portNumberP) { extProtocolBasePortM = portNumberP; }
-  void SetUseBytes(unsigned int On) { useBytes = On; }
+  void SetUseBytes(unsigned int onOffP) { useBytesM = onOffP; }
-  void SetSectionFiltering(unsigned int On) { sectionFiltering = On; }
+  void SetSectionFiltering(unsigned int onOffP) { sectionFilteringM = onOffP; }
-  void SetDisabledFilters(unsigned int Index, int Number);
+  void SetDisabledFilters(unsigned int indexP, int numberP);
   void SetConfigDirectory(const char *directoryP);
 };
 

device.c

@@ -11,110 +11,110 @@
 
 #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 indexP)
-
+: deviceIndexM(indexP),
-cIptvDevice::cIptvDevice(unsigned int Index)
+  dvrFdM(-1),
-: deviceIndex(Index),
+  isPacketDeliveredM(false),
-  dvrFd(-1),
+  isOpenDvrM(false),
-  isPacketDelivered(false),
+  sidScanEnabledM(false),
-  isOpenDvr(false),
+  pidScanEnabledM(false),
-  sidScanEnabled(false),
+  channelIdM(tChannelID::InvalidID)
-  pidScanEnabled(false),
-  channelId(tChannelID::InvalidID)
 {
   unsigned int bufsize = (unsigned int)MEGABYTE(IptvConfig.GetTsBufferSize());
   bufsize -= (bufsize % TS_SIZE);
-  isyslog("creating IPTV device %d (CardIndex=%d)", deviceIndex, CardIndex());
+  isyslog("creating IPTV device %d (CardIndex=%d)", deviceIndexM, CardIndex());
-  tsBuffer = new cRingBufferLinear(bufsize + 1, TS_SIZE, false,
+  tsBufferM = new cRingBufferLinear(bufsize + 1, TS_SIZE, false,
-                                   *cString::sprintf("IPTV %d", deviceIndex));
+                                   *cString::sprintf("IPTV %d", deviceIndexM));
-  tsBuffer->SetTimeouts(10, 10);
+  tsBufferM->SetTimeouts(10, 10);
   ResetBuffering();
-  pUdpProtocol = new cIptvProtocolUdp();
+  pUdpProtocolM = new cIptvProtocolUdp();
-  pHttpProtocol = new cIptvProtocolHttp();
+  pCurlProtocolM = new cIptvProtocolCurl();
-  pFileProtocol = new cIptvProtocolFile();
+  pHttpProtocolM = new cIptvProtocolHttp();
-  pExtProtocol = new cIptvProtocolExt();
+  pFileProtocolM = new cIptvProtocolFile();
-  pIptvStreamer = new cIptvStreamer(tsBuffer, (100 * TS_SIZE));
+  pExtProtocolM = new cIptvProtocolExt();
-  pPidScanner = new cPidScanner();
+  pIptvStreamerM = new cIptvStreamer(tsBufferM, (100 * TS_SIZE));
+  pPidScannerM = new cPidScanner();
   // Initialize filter pointers
-  memset(secfilters, '\0', sizeof(secfilters));
+  memset(secFiltersM, 0, sizeof(secFiltersM));
   // Start section handler for iptv device
   StartSectionHandler();
   // Sid scanner must be created after the section handler
-  pSidScanner = new cSidScanner();
+  pSidScannerM = new cSidScanner();
-  if (pSidScanner)
+  if (pSidScannerM)
-     AttachFilter(pSidScanner);
+     AttachFilter(pSidScannerM);
   // 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);
+     dvrFdM = open(filename, O_RDWR | O_NONBLOCK);
-     if (dvrFd >= 0)
+     if (dvrFdM >= 0)
-        dsyslog("IPTV device %d redirecting input stream to '%s'", deviceIndex, *filename);
+        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(pIptvStreamerM);
-  DELETE_POINTER(pUdpProtocol);
+  DELETE_POINTER(pUdpProtocolM);
-  DELETE_POINTER(pHttpProtocol);
+  DELETE_POINTER(pCurlProtocolM);
-  DELETE_POINTER(pFileProtocol);
+  DELETE_POINTER(pHttpProtocolM);
-  DELETE_POINTER(pExtProtocol);
+  DELETE_POINTER(pFileProtocolM);
-  DELETE_POINTER(tsBuffer);
+  DELETE_POINTER(pExtProtocolM);
-  DELETE_POINTER(pPidScanner);
+  DELETE_POINTER(tsBufferM);
+  DELETE_POINTER(pPidScannerM);
   // Detach and destroy sid filter
-  if (pSidScanner) {
+  if (pSidScannerM) {
-     Detach(pSidScanner);
+     Detach(pSidScannerM);
-     DELETE_POINTER(pSidScanner);
+     DELETE_POINTER(pSidScannerM);
      }
   // Destroy all filters
   for (int i = 0; i < eMaxSecFilterCount; ++i)
       DeleteFilter(i);
   // Close dvr fifo
-  if (dvrFd >= 0) {
+  if (dvrFdM >= 0) {
-     int fd = dvrFd;
+     int fd = dvrFdM;
-     dvrFd = -1;
+     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)
+  if (deviceCountP > IPTV_MAX_DEVICES)
-     DeviceCount = IPTV_MAX_DEVICES;
+     deviceCountP = IPTV_MAX_DEVICES;
-  for (unsigned int i = 0; i < DeviceCount; ++i)
+  for (unsigned int i = 0; i < deviceCountP; ++i)
-      IptvDevices[i] = new cIptvDevice(i);
+      IptvDevicesS[i] = new cIptvDevice(i);
-  for (unsigned int i = DeviceCount; i < IPTV_MAX_DEVICES; ++i)
+  for (unsigned int i = deviceCountP; i < IPTV_MAX_DEVICES; ++i)
-      IptvDevices[i] = NULL;
+      IptvDevicesS[i] = NULL;
   return true;
 }
 
 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)) {
+      if ((IptvDevicesS[i] != NULL) && (IptvDevicesS[i]->CardIndex() == cardIndexP)) {
-         //debug("cIptvDevice::GetIptvDevice(%d): FOUND!\n", CardIndex);
+         //debug("cIptvDevice::%s(%d): found!", __FUNCTION__, cardIndexP);
-         return IptvDevices[i];
+         return IptvDevicesS[i];
          }
       }
   return NULL;
@@ -122,124 +122,124 @@ 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(),
+                          deviceIndexM, CardIndex(),
-                          pIptvStreamer ? *pIptvStreamer->GetInformation() : "",
+                          pIptvStreamerM ? *pIptvStreamerM->GetInformation() : "",
-                          pIptvStreamer ? *pIptvStreamer->GetStreamerStatistic() : "",
+                          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);
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
   unsigned int count = 0;
-  cString info("Active section filters:\n");
+  cString s("Active section filters:\n");
   // loop through active section filters
   for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
-      if (secfilters[i]) {
+      if (secFiltersM[i]) {
-         info = cString::sprintf("%sFilter %d: %s Pid=0x%02X (%s)\n", *info, i,
+         s = cString::sprintf("%sFilter %d: %s Pid=0x%02X (%s)\n", *s, i,
-                                 *secfilters[i]->GetSectionStatistic(), secfilters[i]->GetPid(),
+                              *secFiltersM[i]->GetSectionStatistic(), secFiltersM[i]->GetPid(),
-                                 id_pid(secfilters[i]->GetPid()));
+                              id_pid(secFiltersM[i]->GetPid()));
          if (++count > IPTV_STATS_ACTIVE_FILTERS_COUNT)
             break;
          }
       }
-  return info;
+  return s;
 }
 
-cString cIptvDevice::GetInformation(unsigned int Page)
+cString cIptvDevice::GetInformation(unsigned int pageP)
 {
   // generate information string
-  cString info;
+  cString s;
-  switch (Page) {
+  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",
+         s = cString::sprintf("%s%s%s",
-                                 *GetGeneralInformation(),
+                              *GetGeneralInformation(),
-                                 *GetPidsInformation(),
+                              *GetPidsInformation(),
-                                 *GetFiltersInformation());
+                              *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);
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
-  return cString::sprintf("IPTV %d", deviceIndex);
+  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);
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
-  return (cSource::IsType(Source, IPTV_SOURCE_CHARACTER));
+  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);
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
-  return (ProvidesSource(Channel->Source()));
+  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() == channelIdM)
            result = true;
         else
            needsDetachReceivers = Receiving();
         }
      }
-  if (NeedsDetachReceivers)
+  if (needsDetachReceiversP)
-     *NeedsDetachReceivers = needsDetachReceivers;
+     *needsDetachReceiversP = needsDetachReceivers;
   return result;
 }
 
@@ -253,179 +253,199 @@ int cIptvDevice::NumProvidedSystems(void) const
   return 1;
 }
 
-bool cIptvDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
+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;
+  sidScanEnabledM = itp.SidScan() ? true : false;
-  pidScanEnabled = itp.PidScan() ? true : false;
+  pidScanEnabledM = itp.PidScan() ? true : false;
-  if (pIptvStreamer->Set(itp.Address(), itp.Parameter(), deviceIndex, protocol)) {
+  if (pIptvStreamerM->Set(itp.Address(), itp.Parameter(), deviceIndexM, protocol)) {
-     channelId = Channel->GetChannelID();
+     channelIdM = channelP->GetChannelID();
-     if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
+     if (sidScanEnabledM && pSidScannerM && IptvConfig.GetSectionFiltering())
-        pSidScanner->SetChannel(channelId);
+        pSidScannerM->SetChannel(channelIdM);
-     if (pidScanEnabled && pPidScanner)
+     if (pidScanEnabledM && pPidScannerM)
-        pPidScanner->SetChannel(channelId);
+        pPidScannerM->SetChannel(channelIdM);
      }
   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);
   return true;
 }
 
-bool cIptvDevice::DeleteFilter(unsigned int Index)
+bool cIptvDevice::DeleteFilter(unsigned int indexP)
 {
-  if ((Index < eMaxSecFilterCount) && secfilters[Index]) {
+  if ((indexP < eMaxSecFilterCount) && secFiltersM[indexP]) {
-     //debug("cIptvDevice::DeleteFilter(%d) Index=%d\n", deviceIndex, Index);
+     //debug("cIptvDevice::%s(%d): index=%d", __FUNCTION__, deviceIndexM, indexP);
-     cIptvSectionFilter *tmp = secfilters[Index];
+     cIptvSectionFilter *tmp = secFiltersM[indexP];
-     secfilters[Index] = NULL;
+     secFiltersM[indexP] = NULL;
      delete tmp;
      return true;
      }
   return false;
 }
 
-bool cIptvDevice::IsBlackListed(u_short Pid, u_char Tid, u_char Mask) const
+bool cIptvDevice::IsBlackListed(u_short pidP, u_char tidP, u_char maskP) const
 {
-  //debug("cIptvDevice::IsBlackListed(%d) Pid=%d Tid=%02X Mask=%02X\n", deviceIndex, Pid, Tid, Mask);
+  //debug("cIptvDevice::%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 == Pid) && (section_filter_table[index].tid == Tid) &&
+          (section_filter_table[index].pid == pidP) && (section_filter_table[index].tid == tidP) &&
-          (section_filter_table[index].mask == Mask)) {
+          (section_filter_table[index].mask == maskP)) {
-         //debug("cIptvDevice::IsBlackListed(%d) Found=%s\n", deviceIndex, section_filter_table[index].description);
+         //debug("cIptvDevice::%s(%d): found %s", __FUNCTION__, deviceIndexM, section_filter_table[index].description);
          return true;
          }
       }
   return false;
 }
 
-int cIptvDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
+int cIptvDevice::OpenFilter(u_short pidP, u_char tidP, u_char maskP)
 {
   // Check if disabled by user
   if (!IptvConfig.GetSectionFiltering())
      return -1;
   // Blacklist check, refuse certain filters
-  if (IsBlackListed(Pid, Tid, Mask))
+  if (IsBlackListed(pidP, tidP, maskP))
      return -1;
   // Lock
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(&mutexM);
   // Search the next free filter slot
   for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
-      if (!secfilters[i]) {
+      if (!secFiltersM[i]) {
-         //debug("cIptvDevice::OpenFilter(%d): Pid=%d Tid=%02X Mask=%02X Index=%d\n", deviceIndex, Pid, Tid, Mask, i);
+         //debug("cIptvDevice::%s(%d): pid=%d tid=%02X mask=%02X index=%d", __FUNCTION__, deviceIndexM, pidP, tidP, maskP, i);
-         secfilters[i] = new cIptvSectionFilter(deviceIndex, i, Pid, Tid, Mask);
+         secFiltersM[i] = new cIptvSectionFilter(deviceIndexM, pidP, tidP, maskP);
-         return secfilters[i]->GetReadDesc();
+         if (secFiltersM[i])
+            return i;
+         break;
          }
       }
   // No free filter slot found
   return -1;
 }
 
-void cIptvDevice::CloseFilter(int Handle)
+int cIptvDevice::ReadFilter(int handleP, void *bufferP, size_t lengthP)
 {
   // Lock
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(&mutexM);
-  // Search the filter for deletion
+  // ... and load
-  for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
+  if (secFiltersM[handleP]) {
-      if (secfilters[i] && (Handle == secfilters[i]->GetReadDesc())) {
+     return secFiltersM[handleP]->Read(bufferP, lengthP);
-         //debug("cIptvDevice::CloseFilter(%d): %d\n", deviceIndex, Handle);
+     //debug("cIptvDevice::%s(%d): handle=%d length=%d", __FUNCTION__, deviceIndexM, handleP, lengthP);
-         DeleteFilter(i);
+     }
-         break;
+  return 0;
-         }
+}
-      }
+
+void cIptvDevice::CloseFilter(int handleP)
+{
+  // Lock
+  cMutexLock MutexLock(&mutexM);
+  // ... and load
+  if (secFiltersM[handleP]) {
+     //debug("cIptvDevice::%s(%d): handle=%d", __FUNCTION__, deviceIndexM, handleP);
+     DeleteFilter(handleP);
+     }
 }
 
 bool cIptvDevice::OpenDvr(void)
 {
-  debug("cIptvDevice::OpenDvr(%d)\n", deviceIndex);
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
-  isPacketDelivered = false;
+  isPacketDeliveredM = false;
-  tsBuffer->Clear();
+  tsBufferM->Clear();
   ResetBuffering();
-  if (pIptvStreamer)
+  if (pIptvStreamerM)
-     pIptvStreamer->Open();
+     pIptvStreamerM->Open();
-  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
+  if (sidScanEnabledM && pSidScannerM && IptvConfig.GetSectionFiltering())
-     pSidScanner->Open();
+     pSidScannerM->Open();
-  isOpenDvr = true;
+  isOpenDvrM = true;
   return true;
 }
 
 void cIptvDevice::CloseDvr(void)
 {
-  debug("cIptvDevice::CloseDvr(%d)\n", deviceIndex);
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
-  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
+  if (sidScanEnabledM && pSidScannerM && IptvConfig.GetSectionFiltering())
-     pSidScanner->Close();
+     pSidScannerM->Close();
-  if (pIptvStreamer)
+  if (pIptvStreamerM)
-     pIptvStreamer->Close();
+     pIptvStreamerM->Close();
-  isOpenDvr = false;
+  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 true;
+}
+
 void cIptvDevice::ResetBuffering(void)
 {
-  debug("cIptvDevice::ResetBuffering(%d)\n", deviceIndex);
+  debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
   // pad prefill to multiple of TS_SIZE
-  tsBufferPrefill = (unsigned int)MEGABYTE(IptvConfig.GetTsBufferSize()) *
+  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);
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
-  if (tsBufferPrefill && tsBuffer->Available() < tsBufferPrefill)
+  if (tsBufferPrefillM && tsBufferM && tsBufferM->Available() < tsBufferPrefillM)
      return true;
   else
-     tsBufferPrefill = 0;
+     tsBufferPrefillM = 0;
   return false;
 }
 
 bool cIptvDevice::GetTSPacket(uchar *&Data)
 {
-  //debug("cIptvDevice::GetTSPacket(%d)\n", deviceIndex);
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
-  if (tsBuffer && !IsBuffering()) {
+  if (tsBufferM && !IsBuffering()) {
-     if (isPacketDelivered) {
+     if (isPacketDeliveredM) {
-        tsBuffer->Del(TS_SIZE);
+        tsBufferM->Del(TS_SIZE);
-        isPacketDelivered = false;
+        isPacketDeliveredM = false;
         // Update buffer statistics
-        AddBufferStatistic(TS_SIZE, tsBuffer->Available());
+        AddBufferStatistic(TS_SIZE, tsBufferM->Available());
         }
      int Count = 0;
-     uchar *p = tsBuffer->Get(Count);
+     uchar *p = tsBufferM->Get(Count);
      if (p && Count >= TS_SIZE) {
         if (*p != TS_SYNC_BYTE) {
            for (int i = 1; i < Count; i++) {
@@ -434,26 +454,26 @@ bool cIptvDevice::GetTSPacket(uchar *&Data)
                   break;
                   }
                }
-           tsBuffer->Del(Count);
+           tsBufferM->Del(Count);
            error("Skipped %d bytes to sync on TS packet\n", Count);
            return false;
            }
-        isPacketDelivered = true;
+        isPacketDeliveredM = true;
         Data = p;
         // Update pid statistics
         AddPidStatistic(ts_pid(p), payload(p));
         // Send data also to dvr fifo
-        if (dvrFd >= 0)
+        if (dvrFdM >= 0)
-           Count = (int)write(dvrFd, p, TS_SIZE);
+           Count = (int)write(dvrFdM, p, TS_SIZE);
         // Analyze incomplete streams with built-in pid analyzer
-        if (pidScanEnabled && pPidScanner)
+        if (pidScanEnabledM && pPidScannerM)
-           pPidScanner->Process(p);
+           pPidScannerM->Process(p);
         // Lock
-        cMutexLock MutexLock(&mutex);
+        cMutexLock MutexLock(&mutexM);
         // Run the data through all filters
         for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
-            if (secfilters[i])
+            if (secFiltersM[i])
-               secfilters[i]->Process(p);
+               secFiltersM[i]->Process(p);
             }
         return true;
         }

device.h

@@ -11,6 +11,7 @@
 #include <vdr/device.h>
 #include "common.h"
 #include "protocoludp.h"
+#include "protocolcurl.h"
 #include "protocolhttp.h"
 #include "protocolfile.h"
 #include "protocolext.h"
@@ -33,30 +34,31 @@ private:
   enum {
     eMaxSecFilterCount = 32
   };
-  unsigned int deviceIndex;
+  unsigned int deviceIndexM;
-  int dvrFd;
+  int dvrFdM;
-  bool isPacketDelivered;
+  bool isPacketDeliveredM;
-  bool isOpenDvr;
+  bool isOpenDvrM;
-  bool sidScanEnabled;
+  bool sidScanEnabledM;
-  bool pidScanEnabled;
+  bool pidScanEnabledM;
-  cRingBufferLinear *tsBuffer;
+  cRingBufferLinear *tsBufferM;
-  int tsBufferPrefill;
+  mutable int tsBufferPrefillM;
-  tChannelID channelId;
+  tChannelID channelIdM;
-  cIptvProtocolUdp *pUdpProtocol;
+  cIptvProtocolUdp *pUdpProtocolM;
-  cIptvProtocolHttp *pHttpProtocol;
+  cIptvProtocolCurl *pCurlProtocolM;
-  cIptvProtocolFile *pFileProtocol;
+  cIptvProtocolHttp *pHttpProtocolM;
-  cIptvProtocolExt *pExtProtocol;
+  cIptvProtocolFile *pFileProtocolM;
-  cIptvStreamer *pIptvStreamer;
+  cIptvProtocolExt *pExtProtocolM;
-  cPidScanner *pPidScanner;
+  cIptvStreamer *pIptvStreamerM;
-  cSidScanner *pSidScanner;
+  cPidScanner *pPidScannerM;
-  cMutex mutex;
+  cSidScanner *pSidScannerM;
-  cIptvSectionFilter *secfilters[eMaxSecFilterCount];
+  cMutex mutexM;
+  cIptvSectionFilter *secFiltersM[eMaxSecFilterCount];
 
   // 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 +73,12 @@ private:
   // for channel parsing & buffering
 private:
   void ResetBuffering(void);
-  bool IsBuffering(void);
+  bool IsBuffering(void) const;
-  bool DeleteFilter(unsigned int Index);
+  bool DeleteFilter(unsigned int indexP);
-  bool IsBlackListed(u_short Pid, u_char Tid, u_char Mask) const;
+  bool IsBlackListed(u_short pidP, u_char tidP, u_char maskP) const;
 
   // for channel info
+public:
   virtual cString DeviceType(void) const;
   virtual cString DeviceName(void) const;
   virtual int SignalStrength(void) const;
@@ -83,29 +86,34 @@ private:
 
   // for channel selection
 public:
-  virtual bool ProvidesSource(int Source) const;
+  virtual bool ProvidesSource(int sourceP) const;
-  virtual bool ProvidesTransponder(const cChannel *Channel) const;
+  virtual bool ProvidesTransponder(const cChannel *channelP) const;
-  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
+  virtual bool ProvidesChannel(const cChannel *channelP, int priorityP = -1, bool *needsDetachReceiversP = NULL) const;
   virtual bool ProvidesEIT(void) const;
   virtual int NumProvidedSystems(void) const;
 protected:
-  virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
+  virtual bool SetChannelDevice(const cChannel *channelP, bool liveViewP);
 
   // for recording
 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 int OpenFilter(u_short pidP, u_char tidP, u_char maskP);
-  virtual void CloseFilter(int Handle);
+  virtual int ReadFilter(int handleP, void *bufferP, size_t lengthP);
+  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);
 };
 
 #endif // __IPTV_DEVICE_H

iptv.c

@@ -13,21 +13,21 @@
 #include "device.h"
 #include "iptvservice.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10727
+#if defined(APIVERSNUM) && APIVERSNUM < 10738
-#error "VDR-1.7.27 API version or greater is required!"
+#error "VDR-1.7.38 API version or greater is required!"
 #endif
 
 #ifndef GITVERSION
 #define GITVERSION ""
 #endif
 
-       const char VERSION[]     = "1.0.1" GITVERSION;
+       const char VERSION[]     = "1.2.0" GITVERSION;
 static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
 
 class cPluginIptv : public cPlugin {
 private:
-  unsigned int deviceCount;
+  unsigned int deviceCountM;
-  int ParseFilters(const char *Value, int *Values);
+  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,105 @@ 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));
+  IptvConfig.SetConfigDirectory(cPlugin::ResourceDirectory(PLUGIN_NAME_I18N));
-  return cIptvDevice::Initialize(deviceCount);
+  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);
+     info("Using CURL %s", data->version);
+     }
   return true;
 }
 
 void cPluginIptv::Stop(void)
 {
-  debug("cPluginIptv::Stop()\n");
+  debug("cPluginIptv::%s()", __FUNCTION__);
   // Stop any background activities the plugin is performing.
+  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)) {
+  while (valueP && *valueP && (n < SECTION_FILTER_TABLE_SIZE)) {
-    strn0cpy(buffer, Value, sizeof(buffer));
+    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;
+       filtersP[n++] = i;
-    if ((Value = strchr(Value, ' ')) != NULL)
+    if ((valueP = strchr(valueP, ' ')) != NULL)
-       Value++;
+       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"))
+  if (!strcasecmp(nameP, "TsBufferSize"))
-     IptvConfig.SetTsBufferSize(atoi(Value));
+     IptvConfig.SetTsBufferSize(atoi(valueP));
-  else if (!strcasecmp(Name, "TsBufferPrefill"))
+  else if (!strcasecmp(nameP, "TsBufferPrefill"))
-     IptvConfig.SetTsBufferPrefillRatio(atoi(Value));
+     IptvConfig.SetTsBufferPrefillRatio(atoi(valueP));
-  else if (!strcasecmp(Name, "ExtProtocolBasePort"))
+  else if (!strcasecmp(nameP, "ExtProtocolBasePort"))
-     IptvConfig.SetExtProtocolBasePort(atoi(Value));
+     IptvConfig.SetExtProtocolBasePort(atoi(valueP));
-  else if (!strcasecmp(Name, "SectionFiltering"))
+  else if (!strcasecmp(nameP, "SectionFiltering"))
-     IptvConfig.SetSectionFiltering(atoi(Value));
+     IptvConfig.SetSectionFiltering(atoi(valueP));
-  else if (!strcasecmp(Name, "DisabledFilters")) {
+  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 +204,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");
+  debug("cPluginIptv::%s()", __FUNCTION__);
-  if (strcmp(Id,"IptvService-v1.0") == 0) {
+  if (strcmp(idP,"IptvService-v1.0") == 0) {
-     if (Data) {
+     if (dataP) {
-        IptvService_v1_0 *data = (IptvService_v1_0*)Data;
+        IptvService_v1_0 *data = reinterpret_cast<IptvService_v1_0*>(dataP);
         cIptvDevice *dev = cIptvDevice::GetIptvDevice(data->cardIndex);
         if (!dev)
            return false;
@@ -218,7 +223,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 +236,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);
+  debug("cPluginIptv::%s(%s, %s)", __FUNCTION__, commandP, optionP);
-  if (strcasecmp(Command, "INFO") == 0) {
+  if (strcasecmp(commandP, "INFO") == 0) {
      cIptvDevice *device = cIptvDevice::GetIptvDevice(cDevice::ActualDevice()->CardIndex());
      if (device) {
         int page = IPTV_DEVICE_INFO_ALL;
-        if (Option) {
+        if (optionP) {
-           page = atoi(Option);
+           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,106 @@
 #define PIDSCANNER_PID_DELTA_COUNT 100   /* minimum count of pid samples for audio/video only pid detection */
 
 cPidScanner::cPidScanner(void)
-: timeout(0),
+: timeoutM(0),
-  channelId(tChannelID::InvalidID),
+  channelIdM(tChannelID::InvalidID),
-  process(true),
+  processM(true),
-  Vpid(0xFFFF),
+  vPidM(0xFFFF),
-  Apid(0xFFFF),
+  aPidM(0xFFFF),
-  numVpids(0),
+  numVpidsM(0),
-  numApids(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());
+  debug("cPidScanner::%s(%s)", __FUNCTION__, *channelIdP.ToString());
-  channelId = ChannelId;
+  channelIdM = channelIdP;
-  Vpid = 0xFFFF;
+  vPidM = 0xFFFF;
-  numVpids = 0;
+  numVpidsM = 0;
-  Apid = 0xFFFF;
+  aPidM = 0xFFFF;
-  numApids = 0;
+  numApidsM = 0;
-  process = true;
+  processM = true;
-  timeout.Set(PIDSCANNER_TIMEOUT_IN_MS);
+  timeoutM.Set(PIDSCANNER_TIMEOUT_IN_MS);
 }
 
-void cPidScanner::Process(const uint8_t* buf)
+void cPidScanner::Process(const uint8_t* bufP)
 {
-  //debug("cPidScanner::Process()\n");
+  //debug("cPidScanner::%s()", __FUNCTION__);
-  if (!process)
+  if (!processM)
      return;
 
   // Stop scanning after defined timeout
-  if (timeout.TimedOut()) {
+  if (timeoutM.TimedOut()) {
-     debug("cPidScanner::Process: Timed out determining pids\n");
+     debug("cPidScanner::%s(): timed out determining pids", __FUNCTION__);
-     process = false;
+     processM = false;
   }
 
   // Verify TS packet
-  if (buf[0] != 0x47) {
+  if (bufP[0] != 0x47) {
-     error("Not TS packet: 0x%X\n", buf[0]);
+     error("Not TS packet: 0x%X\n", bufP[0]);
      return;
      }
 
   // Found TS packet
-  int pid = ts_pid(buf);
+  int pid = ts_pid(bufP);
-  int xpid = (buf[1] << 8 | buf[2]);
+  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) {
+              if (pid < aPidM) {
-                 debug("cPidScanner::Process: Found lower Apid: 0x%X instead of 0x%X\n", pid, Apid);
+                 debug("cPidScanner::%s(): found lower Apid: 0x%X instead of 0x%X", __FUNCTION__, pid, aPidM);
-                 Apid = pid;
+                 aPidM = pid;
-                 numApids = 1;
+                 numApidsM = 1;
                  }
-              else if (pid == Apid) {
+              else if (pid == aPidM) {
-                 ++numApids;
+                 ++numApidsM;
-                 debug("cPidScanner::Process: Incrementing Apids, now at %d\n", numApids);
+                 debug("cPidScanner::%s(): incrementing Apids, now at %d", __FUNCTION__, numApidsM);
                  }
               }
            else if ((sid >= 0xE0) && (sid <= 0xEF)) {
-              if (pid < Vpid) {
+              if (pid < vPidM) {
-                 debug("cPidScanner::Process: Found lower Vpid: 0x%X instead of 0x%X\n", pid, Vpid);
+                 debug("cPidScanner::%s(): found lower Vpid: 0x%X instead of 0x%X", __FUNCTION__, pid, vPidM);
-                 Vpid = pid;
+                 vPidM = pid;
-                 numVpids = 1;
+                 numVpidsM = 1;
                  }
-              else if (pid == Vpid) {
+              else if (pid == vPidM) {
-                 ++numVpids;
+                 ++numVpidsM;
-                 debug("cPidScanner::Process: Incrementing Vpids, now at %d\n", numVpids);
+                 debug("cPidScanner::%s(): incrementing Vpids, now at %d", __FUNCTION__, numVpidsM);
                  }
               }
            }
-        if (((numVpids >= PIDSCANNER_VPID_COUNT) && (numApids >= PIDSCANNER_APID_COUNT)) ||
+        if (((numVpidsM >= PIDSCANNER_VPID_COUNT) && (numApidsM >= PIDSCANNER_APID_COUNT)) ||
-            (abs(numApids - numVpids) >= PIDSCANNER_PID_DELTA_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 +127,18 @@ void cPidScanner::Process(const uint8_t* buf)
               int Ppid = IptvChannel->Ppid();
               int Tpid = IptvChannel->Tpid();
               bool foundApid = false;
-              if (numVpids < PIDSCANNER_VPID_COUNT)
+              if (numVpidsM < PIDSCANNER_VPID_COUNT)
-                 Vpid = 0; // No detected video pid
+                 vPidM = 0; // No detected video pid
-              else if (numApids < PIDSCANNER_APID_COUNT)
+              else if (numApidsM < PIDSCANNER_APID_COUNT)
-                 Apid = 0; // No detected audio pid
+                 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 +147,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);
+              debug("cPidScanner::%s(): vpid=0x%04X, apid=0x%04X", __FUNCTION__, vPidM, aPidM);
-              IptvChannel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
+              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,19 @@
 
 class cPidScanner {
 private:
-  cTimeMs timeout;
+  cTimeMs timeoutM;
-  tChannelID channelId;
+  tChannelID channelIdM;
-  bool process;
+  bool processM;
-  int Vpid;
+  int vPidM;
-  int Apid;
+  int aPidM;
-  int numVpids;
+  int numVpidsM;
-  int numApids;
+  int numApidsM;
 
 public:
   cPidScanner(void);
   ~cPidScanner();
-  void SetChannel(const tChannelID &ChannelId);
+  void SetChannel(const tChannelID &channelIdP);
-  void Process(const uint8_t* buf);
+  void Process(const uint8_t* bufP);
 };
 
 #endif // __PIDSCANNER_H

po/de_DE.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 1.0.0\n"
+"Project-Id-Version: vdr-iptv 1.2.0\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"
@@ -118,6 +118,9 @@ msgstr "Hilfe"
 msgid "UDP"
 msgstr "UDP"
 
+msgid "CURL"
+msgstr "CURL"
+
 msgid "HTTP"
 msgstr "HTTP"
 

po/fi_FI.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 1.0.0\n"
+"Project-Id-Version: vdr-iptv 1.2.0\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"
@@ -133,6 +133,9 @@ msgstr "Opaste"
 msgid "UDP"
 msgstr "UDP"
 
+msgid "CURL"
+msgstr "CURL"
+
 msgid "HTTP"
 msgstr "HTTP"
 

po/fr_FR.po

@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 1.0.0\n"
+"Project-Id-Version: vdr-iptv 1.2.0\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"
@@ -135,6 +135,9 @@ msgstr "Aide"
 msgid "UDP"
 msgstr "UDP"
 
+msgid "CURL"
+msgstr "CURL"
+
 msgid "HTTP"
 msgstr "HTTP"
 

po/it_IT.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 1.0.0\n"
+"Project-Id-Version: vdr-iptv 1.2.0\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"
@@ -134,6 +134,9 @@ msgstr "Aiuto"
 msgid "UDP"
 msgstr "UDP"
 
+msgid "CURL"
+msgstr "CURL"
+
 msgid "HTTP"
 msgstr "HTTP"
 

po/nl_NL.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 1.0.0\n"
+"Project-Id-Version: vdr-iptv 1.2.0\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"
@@ -133,6 +133,9 @@ msgstr "Help"
 msgid "UDP"
 msgstr "UDP"
 
+msgid "CURL"
+msgstr "CURL"
+
 msgid "HTTP"
 msgstr "HTTP"
 

po/ru_RU.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 1.0.0\n"
+"Project-Id-Version: vdr-iptv 1.2.0\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"
@@ -119,6 +119,9 @@ msgstr "Справка"
 msgid "UDP"
 msgstr "UDP"
 
+msgid "CURL"
+msgstr "CURL"
+
 msgid "HTTP"
 msgstr "HTTP"
 

protocolcurl.c

@@ -0,0 +1,511 @@
+/*
+ * 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"
+
+#define iptv_curl_easy_setopt(X, Y, Z) \
+  if ((res = curl_easy_setopt((X), (Y), (Z))) != CURLE_OK) { error("curl_easy_setopt(%s, %s, %s) failed: %d\n", #X, #Y, #Z, res); }
+
+#define iptv_curl_easy_perform(X) \
+  if ((res = curl_easy_perform((X))) != CURLE_OK) { error("curl_easy_perform(%s) failed: %d\n", #X, res); }
+
+cIptvProtocolCurl::cIptvProtocolCurl()
+: streamUrlM(""),
+  streamParamM(0),
+  mutexM(),
+  handleM(NULL),
+  multiM(NULL),
+  headerListM(NULL),
+  ringBufferM(new cRingBufferLinear(MEGABYTE(IptvConfig.GetTsBufferSize()), 7 * TS_SIZE)),
+  rtspControlM(),
+  modeM(eModeUnknown),
+  connectedM(false),
+  pausedM(false)
+{
+  debug("cIptvProtocolCurl::%s()", __FUNCTION__);
+  if (ringBufferM)
+     ringBufferM->SetTimeouts(100, 0);
+  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);
+
+  cString control = "";
+  char *p = (char *)ptrP;
+  char *r = strtok(p, "\r\n");
+
+  while (r) {
+    //debug("cIptvProtocolCurl::%s(%zu): %s", __FUNCTION__, len, r);
+    if (strstr(r, "a=control")) {
+       char *s = NULL;
+       if (sscanf(r, "a=control:%64ms", &s) == 1)
+          control = compactspace(s);
+       free(s);
+       }
+    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);
+  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 be 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(unsigned 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\n", 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 (!multiM)
+     multiM = curl_multi_init();
+
+  if (handleM && multiM && !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 timeout
+     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) {
+       case eModeRtsp:
+            {
+            cString uri, control, transport, range;
+
+            // 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, 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, 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
+            uri = cString::sprintf("%s/%s", *streamUrlM, *rtspControlM);
+            transport = "RTP/AVP/TCP;unicast;interleaved=0-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, 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, CURL_RTSPREQ_PLAY);
+            iptv_curl_easy_perform(handleM);
+
+            // start receiving
+            iptv_curl_easy_setopt(handleM, CURLOPT_INTERLEAVEFUNCTION, cIptvProtocolCurl::WriteRtspCallback);
+            iptv_curl_easy_setopt(handleM, CURLOPT_INTERLEAVEDATA, this);
+            iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_RECEIVE);
+            iptv_curl_easy_perform(handleM);
+            }
+            break;
+
+       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);
+            }
+            break;
+
+       case eModeFile:
+       case eModeUnknown:
+       default:
+            break;
+       }
+
+     // add handle into multi set
+     curl_multi_add_handle(multiM, handleM);
+
+     connectedM = true;
+     return true;
+     }
+
+  return false;
+}
+
+bool cIptvProtocolCurl::Disconnect()
+{
+  cMutexLock MutexLock(&mutexM);
+  debug("cIptvProtocolCurl::%s()", __FUNCTION__);
+  if (handleM) {
+     // mode specific tricks
+     switch (modeM) {
+       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 = "";
+            }
+            break;
+
+       case eModeHttp:
+       case eModeHttps:
+       case eModeFile:
+       case eModeUnknown:
+       default:
+            break;
+       }
+
+     // cleanup curl stuff
+     if (headerListM) {
+        curl_slist_free_all(headerListM);
+        headerListM = NULL;
+        }
+     curl_multi_remove_handle(multiM, handleM);
+     curl_multi_cleanup(multiM);
+     multiM = 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 && multiM) {
+        switch (modeM) {
+          case eModeRtsp:
+               {
+               //CURLcode res = CURLE_OK;
+               //iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_RECEIVE);
+               //iptv_curl_easy_perform(handleM);
+               // @todo - how to detect eof?
+               }
+               break;
+
+          case eModeFile:
+               break;
+
+          case eModeHttp:
+          case eModeHttps:
+               {
+               CURLMcode res;
+               int running_handles;
+
+               do {
+                 res = curl_multi_perform(multiM, &running_handles);
+               } while (res == CURLM_CALL_MULTI_PERFORM);
+
+               // shall be continue filling up the buffer?
+               mutexM.Lock();
+               if (pausedM && (ringBufferM->Free() > ringBufferM->Available())) {
+                  debug("cIptvProtocolCurl::%s(continue): free=%d available=%d", __FUNCTION__, ringBufferM->Free(), ringBufferM->Available());
+                  pausedM = false;
+                  curl_easy_pause(handleM, CURLPAUSE_CONT);
+                  }
+               mutexM.Unlock();
+
+               // check end of file
+               if (running_handles == 0) {
+                  int msgcount;
+                  CURLMsg *msg = curl_multi_info_read(multiM, &msgcount);
+                  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;
+
+          default:
+               break;
+          }
+        }
+
+     // ... and try to empty it
+     unsigned char *p = GetData(&bufferLenP);
+     if (p && (bufferLenP > 0)) {
+        memcpy(bufferAddrP, p, bufferLenP);
+        DelData(bufferLenP);
+        len = bufferLenP;
+        //debug("cIptvProtocolCurl::%s(): get %d bytes", __FUNCTION__, len);
+        }
+     }
+
+  return len;
+}
+
+bool cIptvProtocolCurl::Set(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: colons (%3A) and pipes (%7C) shall be decoded
+     char *s = strdup(locationP);
+     strreplace(s, "%3A", ":");
+     strreplace(s, "%7C", "|");
+     streamUrlM = s;
+     free(s);
+     if (startswith(*streamUrlM, "rtsp") || startswith(*streamUrlM, "RTSP"))
+        modeM = eModeRtsp;
+     else if (startswith(*streamUrlM, "https") || startswith(*streamUrlM, "HTTPS"))
+        modeM = eModeHttp;
+     else if (startswith(*streamUrlM, "http") || startswith(*streamUrlM, "HTTP"))
+        modeM = eModeHttps;
+     else if (startswith(*streamUrlM, "file") || startswith(*streamUrlM, "FILE"))
+        modeM = eModeFile;
+     else
+        modeM = eModeUnknown;
+     // Update stream parameter
+     streamParamM = parameterP;
+     // Reconnect
+     Connect();
+     }
+  return true;
+}
+
+cString cIptvProtocolCurl::GetInformation(void)
+{
+  //debug("cIptvProtocolCurl::%s()", __FUNCTION__);
+  return cString::sprintf("%s [%d]", *streamUrlM, streamParamM);
+}

protocolcurl.h

@@ -0,0 +1,72 @@
+/*
+ * 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"
+
+class cIptvProtocolCurl : public cIptvProtocolIf {
+private:
+  enum eModeType {
+    eModeUnknown = 0,
+    eModeHttp,
+    eModeHttps,
+    eModeRtsp,
+    eModeFile,
+    eModeCount
+  };
+  enum {
+    eConnectTimeoutS       = 5,  // in seconds
+    eSelectTimeoutMs       = 10, // in milliseconds
+    eMaxDownloadSpeedMBits = 20  // in megabits per second
+  };
+
+  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;
+  cMutex mutexM;
+  CURL *handleM;
+  CURLM *multiM;
+  struct curl_slist *headerListM;
+  cRingBufferLinear *ringBufferM;
+  cString rtspControlM;
+  eModeType modeM;
+  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(unsigned int *lenP);
+
+public:
+  cIptvProtocolCurl();
+  virtual ~cIptvProtocolCurl();
+  int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
+  bool Set(const char* locationP, const int parameterP, const int indexP);
+  bool Open(void);
+  bool Close(void);
+  cString GetInformation(void);
+  void SetRtspControl(const char *controlP);
+};
+
+#endif // __IPTV_PROTOCOLCURL_H
+

protocolext.c

@@ -24,42 +24,42 @@
 #endif
 
 cIptvProtocolExt::cIptvProtocolExt()
-: pid(-1),
+: pidM(-1),
-  scriptFile(""),
+  scriptFileM(""),
-  scriptParameter(0),
+  scriptParameterM(0),
-  streamPort(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);
+     cString cmd = cString::sprintf("%s %d %d", *scriptFileM, scriptParameterM, streamPortM);
-     debug("cIptvProtocolExt::ExecuteScript(child): %s\n", *cmd);
+     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) {
@@ -69,38 +69,38 @@ void cIptvProtocolExt::ExecuteScript(void)
      _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);
+  debug("cIptvProtocolExt::%s(): pid=%d", __FUNCTION__, pidM);
-  if (!isActive || isempty(scriptFile))
+  if (!isActiveM || isempty(scriptFileM))
      return;
-  if (pid > 0) {
+  if (pidM > 0) {
      const unsigned int timeoutms = 100;
      unsigned int waitms = 0;
      bool waitOver = false;
      // Signal and wait for termination
-     int retval = killpg(pid, SIGINT);
+     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);
+          error("Script '%s' won't terminate - killing it!", *scriptFileM);
-          killpg(pid, SIGKILL);
+          killpg(pidM, SIGKILL);
           }
        // Clear wait status to make sure child exit status is accessible
        // and wait for child termination
 #ifdef __FreeBSD__
        int waitStatus = 0;
-       retval = waitpid(pid, &waitStatus, WNOHANG);
+       retval = waitpid(pidM, &waitStatus, WNOHANG);
 #else  // __FreeBSD__
        siginfo_t waitStatus;
-       memset(&waitStatus, '\0', sizeof(waitStatus));
+       memset(&waitStatus, 0, sizeof(waitStatus));
-       retval = waitid(P_PID, pid, &waitStatus, (WNOHANG | WEXITED));
+       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
@@ -108,70 +108,70 @@ void cIptvProtocolExt::TerminateScript(void)
 #ifdef __FreeBSD__
        if (retval > 0 && (WIFEXITED(waitStatus) || WIFSIGNALED(waitStatus))) {
 #else  // __FreeBSD__
-       if (!retval && waitStatus.si_pid && (waitStatus.si_pid == pid) &&
+       if (!retval && waitStatus.si_pid && (waitStatus.si_pid == pidM) &&
           ((waitStatus.si_code == CLD_EXITED) || (waitStatus.si_code == CLD_KILLED))) {
 #endif // __FreeBSD__
-          debug("Child (%d) exited as expected\n", pid);
+          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::Set(const char* locationP, const int parameterP, const int indexP)
 {
-  debug("cIptvProtocolExt::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
+  debug("cIptvProtocolExt::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
-  if (!isempty(Location)) {
+  if (!isempty(locationP)) {
      struct stat stbuf;
      // Update script file and parameter
-     scriptFile = cString::sprintf("%s/%s", IptvConfig.GetConfigDirectory(), Location);
+     scriptFileM = cString::sprintf("%s/%s", IptvConfig.GetConfigDirectory(), locationP);
-     if ((stat(*scriptFile, &stbuf) != 0) || (strstr(*scriptFile, "..") != 0)) {
+     if ((stat(*scriptFileM, &stbuf) != 0) || (strstr(*scriptFileM, "..") != 0)) {
-        error("Non-existent or relative path script '%s'", *scriptFile);
+        error("Non-existent or relative path script '%s'", *scriptFileM);
         return false;
         }
-     scriptParameter = Parameter;
+     scriptParameterM = parameterP;
      // Update listen port
-     streamPort = IptvConfig.GetExtProtocolBasePort() + Index;
+     streamPortM = IptvConfig.GetExtProtocolBasePort() + indexP;
      }
   return true;
 }
 
 cString cIptvProtocolExt::GetInformation(void)
 {
-  //debug("cIptvProtocolExt::GetInformation()");
+  //debug("cIptvProtocolExt::%s()", __FUNCTION__);
-  return cString::sprintf("ext://%s:%d", *scriptFile, scriptParameter);
+  return cString::sprintf("ext://%s:%d", *scriptFileM, scriptParameterM);
 }

protocolext.h

@@ -14,10 +14,10 @@
 
 class cIptvProtocolExt : public cIptvUdpSocket, public cIptvProtocolIf {
 private:
-  int pid;
+  int pidM;
-  cString scriptFile;
+  cString scriptFileM;
-  int scriptParameter;
+  int scriptParameterM;
-  int streamPort;
+  int streamPortM;
 
 private:
   void TerminateScript(void);
@@ -26,8 +26,8 @@ private:
 public:
   cIptvProtocolExt();
   virtual ~cIptvProtocolExt();
-  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
+  int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
-  bool Set(const char* Location, const int Parameter, const int Index);
+  bool Set(const char* locationP, const int parameterP, const int indexP);
   bool Open(void);
   bool Close(void);
   cString GetInformation(void);

protocolfile.c

@@ -15,73 +15,73 @@
 #include "protocolfile.h"
 
 cIptvProtocolFile::cIptvProtocolFile()
-: fileDelay(0),
+: fileLocationM(strdup("")),
-  fileStream(NULL),
+  fileDelayM(0),
-  isActive(false)
+  fileStreamM(NULL),
+  isActiveM(false)
 {
-  debug("cIptvProtocolFile::cIptvProtocolFile()\n");
+  debug("cIptvProtocolFile::%s()", __FUNCTION__);
-  fileLocation = strdup("");
 }
 
 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)) {
+  if (!isActiveM && !isempty(fileLocationM)) {
-     fileStream = fopen(fileLocation, "rb");
+     fileStreamM = fopen(fileLocationM, "rb");
-     ERROR_IF_RET(!fileStream || ferror(fileStream), "fopen()", return false);
+     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)) {
+  if (isActiveM && !isempty(fileLocationM)) {
-     fclose(fileStream);
+     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)) {
+   if (ferror(fileStreamM)) {
-      debug("Read error\n");
+      debug("cIptvProtocolFile::%s(): stream error", __FUNCTION__);
       return -1;
       }
    // Rewind if EOF
-   if (feof(fileStream))
+   if (feof(fileStreamM))
-      rewind(fileStream);
+      rewind(fileStreamM);
    // Sleep before reading the file stream to prevent aggressive busy looping
    // and prevent transfer ringbuffer overflows
-   if (fileDelay)
+   if (fileDelayM)
-      cCondWait::SleepMs(fileDelay);
+      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)
+   if (isActiveM)
-      return (int)fread(BufferAddr, sizeof(unsigned char), BufferLen, fileStream);
+      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,21 +89,21 @@ 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::Set(const char* locationP, const int parameterP, const int indexP)
 {
-  debug("cIptvProtocolFile::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
+  debug("cIptvProtocolFile::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
-  if (!isempty(Location)) {
+  if (!isempty(locationP)) {
      // Close the file stream
      CloseFile();
      // Update stream address and port
-     fileLocation = strcpyrealloc(fileLocation, Location);
+     fileLocationM = strcpyrealloc(fileLocationM, locationP);
-     fileDelay = Parameter;
+     fileDelayM = parameterP;
      // Open the file for input
      OpenFile();
      }
@@ -112,6 +112,6 @@ bool cIptvProtocolFile::Set(const char* Location, const int Parameter, const int
 
 cString cIptvProtocolFile::GetInformation(void)
 {
-  //debug("cIptvProtocolFile::GetInformation()");
+  //debug("cIptvProtocolFile::%s()", __FUNCTION__);
-  return cString::sprintf("file://%s:%d", fileLocation, fileDelay);
+  return cString::sprintf("file://%s:%d", fileLocationM, fileDelayM);
 }

protocolfile.h

@@ -13,10 +13,10 @@
 
 class cIptvProtocolFile : public cIptvProtocolIf {
 private:
-  char* fileLocation;
+  char* fileLocationM;
-  int fileDelay;
+  int fileDelayM;
-  FILE* fileStream;
+  FILE* fileStreamM;
-  bool isActive;
+  bool isActiveM;
 
 private:
   bool OpenFile(void);
@@ -25,8 +25,8 @@ private:
 public:
   cIptvProtocolFile();
   virtual ~cIptvProtocolFile();
-  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
+  int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
-  bool Set(const char* Location, const int Parameter, const int Index);
+  bool Set(const char* locationP, const int parameterP, const int indexP);
   bool Open(void);
   bool Close(void);
   cString GetInformation(void);

protocolhttp.c

@@ -19,30 +19,30 @@
 #include "protocolhttp.h"
 
 cIptvProtocolHttp::cIptvProtocolHttp()
-: streamAddr(strdup("")),
+: streamAddrM(strdup("")),
-  streamPath(strdup("/")),
+  streamPathM(strdup("/")),
-  streamPort(0)
+  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(streamPathM);
-  free(streamAddr);
+  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,8 +53,9 @@ 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);
+                                       "\r\n", streamPathM, streamAddrM,
-     debug("Sending http request: %s\n", *buffer);
+                                       PLUGIN_NAME_I18N, VERSION);
+     debug("cIptvProtocolHttp::%s(): requesting: %s", __FUNCTION__, *buffer);
      if (!Write(*buffer, (unsigned int)strlen(*buffer))) {
         CloseSocket();
         return false;
@@ -65,33 +66,33 @@ bool cIptvProtocolHttp::Connect(void)
         return false;
         }
      // Update active flag
-     isActive = true;
+     isActiveM = true;
      }
   return true;
 }
 
 bool cIptvProtocolHttp::Disconnect(void)
 {
-  debug("cIptvProtocolHttp::Disconnect()\n");
+  debug("cIptvProtocolHttp::%s()", __FUNCTION__);
-  if (isActive) {
+  if (isActiveM) {
      // Close the socket
      CloseSocket();
      // Update active flag
-     isActive = false;
+     isActiveM = false;
      }
   return true;
 }
 
-bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
+bool cIptvProtocolHttp::GetHeaderLine(char* destP, unsigned int destLenP,
-                                      unsigned int &recvLen)
+                                      unsigned int &recvLenP)
 {
-  debug("cIptvProtocolHttp::GetHeaderLine()\n");
+  debug("cIptvProtocolHttp::%s()", __FUNCTION__);
   bool linefeed = false;
   bool newline = false;
-  char *bufptr = dest;
+  char *bufptr = destP;
-  recvLen = 0;
+  recvLenP = 0;
 
-  if (!dest)
+  if (!destP)
      return false;
 
   while (!newline || !linefeed) {
@@ -106,13 +107,13 @@ 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) {
+       if (recvLenP >= destLenP) {
           error("Header wouldn't fit into buffer\n");
-          recvLen = 0;
+          recvLenP = 0;
           return false;
           }
        }
@@ -126,7 +127,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,7 +138,7 @@ 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) {
@@ -157,41 +158,40 @@ 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::Set(const char* locationP, const int parameterP, const int indexP)
 {
-  debug("cIptvProtocolHttp::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
+  debug("cIptvProtocolHttp::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
-  if (!isempty(Location)) {
+  if (!isempty(locationP)) {
      // Disconnect the current socket
      Disconnect();
      // Update stream address, path and port
-     streamAddr = strcpyrealloc(streamAddr, Location);
+     streamAddrM = strcpyrealloc(streamAddrM, locationP);
-     char *path = strstr(streamAddr, "/");
+     char *path = strstr(streamAddrM, "/");
      if (path) {
-        streamPath = strcpyrealloc(streamPath, path);
+        streamPathM = strcpyrealloc(streamPathM, path);
         *path = 0;
         }
      else
-        streamPath = strcpyrealloc(streamPath, "/");
+        streamPathM = strcpyrealloc(streamPathM, "/");
-     streamPort = Parameter;
+     streamPortM = parameterP;
-     //debug("http://%s:%d%s\n", streamAddr, streamPort, streamPath);
      // Re-connect the socket
      Connect();
      }
@@ -200,6 +200,6 @@ bool cIptvProtocolHttp::Set(const char* Location, const int Parameter, const int
 
 cString cIptvProtocolHttp::GetInformation(void)
 {
-  //debug("cIptvProtocolHttp::GetInformation()");
+  //debug("cIptvProtocolHttp::%s()", __FUNCTION__);
-  return cString::sprintf("http://%s:%d%s", streamAddr, streamPort, streamPath);
+  return cString::sprintf("http://%s:%d%s", streamAddrM, streamPortM, streamPathM);
 }

protocolhttp.h

@@ -14,21 +14,21 @@
 
 class cIptvProtocolHttp : public cIptvTcpSocket, public cIptvProtocolIf {
 private:
-  char* streamAddr;
+  char* streamAddrM;
-  char* streamPath;
+  char* streamPathM;
-  int streamPort;
+  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);
+  int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
-  bool Set(const char* Location, const int Parameter, const int Index);
+  bool Set(const char* locationP, const int parameterP, const int indexP);
   bool Open(void);
   bool Close(void);
   cString GetInformation(void);

protocolif.h

@@ -12,8 +12,8 @@ class cIptvProtocolIf {
 public:
   cIptvProtocolIf() {}
   virtual ~cIptvProtocolIf() {}
-  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen) = 0;
+  virtual int Read(unsigned char* bufferAddrP, unsigned int bufferLenP) = 0;
-  virtual bool Set(const char* Location, const int Parameter, const int Index) = 0;
+  virtual bool Set(const char* locationP, const int parameterP, const int indexP) = 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("")),
+: isIGMPv3M(false),
-  streamPort(0)
+  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);
+  debug("cIptvProtocolUdp::%s(%s)", __FUNCTION__, streamAddrM);
-  OpenSocket(streamPort, inet_addr(streamAddr));
+  OpenSocket(streamPortM, streamAddrM, sourceAddrM, isIGMPv3M);
-  if (!isempty(streamAddr)) {
+  if (!isempty(streamAddrM)) {
      // Join a new multicast group
      JoinMulticast();
      }
@@ -47,40 +50,53 @@ bool cIptvProtocolUdp::Open(void)
 
 bool cIptvProtocolUdp::Close(void)
 {
-  debug("cIptvProtocolUdp::Close(): streamAddr=%s\n", streamAddr);
+  debug("cIptvProtocolUdp::%s(%s)", __FUNCTION__, streamAddrM);
-  if (!isempty(streamAddr)) {
+  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, "");
+  //sourceAddrM = strcpyrealloc(sourceAddrM, "");
-  //streamPort = 0;
+  //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::Set(const char* locationP, const int parameterP, const int indexP)
 {
-  debug("cIptvProtocolUdp::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
+  debug("cIptvProtocolUdp::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
-  if (!isempty(Location)) {
+  if (!isempty(locationP)) {
      // Drop the multicast group
-     if (!isempty(streamAddr)) {
+     if (!isempty(streamAddrM)) {
-        OpenSocket(streamPort, inet_addr(streamAddr));
+        OpenSocket(streamPortM, streamAddrM, sourceAddrM, isIGMPv3M);
         DropMulticast();
         }
      // Update stream address and port
-     streamAddr = strcpyrealloc(streamAddr, Location);
+     streamAddrM = strcpyrealloc(streamAddrM, locationP);
-     streamPort = Parameter;
+     // <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)) {
+     if (!isempty(streamAddrM)) {
-        OpenSocket(streamPort, inet_addr(streamAddr));
+        OpenSocket(streamPortM, streamAddrM, sourceAddrM, isIGMPv3M);
         JoinMulticast();
         }
      }
@@ -89,6 +105,8 @@ bool cIptvProtocolUdp::Set(const char* Location, const int Parameter, const int
 
 cString cIptvProtocolUdp::GetInformation(void)
 {
-  //debug("cIptvProtocolUdp::GetInformation()");
+  //debug("cIptvProtocolUdp::%s()", __FUNCTION__);
-  return cString::sprintf("udp://%s:%d", streamAddr, streamPort);
+  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,16 @@
 
 class cIptvProtocolUdp : public cIptvUdpSocket, public cIptvProtocolIf {
 private:
-  char* streamAddr;
+  bool isIGMPv3M;
-  int streamPort;
+  char* sourceAddrM;
+  char* streamAddrM;
+  int streamPortM;
 
 public:
   cIptvProtocolUdp();
   virtual ~cIptvProtocolUdp();
-  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
+  int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
-  bool Set(const char* Location, const int Parameter, const int Index);
+  bool Set(const char* locationP, const int parameterP, const int indexP);
   bool Open(void);
   bool Close(void);
   cString GetInformation(void);

sectionfilter.c

@@ -5,110 +5,104 @@
  *
  */
 
+#include "config.h"
 #include "sectionfilter.h"
 
-cIptvSectionFilter::cIptvSectionFilter(int DeviceIndex, int Index,
+cIptvSectionFilter::cIptvSectionFilter(int deviceIndexP, uint16_t pidP, uint8_t tidP, uint8_t maskP)
-                                       uint16_t Pid, uint8_t Tid, uint8_t Mask)
+: pusiSeenM(0),
-: pusi_seen(0),
+  feedCcM(0),
-  feedcc(0),
+  doneqM(0),
-  doneq(0),
+  secBufM(NULL),
-  secbuf(NULL),
+  secBufpM(0),
-  secbufp(0),
+  secLenM(0),
-  seclen(0),
+  tsFeedpM(0),
-  tsfeedp(0),
+  pidM(pidP),
-  pid(Pid),
+  devIdM(deviceIndexP)
-  devid(DeviceIndex),
-  id(Index)
 {
-  //debug("cIptvSectionFilter::cIptvSectionFilter(%d, %d)\n", devid, id);
+  //debug("cIptvSectionFilter::%s(%d, %d)", __FUNCTION__, devIdM, pidM);
   int i;
 
-  memset(secbuf_base, '\0', sizeof(secbuf_base));
+  memset(secBufBaseM,     0, sizeof(secBufBaseM));
-  memset(filter_value, '\0', sizeof(filter_value));
+  memset(filterValueM,    0, sizeof(filterValueM));
-  memset(filter_mask, '\0', sizeof(filter_mask));
+  memset(filterMaskM,     0, sizeof(filterMaskM));
-  memset(filter_mode, '\0', sizeof(filter_mode));
+  memset(filterModeM,     0, sizeof(filterModeM));
-  memset(maskandmode, '\0', sizeof(maskandmode));
+  memset(maskAndModeM,    0, sizeof(maskAndModeM));
-  memset(maskandnotmode, '\0', sizeof(maskandnotmode));
+  memset(maskAndNotModeM, 0, sizeof(maskAndNotModeM));
 
-  filter_value[0] = Tid;
+  filterValueM[0] = tidP;
-  filter_mask[0] = Mask;
+  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];
+      mode = filterModeM[i];
-      mask = filter_mask[i];
+      mask = filterMaskM[i];
-      maskandmode[i] = (uint8_t)(mask & mode);
+      maskAndModeM[i] = (uint8_t)(mask & mode);
-      maskandnotmode[i] = (uint8_t)(mask & ~mode);
+      maskAndNotModeM[i] = (uint8_t)(mask & ~mode);
-      local_doneq |= maskandnotmode[i];
+      doneq |= maskAndNotModeM[i];
       }
-  doneq = local_doneq ? 1 : 0;
+  doneqM = doneq ? 1 : 0;
 
-  // Create sockets
+  // Create filtering buffer
-  socket[0] = socket[1] = -1;
+  ringbufferM = new cRingBufferLinear(KILOBYTE(128), 0, false, *cString::sprintf("IPTV SECTION %d/%d", devIdM, pidM));
-  if (socketpair(AF_UNIX, SOCK_DGRAM, 0, socket) != 0) {
+  if (ringbufferM)
-     char tmp[64];
+     ringbufferM->SetTimeouts(10, 10);
-     error("Opening section filter sockets failed (device=%d id=%d): %s\n", devid, id, strerror_r(errno, tmp, sizeof(tmp)));
+  else
-     }
+     error("Failed to allocate buffer for section filter (device=%d pid=%d): ", devIdM, pidM);
-  else if ((fcntl(socket[0], F_SETFL, O_NONBLOCK) != 0) || (fcntl(socket[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)));
-     }
 }
 
 cIptvSectionFilter::~cIptvSectionFilter()
 {
-  //debug("cIptvSectionFilter::~cIptvSectionfilter(%d, %d)\n", devid, id);
+  //debug("cIptvSectionFilter::%s(%d, %d)", __FUNCTION__, devIdM, pidM);
-  int tmp = socket[1];
+  DELETE_POINTER(ringbufferM);
-  socket[1] = -1;
+  secBufM = NULL;
-  if (tmp >= 0)
-     close(tmp);
-  tmp = socket[0];
-  socket[0] = -1;
-  if (tmp >= 0)
-     close(tmp);
-  secbuf = NULL;
 }
 
-int cIptvSectionFilter::GetReadDesc(void)
+int cIptvSectionFilter::Read(void *Data, size_t Length)
 {
-  return socket[0];
+  int count = 0;
+  uchar *p = ringbufferM->Get(count);
+  if (p && count > 0) {
+     memcpy(Data, p, count);
+     ringbufferM->Del(count);
+     }
+  return count;
 }
 
-inline uint16_t cIptvSectionFilter::GetLength(const uint8_t *Data)
+inline uint16_t cIptvSectionFilter::GetLength(const uint8_t *dataP)
 {
-  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;
+  tsFeedpM = secBufpM = secLenM = 0;
-  secbuf = secbuf_base;
+  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]);
+         uint8_t calcxor = (uint8_t)(filterValueM[i] ^ secBufM[i]);
-         if (maskandmode[i] & local_xor)
+         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 (ringbufferM) {
-     if ((socket[0] >= 0) && (socket[1] >= 0) /*&& !select_single_desc(socket[0], 0, false)*/) {
+        int len = ringbufferM->Put(secBufM, secLenM);
-        ssize_t len = write(socket[1], secbuf, seclen);
+        if (len != secLenM)
-        ERROR_IF(len < 0, "write()");
+           ringbufferM->ReportOverflow(secLenM - len);
         // 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)
+  if (tsFeedpM + lenP > DMX_MAX_SECFEED_SIZE)
-     len = (uint8_t)(DMX_MAX_SECFEED_SIZE - tsfeedp);
+     lenP = (uint8_t)(DMX_MAX_SECFEED_SIZE - tsFeedpM);
 
-  if (len <= 0)
+  if (lenP <= 0)
      return 0;
 
-  memcpy(secbuf_base + tsfeedp, buf, len);
+  memcpy(secBufBaseM + tsFeedpM, bufP, lenP);
-  tsfeedp = uint16_t(tsfeedp + len);
+  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) {
+  for (n = 0; secBufpM + 2 < limit; ++n) {
-      seclen_local = GetLength(secbuf);
+      seclen = GetLength(secBufM);
-      if ((seclen_local <= 0) || (seclen_local > DMX_MAX_SECTION_SIZE) || ((seclen_local + secbufp) > limit))
+      if ((seclen <= 0) || (seclen > DMX_MAX_SECTION_SIZE) || ((seclen + secBufpM) > limit))
          return 0;
-      seclen = seclen_local;
+      secLenM = seclen;
-      if (pusi_seen)
+      if (pusiSeenM)
          Feed();
-      secbufp = uint16_t(secbufp + seclen_local);
+      secBufpM = uint16_t(secBufpM + seclen);
-      secbuf += seclen_local;
+      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,41 @@ 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);
+  uint8_t cc = (uint8_t)(dataP[3] & 0x0f);
-  int ccok = ((feedcc + 1) & 0x0f) == cc;
+  int ccok = ((feedCcM + 1) & 0x0f) == cc;
-  feedcc = 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) {
+     if (count > 1 && dataP[p] < count) {
-        const uint8_t *before = &Data[p + 1];
+        const uint8_t *before = &dataP[p + 1];
-        uint8_t before_len = Data[p];
+        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
+        // Before start of new section, set pusiSeenM = 1
-        pusi_seen = 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);
      }
 }

sectionfilter.h

@@ -24,42 +24,41 @@ private:
     DMX_MAX_SECFEED_SIZE = (DMX_MAX_SECTION_SIZE + TS_SIZE)
   };
 
-  int pusi_seen;
+  int pusiSeenM;
-  int feedcc;
+  int feedCcM;
-  int doneq;
+  int doneqM;
 
-  uint8_t *secbuf;
+  uint8_t *secBufM;
-  uint8_t secbuf_base[DMX_MAX_SECFEED_SIZE];
+  uint8_t secBufBaseM[DMX_MAX_SECFEED_SIZE];
-  uint16_t secbufp;
+  uint16_t secBufpM;
-  uint16_t seclen;
+  uint16_t secLenM;
-  uint16_t tsfeedp;
+  uint16_t tsFeedpM;
-  uint16_t pid;
+  uint16_t pidM;
 
-  int devid;
+  int devIdM;
-  int id;
-  int socket[2];
 
-  uint8_t filter_value[DMX_MAX_FILTER_SIZE];
+  uint8_t filterValueM[DMX_MAX_FILTER_SIZE];
-  uint8_t filter_mask[DMX_MAX_FILTER_SIZE];
+  uint8_t filterMaskM[DMX_MAX_FILTER_SIZE];
-  uint8_t filter_mode[DMX_MAX_FILTER_SIZE];
+  uint8_t filterModeM[DMX_MAX_FILTER_SIZE];
 
-  uint8_t maskandmode[DMX_MAX_FILTER_SIZE];
+  uint8_t maskAndModeM[DMX_MAX_FILTER_SIZE];
-  uint8_t maskandnotmode[DMX_MAX_FILTER_SIZE];
+  uint8_t maskAndNotModeM[DMX_MAX_FILTER_SIZE];
 
-  inline uint16_t GetLength(const uint8_t *Data);
+  cRingBufferLinear *ringbufferM;
+
+  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,
+  cIptvSectionFilter(int deviceIndexP, uint16_t pidP, uint8_t tidP, uint8_t maskP);
-                     uint8_t Tid, uint8_t Mask);
   virtual ~cIptvSectionFilter();
-  void Process(const uint8_t* Data);
+  void Process(const uint8_t* dataP);
-  int GetReadDesc(void);
+  int Read(void *bufferP, size_t lengthP);
-  uint16_t GetPid(void) const { return pid; }
+  uint16_t GetPid(void) const { return pidM; }
 };
 
 #endif // __IPTV_SECTIONFILTER_H

setup.c

@@ -21,22 +21,23 @@ private:
   enum {
     INFO_TIMEOUT_MS = 2000
   };
-  cString text;
+  cString textM;
-  cTimeMs timeout;
+  cTimeMs timeoutM;
-  unsigned int page;
+  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);
+  DisplayMenu()->SetText(textM, true);
-  if (*text)
+  if (*textM)
-     cStatus::MsgOsdTextItem(text);
+     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);
+                  DisplayMenu()->Scroll(NORMALKEY(keyP) == kUp || NORMALKEY(keyP) == kLeft, NORMALKEY(keyP) == kLeft || NORMALKEY(keyP) == kRight);
-                  cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft);
+                  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,17 +112,17 @@ eOSState cIptvMenuInfo::ProcessKey(eKeys Key)
 
 cIptvPluginSetup::cIptvPluginSetup()
 {
-  debug("cIptvPluginSetup::cIptvPluginSetup()\n");
+  debug("cIptvPluginSetup::%s()", __FUNCTION__);
-  tsBufferSize = IptvConfig.GetTsBufferSize();
+  tsBufferSizeM = IptvConfig.GetTsBufferSize();
-  tsBufferPrefill = IptvConfig.GetTsBufferPrefillRatio();
+  tsBufferPrefillM = IptvConfig.GetTsBufferPrefillRatio();
-  extProtocolBasePort = IptvConfig.GetExtProtocolBasePort();
+  extProtocolBasePortM = IptvConfig.GetExtProtocolBasePort();
-  sectionFiltering = IptvConfig.GetSectionFiltering();
+  sectionFilteringM = IptvConfig.GetSectionFiltering();
-  numDisabledFilters = IptvConfig.GetDisabledFiltersCount();
+  numDisabledFiltersM = IptvConfig.GetDisabledFiltersCount();
-  if (numDisabledFilters > SECTION_FILTER_TABLE_SIZE)
+  if (numDisabledFiltersM > SECTION_FILTER_TABLE_SIZE)
-     numDisabledFilters = SECTION_FILTER_TABLE_SIZE;
+     numDisabledFiltersM = SECTION_FILTER_TABLE_SIZE;
   for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i) {
-      disabledFilterIndexes[i] = IptvConfig.GetDisabledFilters(i);
+      disabledFilterIndexesM[i] = IptvConfig.GetDisabledFilters(i);
-      disabledFilterNames[i] = tr(section_filter_table[i].description);
+      disabledFilterNamesM[i] = tr(section_filter_table[i].description);
       }
   Setup();
   SetHelp(NULL, NULL, NULL, trVDR("Button$Info"));
@@ -132,28 +133,28 @@ void cIptvPluginSetup::Setup(void)
   int current = Current();
 
   Clear();
-  help.Clear();
+  helpM.Clear();
 
-  Add(new cMenuEditIntItem( tr("TS buffer size [MB]"), &tsBufferSize, 1, 4));
+  Add(new cMenuEditIntItem( tr("TS buffer size [MB]"), &tsBufferSizeM, 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."));
+  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));
+  Add(new cMenuEditIntItem( tr("TS buffer prefill ratio [%]"), &tsBufferPrefillM, 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."));
+  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));
+  Add(new cMenuEditIntItem( tr("EXT protocol base port"), &extProtocolBasePortM, 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."));
+  helpM.Append(tr("Define a base port used by EXT protocol.\n\nThe port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."));
 
-  Add(new cMenuEditBoolItem(tr("Use section filtering"), &sectionFiltering));
+  Add(new cMenuEditBoolItem(tr("Use section filtering"), &sectionFilteringM));
-  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."));
+  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) {
+  if (sectionFilteringM) {
-     Add(new cMenuEditIntItem( tr("Disable filters"), &numDisabledFilters, 0, SECTION_FILTER_TABLE_SIZE));
+     Add(new cMenuEditIntItem( tr("Disable filters"), &numDisabledFiltersM, 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."));
+     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));
+         Add(new cMenuEditStraItem(tr("Disable filter"), &disabledFilterIndexesM[i], SECTION_FILTER_TABLE_SIZE, disabledFilterNamesM));
-         help.Append(tr("Define an ill-behaving filter to be blacklisted."));
+         helpM.Append(tr("Define an ill-behaving filter to be blacklisted."));
          }
      }
 
@@ -163,68 +164,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 oldsectionFiltering = sectionFilteringM;
-  int oldNumDisabledFilters = numDisabledFilters;
+  int oldNumDisabledFilters = numDisabledFiltersM;
-  eOSState state = cMenuSetupPage::ProcessKey(Key);
+  eOSState state = cMenuSetupPage::ProcessKey(keyP);
 
   if (state == osUnknown) {
-     switch (Key) {
+     switch (keyP) {
        case kBlue: return ShowInfo();
-       case kInfo: if (Current() < help.Size())
+       case kInfo: if (Current() < helpM.Size())
-                      return AddSubMenu(new cMenuText(cString::sprintf("%s - %s '%s'", tr("Help"), trVDR("Plugin"), PLUGIN_NAME_I18N), help[Current()]));
+                      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))) {
+  if ((keyP != kNone) && ((numDisabledFiltersM != oldNumDisabledFilters) || (sectionFilteringM != oldsectionFiltering))) {
-     while ((numDisabledFilters < oldNumDisabledFilters) && (oldNumDisabledFilters > 0))
+     while ((numDisabledFiltersM < oldNumDisabledFilters) && (oldNumDisabledFilters > 0))
-           disabledFilterIndexes[--oldNumDisabledFilters] = -1;
+           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);
+  debug("cIptvPluginSetup::%s(%s, %s)", __FUNCTION__, nameP, buffer);
-  SetupStore(Name, buffer);
+  SetupStore(nameP, buffer);
 }
 
 void cIptvPluginSetup::Store(void)
 {
   // Store values into setup.conf
-  SetupStore("TsBufferSize", tsBufferSize);
+  SetupStore("TsBufferSize", tsBufferSizeM);
-  SetupStore("TsBufferPrefill", tsBufferPrefill);
+  SetupStore("TsBufferPrefill", tsBufferPrefillM);
-  SetupStore("ExtProtocolBasePort", extProtocolBasePort);
+  SetupStore("ExtProtocolBasePort", extProtocolBasePortM);
-  SetupStore("SectionFiltering", sectionFiltering);
+  SetupStore("SectionFiltering", sectionFilteringM);
-  StoreFilters("DisabledFilters", disabledFilterIndexes);
+  StoreFilters("DisabledFilters", disabledFilterIndexesM);
   // Update global config
-  IptvConfig.SetTsBufferSize(tsBufferSize);
+  IptvConfig.SetTsBufferSize(tsBufferSizeM);
-  IptvConfig.SetTsBufferPrefillRatio(tsBufferPrefill);
+  IptvConfig.SetTsBufferPrefillRatio(tsBufferPrefillM);
-  IptvConfig.SetExtProtocolBasePort(extProtocolBasePort);
+  IptvConfig.SetExtProtocolBasePort(extProtocolBasePortM);
-  IptvConfig.SetSectionFiltering(sectionFiltering);
+  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 tsBufferSizeM;
-  int tsBufferPrefill;
+  int tsBufferPrefillM;
-  int extProtocolBasePort;
+  int extProtocolBasePortM;
-  int sectionFiltering;
+  int sectionFilteringM;
-  int numDisabledFilters;
+  int numDisabledFiltersM;
-  int disabledFilterIndexes[SECTION_FILTER_TABLE_SIZE];
+  int disabledFilterIndexesM[SECTION_FILTER_TABLE_SIZE];
-  const char *disabledFilterNames[SECTION_FILTER_TABLE_SIZE];
+  const char *disabledFilterNamesM[SECTION_FILTER_TABLE_SIZE];
-  cVector<const char*> help;
+  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,90 @@
 #include "sidscanner.h"
 
 cSidScanner::cSidScanner(void)
-: channelId(tChannelID::InvalidID),
+: channelIdM(tChannelID::InvalidID),
-  sidFound(false),
+  sidFoundM(false),
-  nidFound(false),
+  nidFoundM(false),
-  tidFound(false)
+  tidFoundM(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::SetStatus(bool onP)
 {
-  debug("cSidScanner::SetStatus(): %d\n", On);
+  debug("cSidScanner::%s(%d)", __FUNCTION__, onP);
-  cFilter::SetStatus(On);
+  cFilter::SetStatus(onP);
 }
 
-void cSidScanner::SetChannel(const tChannelID &ChannelId)
+void cSidScanner::SetChannel(const tChannelID &channelIdP)
 {
-  debug("cSidScanner::SetChannel(): %s\n", *ChannelId.ToString());
+  debug("cSidScanner::%s(%s)", __FUNCTION__, *channelIdP.ToString());
-  channelId = ChannelId;
+  channelIdM = channelIdP;
-  sidFound = false;
+  sidFoundM = false;
-  nidFound = false;
+  nidFoundM = false;
-  tidFound = false;
+  tidFoundM = 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");
+  //debug("cSidScanner::%s()", __FUNCTION__);
-  if (channelId.Valid()) {
+  if (channelIdM.Valid()) {
-     if ((Pid == 0x00) && (Tid == 0x00)) {
+     if ((pidP == 0x00) && (tidP == 0x00)) {
-        debug("cSidScanner::Process(): Pid=%d Tid=%02X\n", Pid, Tid);
+        debug("cSidScanner::%s(%d, %02X)", __FUNCTION__, pidP, tidP);
-        SI::PAT pat(Data, false);
+        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()) {
+               if (assoc.getServiceId() != channelIdM.Sid()) {
-                  debug("cSidScanner::Process(): Sid=%d\n", assoc.getServiceId());
+                  debug("cSidScanner::%s(): sid=%d", __FUNCTION__, assoc.getServiceId());
                   newSid = assoc.getServiceId();
                   }
-               sidFound = true;
+               sidFoundM = true;
                break;
                }
             }
         }
-     else if ((Pid == 0x10) && (Tid == 0x40)) {
+     else if ((pidP == 0x10) && (tidP == 0x40)) {
-        debug("cSidScanner::Process(): Pid=%d Tid=%02X\n", Pid, Tid);
+        debug("cSidScanner::%s(%d, %02X)", __FUNCTION__, pidP, tidP);
-        SI::NIT nit(Data, false);
+        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()) {
+            if (ts.getTransportStreamId() != channelIdM.Tid()) {
-               debug("cSidScanner::Process(): TSid=%d\n", ts.getTransportStreamId());
+               debug("cSidScanner::%s(): tsid=%d", __FUNCTION__, ts.getTransportStreamId());
                newTid = ts.getTransportStreamId();
                }
-            tidFound = true;
+            tidFoundM = true;
             break; // default to the first one
             }
-        if (nit.getNetworkId() != channelId.Nid()) {
+        if (nit.getNetworkId() != channelIdM.Nid()) {
-           debug("cSidScanner::Process(): Nid=%d\n", ts.getTransportStreamId());
+           debug("cSidScanner::%s(): nid=%d\n", __FUNCTION__, ts.getTransportStreamId());
            newNid = nit.getNetworkId();
            }
-        nidFound = true; 
+        nidFoundM = 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,19 +13,19 @@
 
 class cSidScanner : public cFilter {
 private:
-  tChannelID channelId;
+  tChannelID channelIdM;
-  bool sidFound;
+  bool sidFoundM;
-  bool nidFound;
+  bool nidFoundM;
-  bool tidFound;
+  bool tidFoundM;
 
 protected:
-  virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
+  virtual void Process(u_short pidP, u_char tidP, const u_char *dataP, int lengthP);
-  virtual void SetStatus(bool On);
+  virtual void SetStatus(bool onP);
 
 public:
   cSidScanner(void);
   ~cSidScanner();
-  void SetChannel(const tChannelID &ChannelId);
+  void SetChannel(const tChannelID &channelIdP);
   void Open() { SetStatus(true); }
   void Close() { SetStatus(false); }
 };

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,204 +19,274 @@
 #include "socket.h"
 
 cIptvSocket::cIptvSocket()
-: socketPort(0),
+: socketPortM(0),
-  socketDesc(-1),
+  socketDescM(-1),
-  isActive(false)
+  isActiveM(false)
 {
-  debug("cIptvSocket::cIptvSocket()\n");
+  debug("cIptvSocket::%s()", __FUNCTION__);
-  memset(&sockAddr, '\0', sizeof(sockAddr));
+  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()", __FUNCTION__);
   // If socket is there already and it is bound to a different port, it must
   // be closed first
-  if (Port != socketPort) {
+  if (portP != socketPortM) {
-     debug("cIptvSocket::OpenSocket(): Socket tear-down\n");
+     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)
+     if (isUdpP)
-        socketDesc = socket(PF_INET, SOCK_DGRAM, 0);
+        socketDescM = socket(PF_INET, SOCK_DGRAM, 0);
      else
-        socketDesc = socket(PF_INET, SOCK_STREAM, 0);
+        socketDescM = socket(PF_INET, SOCK_STREAM, 0);
-     ERROR_IF_RET(socketDesc < 0, "socket()", return false);
+     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)",
+     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)",
+     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));
+     memset(&sockAddrM, 0, sizeof(sockAddrM));
-     sockAddr.sin_family = AF_INET;
+     sockAddrM.sin_family = AF_INET;
-     sockAddr.sin_port = htons((uint16_t)(Port & 0xFFFF));
+     sockAddrM.sin_port = htons((uint16_t)(portP & 0xFFFF));
-     sockAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+     sockAddrM.sin_addr.s_addr = htonl(INADDR_ANY);
-     if (isUdp) {
+     if (isUdpP)
-        int err = bind(socketDesc, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
+        ERROR_IF_FUNC(bind(socketDescM, (struct sockaddr *)&sockAddrM, sizeof(sockAddrM)) < 0, "bind()", CloseSocket(), return false);
-        ERROR_IF_FUNC(err < 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) {
+  if (socketDescM >= 0) {
-     close(socketDesc);
+     close(socketDescM);
-     socketDesc = -1;
+     socketDescM = -1;
-     socketPort = 0;
+     socketPortM = 0;
-     memset(&sockAddr, 0, sizeof(sockAddr));
+     memset(&sockAddrM, 0, sizeof(sockAddrM));
      }
 }
 
+bool cIptvSocket::CheckAddress(const char *addrP, in_addr_t *inAddrP)
+{
+  if (inAddrP) {
+     // First try only the IP address
+     *inAddrP = htonl(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 = htonl(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");
+  debug("cIptvUdpSocket::%s()", __FUNCTION__);
-  streamAddr = StreamAddr;
+  streamAddrM = htonl(INADDR_ANY);
-  return cIptvSocket::OpenSocket(Port, true);
+  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");
+  debug("cIptvUdpSocket::%s()", __FUNCTION__);
-  streamAddr = INADDR_ANY;
+  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;
+     if (useIGMPv3M) {
-     mreq.imr_multiaddr.s_addr = streamAddr;
+        // Source-specific multicast (SSM) is used
-     mreq.imr_interface.s_addr = htonl(INADDR_ANY);
+        struct group_source_req gsr;
-     ERROR_IF_RET(setsockopt(socketDesc, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0, "setsockopt(IP_ADD_MEMBERSHIP)", return false);
+        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;
+     if (useIGMPv3M) {
-     mreq.imr_multiaddr.s_addr = streamAddr;
+        // Source-specific multicast (SSM) is used
-     mreq.imr_interface.s_addr = htonl(INADDR_ANY);
+        struct group_source_req gsr;
-     ERROR_IF_RET(setsockopt(socketDesc, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0, "setsockopt(IP_DROP_MEMBERSHIP)", return false);
+        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) {
+  if (socketDescM <= 0) {
-     error("Invalid socket in %s\n", __FUNCTION__);
+     error("Invalid socket in cIptvUdpSocket::%s()\n", __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_base = bufferAddrP;
-    iov.iov_len = BufferLen;
+    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))
+    if (isActiveM && socketDescM && bufferAddrP && (bufferLenP > 0))
-       len = (int)recvmsg(socketDesc, &msgh, MSG_DONTWAIT);
+       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 ((i->ipi_addr.s_addr == streamAddrM) || (htonl(INADDR_ANY) == streamAddrM)) {
 #endif // __FreeBSD__
-                 if (BufferAddr[0] == TS_SYNC_BYTE)
+                 if (bufferAddrP[0] == TS_SYNC_BYTE)
                     return len;
                  else if (len > 3) {
-                    // http://www.networksorcery.com/enp/rfc/rfc2250.txt
+                    // http://tools.ietf.org/html/rfc3550
+                    // http://tools.ietf.org/html/rfc2250
                     // version
-                    unsigned int v = (BufferAddr[0] >> 6) & 0x03;
+                    unsigned int v = (bufferAddrP[0] >> 6) & 0x03;
                     // extension bit
-                    unsigned int x = (BufferAddr[0] >> 4) & 0x01;
+                    unsigned int x = (bufferAddrP[0] >> 4) & 0x01;
                     // cscr count
-                    unsigned int cc = BufferAddr[0] & 0x0F;
+                    unsigned int cc = bufferAddrP[0] & 0x0F;
                     // payload type: MPEG2 TS = 33
-                    //unsigned int pt = readBuffer[1] & 0x7F;
+                    //unsigned int pt = bufferAddrP[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 = (((BufferAddr[headerlen + 2] & 0xFF) << 8) |
+                       unsigned int ehl = (((bufferAddrP[headerlen + 2] & 0xFF) << 8) |
-                                           (BufferAddr[headerlen + 3] & 0xFF));
+                                           (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);
                        }
                     }
@@ -234,63 +305,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);
+  return (cIptvSocket::OpenSocket(portP, false) && CheckAddress(streamAddrP, &sockAddrM.sin_addr.s_addr));
-
-  // 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;
 }
 
 void cIptvTcpSocket::CloseSocket(void)
 {
-  debug("cIptvTcpSocket::CloseSocket()\n");
+  debug("cIptvTcpSocket::%s()", __FUNCTION__);
   cIptvSocket::CloseSocket();
 }
 
 bool cIptvTcpSocket::ConnectSocket(void)
 {
-  debug("cIptvTcpSocket::ConnectSocket()\n");
+  debug("cIptvTcpSocket::%s()", __FUNCTION__);
-  if (!isActive && (socketDesc >= 0)) {
+  if (!isActiveM && (socketDescM >= 0)) {
-     int retval = connect(socketDesc, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
+     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];
@@ -302,41 +352,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) {
+  if (socketDescM <= 0) {
-     error("Invalid socket in %s\n", __FUNCTION__);
+     error("Invalid socket in cIptvTcpSocket::%s()\n", __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))
+  if (isActiveM && socketDescM && bufferAddrP && (bufferLenP > 0))
-     len = (int)recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
+     len = (int)recvfrom(socketDescM, bufferAddrP, bufferLenP, MSG_DONTWAIT,
-                         (struct sockaddr *)&sockAddr, &addrlen);
+                         (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) {
+  if (socketDescM <= 0) {
-     error("Invalid socket in %s\n", __FUNCTION__);
+     error("Invalid socket in cIptvTcpSocket::%s()\n", __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,
+     retval = (int)recvfrom(socketDescM, bufferAddrP, 1, MSG_DONTWAIT,
-                            (struct sockaddr *)&sockAddr, &addrlen);
+                            (struct sockaddr *)&sockAddrM, &addrlen);
      if (retval <= 0)
         return false;
      }
@@ -344,15 +394,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) {
+  if (socketDescM <= 0) {
-     error("Invalid socket in %s\n", __FUNCTION__);
+     error("Invalid socket in cIptvTcpSocket::%s()\n", __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.
  *
@@ -15,16 +15,17 @@
 
 class cIptvSocket {
 private:
-  int socketPort;
+  int socketPortM;
 
 protected:
-  int socketDesc;
+  int socketDescM;
-  struct sockaddr_in sockAddr;
+  struct sockaddr_in sockAddrM;
-  bool isActive;
+  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();
@@ -33,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);
+  virtual int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
-  bool OpenSocket(const int Port, const in_addr_t StreamAddr = INADDR_ANY);
+  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);
@@ -49,12 +53,12 @@ class cIptvTcpSocket : public cIptvSocket {
 public:
   cIptvTcpSocket();
   virtual ~cIptvTcpSocket();
-  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen);
+  virtual int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
-  bool OpenSocket(const int Port, const char *StreamAddr);
+  bool OpenSocket(const int portP, const char *streamAddrP);
   void CloseSocket(void);
   bool ConnectSocket(void);
-  bool ReadChar(char* BufferAddr, unsigned int TimeoutMs);
+  bool ReadChar(char* bufferAddrP, unsigned int timeoutMsP);
-  bool Write(const char* BufferAddr, unsigned int BufferLen);
+  bool Write(const char* bufferAddrP, unsigned int bufferLenP);
 };
 
 #endif // __IPTV_SOCKET_H

source.c

@@ -10,28 +10,31 @@
 
 // --- cIptvTransponderParameters --------------------------------------------
 
-cIptvTransponderParameters::cIptvTransponderParameters(const char *Parameters)
+cIptvTransponderParameters::cIptvTransponderParameters(const char *parametersP)
-: sidscan(0),
+: sidScanM(0),
-  pidscan(0),
+  pidScanM(0),
-  protocol(eProtocolUDP),
+  protocolM(eProtocolUDP),
-  parameter(0)
+  parameterM(0)
 {
-  debug("cIptvTransponderParameters::cIptvTransponderParameters(): Parameters=%s\n", Parameters);
+  debug("cIptvTransponderParameters::%s(%s)", __FUNCTION__, parametersP);
 
-  memset(&address, 0, sizeof(address));
+  memset(&addressM, 0, sizeof(addressM));
-  Parse(Parameters);
+  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 +46,17 @@ 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 *saveptr = NULL;
      char *token = NULL;
      bool found_s = false;
@@ -69,37 +72,41 @@ bool cIptvTransponderParameters::Parse(const char *s)
           ++data;
           switch (*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:
@@ -122,54 +129,57 @@ bool cIptvTransponderParameters::Parse(const char *s)
 
 // --- cIptvSourceParam ------------------------------------------------------
 
-cIptvSourceParam::cIptvSourceParam(char Source, const char *Description)
+const char *cIptvSourceParam::allowedProtocolCharsS = " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]()*+?{}/%@&=";
-  : cSourceParam(Source, Description),
-    param(0),
-    nid(0),
-    tid(0),
-    rid(0),
-    data(),
-    itp()
-{
-  debug("cIptvSourceParam::cIptvSourceParam(): Source=%c Description=%s\n", Source, Description);
 
-  protocols[cIptvTransponderParameters::eProtocolUDP]  = tr("UDP");
+cIptvSourceParam::cIptvSourceParam(char sourceP, const char *descriptionP)
-  protocols[cIptvTransponderParameters::eProtocolHTTP] = tr("HTTP");
+  : cSourceParam(sourceP, descriptionP),
-  protocols[cIptvTransponderParameters::eProtocolFILE] = tr("FILE");
+    paramM(0),
-  protocols[cIptvTransponderParameters::eProtocolEXT]  = tr("EXT");
+    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());
+  debug("cIptvSourceParam::%s(%s)", __FUNCTION__, channelP->Parameters());
-  data = *Channel;
+  dataM = *channelP;
-  nid = data.Nid();
+  nidM = dataM.Nid();
-  tid = data.Tid();
+  tidM = dataM.Tid();
-  rid = data.Rid();
+  ridM = dataM.Rid();
-  itp.Parse(data.Parameters());
+  itpM.Parse(dataM.Parameters());
-  param = 0;
+  paramM = 0;
 }
 
-void cIptvSourceParam::GetData(cChannel *Channel)
+void cIptvSourceParam::GetData(cChannel *channelP)
 {
-  debug("cIptvSourceParam::GetData(): Channel=%s\n", Channel->Parameters());
+  debug("cIptvSourceParam::%s(%s)", __FUNCTION__, channelP->Parameters());
-  data.SetTransponderData(Channel->Source(), Channel->Frequency(), data.Srate(), itp.ToString(Source()), true);
+  dataM.SetTransponderData(channelP->Source(), channelP->Frequency(), dataM.Srate(), itpM.ToString(Source()), true);
-  data.SetId(nid, tid, Channel->Sid(), rid);
+  dataM.SetId(nidM, tidM, channelP->Sid(), ridM);
-  *Channel = data;
+  *channelP = dataM;
 }
 
 cOsdItem *cIptvSourceParam::GetOsdItem(void)
 {
-  debug("cIptvSourceParam::GetOsdItem()\n");
+  debug("cIptvSourceParam::%s()", __FUNCTION__);
-  switch (param++) {
+  switch (paramM++) {
-    case  0: return new cMenuEditIntItem( tr("Nid"),              &nid, 0);
+    case  0: return new cMenuEditIntItem( tr("Nid"),              &nidM, 0);
-    case  1: return new cMenuEditIntItem( tr("Tid"),              &tid, 0);
+    case  1: return new cMenuEditIntItem( tr("Tid"),              &tidM, 0);
-    case  2: return new cMenuEditIntItem( tr("Rid"),              &rid, 0);
+    case  2: return new cMenuEditIntItem( tr("Rid"),              &ridM, 0);
-    case  3: return new cMenuEditBoolItem(tr("Scan section ids"), &itp.sidscan);
+    case  3: return new cMenuEditBoolItem(tr("Scan section ids"), &itpM.sidScanM);
-    case  4: return new cMenuEditBoolItem(tr("Scan pids"),        &itp.pidscan);
+    case  4: return new cMenuEditBoolItem(tr("Scan pids"),        &itpM.pidScanM);
-    case  5: return new cMenuEditStraItem(tr("Protocol"),         &itp.protocol,  ELEMENTS(protocols), protocols);
+    case  5: return new cMenuEditStraItem(tr("Protocol"),         &itpM.protocolM,  ELEMENTS(protocolsM),  protocolsM);
-    case  6: return new cMenuEditStrItem( tr("Address"),           itp.address,   sizeof(itp.address));
+    case  6: return new cMenuEditStrItem( tr("Address"),           itpM.addressM,   sizeof(itpM.addressM), allowedProtocolCharsS);
-    case  7: return new cMenuEditIntItem( tr("Parameter"),        &itp.parameter, 0,                   0xFFFF);
+    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 sidScanM;
-  int pidscan;
+  int pidScanM;
-  int protocol;
+  int protocolM;
-  char address[MaxFileName];
+  char addressM[NAME_MAX];
-  int parameter;
+  int parameterM;
 
 public:
   enum {
     eProtocolUDP,
+    eProtocolCURL,
     eProtocolHTTP,
     eProtocolFILE,
     eProtocolEXT,
     eProtocolCount
   };
-  cIptvTransponderParameters(const char *Parameters = NULL);
+  cIptvTransponderParameters(const char *parametersP = NULL);
-  int SidScan(void) const { return sidscan; }
+  int SidScan(void) const { return sidScanM; }
-  int PidScan(void) const { return pidscan; }
+  int PidScan(void) const { return pidScanM; }
-  int Protocol(void) const { return protocol; }
+  int Protocol(void) const { return protocolM; }
-  const char *Address(void) const { return address; }
+  const char *Address(void) const { return addressM; }
-  int Parameter(void) const { return parameter; }
+  int Parameter(void) const { return parameterM; }
-  void SetSidScan(int SidScan) { sidscan = SidScan; }
+  void SetSidScan(int sidScanP) { sidScanM = sidScanP; }
-  void SetPidScan(int PidScan) { pidscan = PidScan; }
+  void SetPidScan(int pidScanP) { pidScanM = pidScanP; }
-  void SetProtocol(int Protocol) { protocol = Protocol; }
+  void SetProtocol(int protocolP) { protocolM = protocolP; }
-  void SetAddress(const char *Address) { strncpy(address, Address, sizeof(address)); }
+  void SetAddress(const char *addressP) { strncpy(addressM, addressP, sizeof(addressM)); }
-  void SetParameter(int Parameter) { parameter = Parameter; }
+  void SetParameter(int parameterP) { parameterM = parameterP; }
-  cString ToString(char Type) const;
+  cString ToString(char typeP) const;
-  bool Parse(const char *s);
+  bool Parse(const char *strP);
 };
 
 class cIptvSourceParam : public cSourceParam
 {
 private:
-  int param;
+  int paramM;
-  int nid;
+  int nidM;
-  int tid;
+  int tidM;
-  int rid;
+  int ridM;
-  cChannel data;
+  cChannel dataM;
-  cIptvTransponderParameters itp;
+  cIptvTransponderParameters itpM;
-  const char *protocols[cIptvTransponderParameters::eProtocolCount];
+  const char *protocolsM[cIptvTransponderParameters::eProtocolCount];
+
+private:
+  static const char *allowedProtocolCharsS;
 
 public:
-  cIptvSourceParam(char Source, const char *Description);
+  cIptvSourceParam(char sourceP, const char *descriptionP);
-  virtual void SetData(cChannel *Channel);
+  virtual void SetData(cChannel *channelP);
-  virtual void GetData(cChannel *Channel);
+  virtual void GetData(cChannel *channelP);
   virtual cOsdItem *GetOsdItem(void);
 };
 

statistics.c

@@ -11,87 +11,87 @@
 #include "statistics.h"
 #include "config.h"
 
-// Section statistic class
+// Section statistics class
 cIptvSectionStatistics::cIptvSectionStatistics()
-: filteredData(0),
+: filteredDataM(0),
-  numberOfCalls(0),
+  numberOfCallsM(0),
-  timer(),
+  timerM(),
-  mutex()
+  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");
+  //debug("cIptvSectionStatistics::%s()", __FUNCTION__);
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(&mutexM);
-  uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
+  uint64_t elapsed = timerM.Elapsed(); /* in milliseconds */
-  timer.Set();
+  timerM.Set();
-  long bitrate = elapsed ? (long)(1000.0L * filteredData / KILOBYTE(1) / elapsed) : 0L;
+  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,
+  cString s = cString::sprintf("%4ld (%4ld k%s/s)", numberOfCallsM, bitrate,
-                                  IptvConfig.GetUseBytes() ? "B" : "bit");
+                               IptvConfig.GetUseBytes() ? "B" : "bit");
-  filteredData = numberOfCalls = 0;
+  filteredDataM = numberOfCallsM = 0;
-  return info;
+  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); 
+  //debug("cIptvSectionStatistics::%s(%ld, %ld)", __FUNCTION__, bytesP, callsP); 
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(&mutexM);
-  filteredData += Bytes;
+  filteredDataM += bytesP;
-  numberOfCalls += Calls;
+  numberOfCallsM += callsP;
 }
 
 // --- cIptvPidStatistics ----------------------------------------------------
 
-// Device statistic class
+// Device statistics class
 cIptvPidStatistics::cIptvPidStatistics()
-: timer(),
+: timerM(),
-  mutex()
+  mutexM()
 {
-  debug("cIptvPidStatistics::cIptvPidStatistics()\n");
+  debug("cIptvPidStatistics::%s()", __FUNCTION__);
-  memset(mostActivePids, '\0', sizeof(mostActivePids));
+  memset(mostActivePidsM, 0, sizeof(mostActivePidsM));
 }
 
 cIptvPidStatistics::~cIptvPidStatistics()
 {
-  debug("cIptvPidStatistics::~cIptvPidStatistics()\n");
+  debug("cIptvPidStatistics::%s()", __FUNCTION__);
 }
 
 cString cIptvPidStatistics::GetPidStatistic()
 {
-  //debug("cIptvPidStatistics::GetStatistic()\n");
+  //debug("cIptvPidStatistics::%s()", __FUNCTION__);
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(&mutexM);
-  uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
+  uint64_t elapsed = timerM.Elapsed(); /* in milliseconds */
-  timer.Set();
+  timerM.Set();
-  cString info("Active pids:\n");
+  cString s("Active pids:\n");
   for (unsigned int i = 0; i < IPTV_STATS_ACTIVE_PIDS_COUNT; ++i) {
-      if (mostActivePids[i].pid) {
+      if (mostActivePidsM[i].pid) {
-         long bitrate = elapsed ? (long)(1000.0L * mostActivePids[i].DataAmount / KILOBYTE(1) / elapsed) : 0L;
+         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,
+         s = cString::sprintf("%sPid %d: %4d (%4ld k%s/s)\n", *s, i,
-                                 mostActivePids[i].pid, bitrate,
+                              mostActivePidsM[i].pid, bitrate,
-                                 IptvConfig.GetUseBytes() ? "B" : "bit");
+                              IptvConfig.GetUseBytes() ? "B" : "bit");
          }
       }
-  memset(mostActivePids, '\0', sizeof(mostActivePids));
+  memset(mostActivePidsM, 0, sizeof(mostActivePidsM));
-  return info;
+  return s;
 }
 
-int cIptvPidStatistics::SortPids(const void* data1, const void* data2)
+int cIptvPidStatistics::SortPids(const void* data1P, const void* data2P)
 {
-  //debug("cIptvPidStatistics::SortPids()\n");
+  //debug("cIptvPidStatistics::%s()", __FUNCTION__);
-  pidStruct *comp1 = (pidStruct*)data1;
+  const pidStruct *comp1 = reinterpret_cast<const pidStruct*>(data1P);
-  pidStruct *comp2 = (pidStruct*)data2;
+  const pidStruct *comp2 = reinterpret_cast<const pidStruct*>(data2P);
   if (comp1->DataAmount > comp2->DataAmount)
      return -1;
   if (comp1->DataAmount < comp2->DataAmount)
@@ -99,113 +99,113 @@ int cIptvPidStatistics::SortPids(const void* data1, const void* data2)
   return 0;
 }
 
-void cIptvPidStatistics::AddPidStatistic(u_short Pid, long Payload)
+void cIptvPidStatistics::AddPidStatistic(u_short pidP, long payloadP)
 {
-  //debug("cIptvPidStatistics::AddStatistic(pid=%ld, payload=%ld)\n", Pid, Payload);
+  //debug("cIptvPidStatistics::%s(%ld, %ld)", __FUNCTION__, pidP, payloadP);
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(&mutexM);
-  const int numberOfElements = sizeof(mostActivePids) / sizeof(pidStruct);
+  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) {
+      if (mostActivePidsM[i].pid == pidP) {
-         mostActivePids[i].DataAmount += Payload;
+         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) {
+  if (mostActivePidsM[numberOfElements - 1].DataAmount < payloadP) {
-      mostActivePids[numberOfElements - 1].pid = Pid;
+      mostActivePidsM[numberOfElements - 1].pid = pidP;
-      mostActivePids[numberOfElements - 1].DataAmount = Payload;
+      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),
+: dataBytesM(0),
-  timer(),
+  timerM(),
-  mutex()
+  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");
+  //debug("cIptvStreamerStatistics::%s()", __FUNCTION__);
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(&mutexM);
-  uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
+  uint64_t elapsed = timerM.Elapsed(); /* in milliseconds */
-  timer.Set();
+  timerM.Set();
-  long bitrate = elapsed ? (long)(1000.0L * dataBytes / KILOBYTE(1) / elapsed) : 0L;
+  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");
+  cString s = cString::sprintf("%ld k%s/s", bitrate, IptvConfig.GetUseBytes() ? "B" : "bit");
-  dataBytes = 0;
+  dataBytesM = 0;
-  return info;
+  return s;
 }
 
-void cIptvStreamerStatistics::AddStreamerStatistic(long Bytes)
+void cIptvStreamerStatistics::AddStreamerStatistic(long bytesP)
 {
-  //debug("cIptvStreamerStatistics::AddStatistic(Bytes=%ld)\n", Bytes);
+  //debug("cIptvStreamerStatistics::%s(%ld)", __FUNCTION__, bytesP);
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(&mutexM);
-  dataBytes += Bytes;
+  dataBytesM += bytesP;
 }
 
 
-// Buffer statistic class
+// Buffer statistics class
 cIptvBufferStatistics::cIptvBufferStatistics()
-: dataBytes(0),
+: dataBytesM(0),
-  freeSpace(0),
+  freeSpaceM(0),
-  usedSpace(0),
+  usedSpaceM(0),
-  timer(),
+  timerM(),
-  mutex()
+  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");
+  //debug("cIptvBufferStatistics::%s()", __FUNCTION__);
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(&mutexM);
-  uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
+  uint64_t elapsed = timerM.Elapsed(); /* in milliseconds */
-  timer.Set();
+  timerM.Set();
-  long bitrate = elapsed ? (long)(1000.0L * dataBytes / KILOBYTE(1) / elapsed) : 0L;
+  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,
+  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", usedKilos, totalKilos,
-                                  IptvConfig.GetUseBytes() ? "B" : "bit", percentage);
+                               IptvConfig.GetUseBytes() ? "B" : "bit", percentage);
-  dataBytes = 0;
+  dataBytesM = 0;
-  usedSpace = 0;
+  usedSpaceM = 0;
-  return info;
+  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);
+  //debug("cIptvBufferStatistics::%s(%ld, %ld)", __FUNCTION__, bytesP, usedP);
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(&mutexM);
-  dataBytes += Bytes;
+  dataBytesM += bytesP;
-  if (Used > usedSpace)
+  if (usedP > usedSpaceM)
-     usedSpace = Used;
+     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 filteredDataM;
-  long numberOfCalls;
+  long numberOfCallsM;
-  cTimeMs timer;
+  cTimeMs timerM;
-  cMutex mutex;
+  cMutex mutexM;
 };
 
 // Pid statistics
@@ -35,19 +35,19 @@ public:
   cString GetPidStatistic();
 
 protected:
-  void AddPidStatistic(u_short Pid, long Payload);
+  void AddPidStatistic(u_short pidP, long payloadP);
 
 private:
   struct pidStruct {
     u_short pid;
     long DataAmount;
   };
-  pidStruct mostActivePids[IPTV_STATS_ACTIVE_PIDS_COUNT];
+  pidStruct mostActivePidsM[IPTV_STATS_ACTIVE_PIDS_COUNT];
-  cTimeMs timer;
+  cTimeMs timerM;
-  cMutex mutex;
+  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;
+  long dataBytesM;
-  cTimeMs timer;
+  cTimeMs timerM;
-  cMutex mutex;
+  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 dataBytesM;
-  long freeSpace;
+  long freeSpaceM;
-  long usedSpace;
+  long usedSpaceM;
-  cTimeMs timer;
+  cTimeMs timerM;
-  cMutex mutex;
+  cMutex mutexM;
 };
 
 #endif // __IPTV_STATISTICS_H

streamer.c

@@ -11,61 +11,61 @@
 #include "common.h"
 #include "streamer.h"
 
-cIptvStreamer::cIptvStreamer(cRingBufferLinear* RingBuffer, unsigned int PacketLen)
+cIptvStreamer::cIptvStreamer(cRingBufferLinear* ringBufferP, unsigned int packetLenP)
 : cThread("IPTV streamer"),
-  ringBuffer(RingBuffer),
+  ringBufferM(ringBufferP),
-  packetBufferLen(PacketLen),
+  packetBufferLenM(packetLenP),
-  protocol(NULL)
+  protocolM(NULL)
 {
-  debug("cIptvStreamer::cIptvStreamer(%d)\n", packetBufferLen);
+  debug("cIptvStreamer::%s(%d)", __FUNCTION__, packetBufferLenM);
   // Allocate packet buffer
-  packetBuffer = MALLOC(unsigned char, packetBufferLen);
+  packetBufferM = MALLOC(unsigned char, packetBufferLenM);
-  if (packetBuffer)
+  if (packetBufferM)
-     memset(packetBuffer, 0, packetBufferLen);
+     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;
+  protocolM = NULL;
-  ringBuffer = NULL;
+  ringBufferM = 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)
+        if (protocolM)
-           length = protocol->Read(packetBuffer, packetBufferLen);
+           length = protocolM->Read(packetBufferM, min((unsigned int)ringBufferM->Free(), packetBufferLenM));
         if (length > 0) {
            AddStreamerStatistic(length);
-           if (ringBuffer) {
+           if (ringBufferM) {
-              int p = ringBuffer->Put(packetBuffer, length);
+              int p = ringBufferM->Put(packetBufferM, length);
               if (p != length)
-                 ringBuffer->ReportOverflow(length - p);
+                 ringBufferM->ReportOverflow(length - p);
               }
            }
         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 +74,42 @@ 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)
+  if (protocolM)
-     protocol->Close();
+     protocolM->Close();
   return true;
 }
 
-bool cIptvStreamer::Set(const char* Location, const int Parameter, const int Index, cIptvProtocolIf* Protocol)
+bool cIptvStreamer::Set(const char* locationP, const int parameterP, const int indexP, cIptvProtocolIf* protocolP)
 {
-  debug("cIptvStreamer::Set(): %s:%d\n", Location, Parameter);
+  debug("cIptvStreamer::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
-  if (!isempty(Location)) {
+  if (!isempty(locationP)) {
      // Update protocol and set location and parameter; Close the existing one if changed
-     if (protocol != Protocol) {
+     if (protocolM != protocolP) {
-        if (protocol)
+        if (protocolM)
-           protocol->Close();
+           protocolM->Close();
-        protocol = Protocol;
+        protocolM = protocolP;
-        if (protocol) {
+        if (protocolM) {
-           protocol->Set(Location, Parameter, Index);
+           protocolM->Set(locationP, parameterP, indexP);
-           protocol->Open();
+           protocolM->Open();
            }
         }
-     else if (protocol)
+     else if (protocolM)
-        protocol->Set(Location, Parameter, Index);
+        protocolM->Set(locationP, parameterP, indexP);
      }
   return true;
 }
 
 cString cIptvStreamer::GetInformation(void)
 {
-  //debug("cIptvStreamer::GetInformation()");
+  //debug("cIptvStreamer::%s()", __FUNCTION__);
-  cString info;
+  cString s;
-  if (protocol)
+  if (protocolM)
-     info = protocol->GetInformation();
+     s = protocolM->GetInformation();
-  return info;
+  return s;
 }

streamer.h

@@ -18,19 +18,19 @@
 
 class cIptvStreamer : public cThread, public cIptvStreamerStatistics {
 private:
-  cRingBufferLinear* ringBuffer;
+  cRingBufferLinear* ringBufferM;
-  cCondWait sleep;
+  cCondWait sleepM;
-  unsigned char* packetBuffer;
+  unsigned char* packetBufferM;
-  unsigned int packetBufferLen;
+  unsigned int packetBufferLenM;
-  cIptvProtocolIf* protocol;
+  cIptvProtocolIf* protocolM;
 
 protected:
   virtual void Action(void);
 
 public:
-  cIptvStreamer(cRingBufferLinear* RingBuffer, unsigned int PacketLen);
+  cIptvStreamer(cRingBufferLinear* ringBufferP, unsigned int packetLenP);
   virtual ~cIptvStreamer();
-  bool Set(const char* Location, const int Parameter, const int Index, cIptvProtocolIf* Protocol);
+  bool Set(const char* locationP, const int parameterP, const int indexP, cIptvProtocolIf* protocolP);
   bool Open(void);
   bool Close(void);
   cString GetInformation(void);