Removed the disable_ca_updates patch.

Updated for vdr-1.7.30 and added support for source-specific multicasts (SSM).
Changed default external script directory from the configuration to the resource.
2023-10-10 11:37:03 +00:00 · 2012-09-30 18:44:45 +03:00 · 2012-09-30 18:42:40 +03:00 · 2012-07-10 22:12:29 +03:00 · 2012-06-03 12:31:33 +03:00 · 2012-06-03 12:24:09 +03:00
37 changed files with 863 additions and 417 deletions
--- a/47
+++ b/47
@@ -141,3 +141,50 @@ VDR Plugin 'iptv' Revision History
 2010-06-06: Version 0.4.2

 - Updated for vdr-1.7.15.
+
+2012-02-02: Version 0.5.0
+
+- Updated for vdr-1.7.23.
+- Renamed Sid scanner to section id scanner and added
+  experimental Tid/Nid support into it.
+- Added optional source address validation for UDP protocol.
+- Fixed audio pid detection in pid scanner.
+- Changed ProvidesChannel() to set the need of detaching
+  receivers due to VDR's channel selection mechanism.
+- Enabled partial content responses for HTTP protocol.
+- Fixed EXT protocol execution (Thanks to Peter Holik).
+- Disable detaching of receivers if retuned to an existing
+  channel (Thanks to Zdeněk Kopřivík).
+- Canonicalized the configuration directory.
+- Added support for LDFLAGS.
+- Added cppcheck target into Makefile.
+
+2012-04-02: Version 0.5.1
+
+- Updated for vdr-1.7.27.
+- Updated Makefile.
+- Silenced compilation warnings.
+- Fixed channel switching bugs.
+- Added support for a service interface.
+- Changed UDP protocol to always utilize the source address
+  validation.
+
+2012-04-26: Version 0.5.2
+
+- Fixed connection problems in HTTP protocol.
+
+2012-06-03: Version 1.0.0
+
+- Optimized reading from UDP sockets.
+- Fixed ProvidesChannel method.
+
+2012-07-10: Version 1.0.1
+
+- Added FreeBSD support (Thanks to Jürgen Lock).
+
+2012-09-30: Version 1.1.0
+
+- Updated for vdr-1.7.30.
+- Added support for source-specific multicasts (SSM).
+- Changed default external script directory from the
+  configuration to the resource.
--- a/39
+++ b/39
@@ -5,9 +5,15 @@
 # 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
+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.
@@ -18,18 +24,20 @@ PLUGIN = iptv

 ### The version number of this plugin (taken from the main source file):

-VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+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 -O2 -Wall -Wextra -Wswitch-default -Wfloat-equal -Wundef -Wpointer-arith -Wconversion -Wcast-align -Wredundant-decls -Wno-unused-parameter -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -fPIC -g -O3 -Wall -Wextra -Wswitch-default -Wfloat-equal -Wundef -Wpointer-arith -Wconversion -Wcast-align -Wredundant-decls -Wno-unused-parameter -Werror=overloaded-virtual -Wno-parentheses
+LDFLAGS  ?= -Wl,--as-needed

 ### The directory environment:

-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp

 ### Make sure that necessary options are included:

@@ -58,6 +66,14 @@ ifdef IPTV_DEBUG
 DEFINES += -DDEBUG
 endif

+ifdef IPTV_EXTSHELL
+DEFINES += -DEXTSHELL='"$(IPTV_EXTSHELL)"'
+endif
+
+ifneq ($(strip $(GITTAG)),)
+DEFINES += -DGITVERSION='"-GIT-$(GITTAG)"'
+endif
+
 .PHONY: all all-redirect
 all-redirect: all

@@ -73,7 +89,7 @@ all: libvdr-$(PLUGIN).so i18n

 ### Implicit rules:

-%.o: %.c
+%.o: %.c Makefile
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<

 ### Dependencies:
@@ -97,7 +113,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<

 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='Rolf Ahrenberg' -o $@ $^
+	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 $@ $<
@@ -113,13 +129,13 @@ i18n: $(I18Nmsgs) $(I18Npot)
 ### Targets:

 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 ifndef IPTV_DEBUG
 	@$(STRIP) $@
 endif
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+	@$(INSTALL) $@ $(LIBDIR)/$@.$(APIVERSION)

-dist: clean
+dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
@@ -129,3 +145,6 @@ dist: clean

 clean:
 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
+
+cppcheck: $(OBJS)
+	@cppcheck --enable=information,style,unusedFunction -v -f $(OBJS:%.o=%.c)
--- a/37
+++ b/37
@@ -44,7 +44,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,34 +91,38 @@ 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=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")
           |  |   |   |     |           Stream parameter (multicast port
           |  |   |   |     |           number, HTTP port number, file delay
           |  |   |   |     |           (ms), script parameter)
-           |  |   |   |     Stream address (multicast address, URL, file
-           |  |   |   |     location, script location)
+           |  |   |   |     Stream address (multicast source@group address,
+           |  |   |   |     URL, file location, script location)
           |  |   |   Stream protocol ("UDP", "HTTP", "FILE", "EXT")
-           |  |   PID Scan ("0" disable, "1" enable)
-           |  SID Scan ("0" disable, "1" enable)
+           |  |   Pid scanner ("0" disable, "1" enable)
+           |  Section id (Sid/Nid/Tid) scanner ("0" disable, "1" enable)
           Unique enumeration

 - UDP multicast rules for iptables firewall

-  # Multicast UDP -packets
+  # Multicast UDP packets
  iptables -A INPUT -i eth0 -p udp -d 224.0.0.0/4 --dport 1234 -j ACCEPT

  # IGMP required by multicasts
  iptables -A INPUT -i eth0 -p igmp -d 224.0.0.0/4 -j ACCEPT

+  # Default routing for multicast
+  route add -net 224.0.0.0 netmask 224.0.0.0 eth0
+
 External streaming:

 - To watch an externally received channel add an EXT entry to channels.conf
  and specify a script name and parameter. The specified script is executed
-  from plugin configuration directory when VDR tunes to the channel. The
-  specified script parameter is passed to the script and it can be used to
-  select for example between different URLs.
+  from plugin resource directory when VDR tunes to the channel. The specified
+  script parameter is passed to the script and it can be used to select for
+  example between different URLs.

 - When an EXT channel is opened the IPTV plugin opens an UDP listening port
  on the localhost. The external script is responsible for supplying IPTV
@@ -154,6 +158,21 @@ Notes:
  script and the iptvstream-notrap.sh script should be used instead in these
  cases.

+- If received MPEG-2 TS streams carry CA descriptors, you'll have to apply
+  "disable_ca_updates" patch to the VDR in order to get rid of "Channel not
+  available" messages.
+
+- EIT scanning functionality can be disabled for all IPTV channels by applying
+  the "disable_eitscan" patch to the VDR.
+
+- 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>"
+
 Acknowledgements:

 - The IPTV section filtering code is derived from Linux kernel.
--- a/common.h
+++ b/common.h
@@ -30,6 +30,8 @@
 #define IPTV_DEVICE_INFO_GENERAL        1
 #define IPTV_DEVICE_INFO_PIDS           2
 #define IPTV_DEVICE_INFO_FILTERS        3
+#define IPTV_DEVICE_INFO_PROTOCOL       4
+#define IPTV_DEVICE_INFO_BITRATE        5

 #define IPTV_STATS_ACTIVE_PIDS_COUNT    10
 #define IPTV_STATS_ACTIVE_FILTERS_COUNT 10
@@ -37,13 +39,14 @@
 #define SECTION_FILTER_TABLE_SIZE       7

 #define ERROR_IF_FUNC(exp, errstr, func, ret) \
-  do {                                                            \
-     if (exp) {                                                   \
-        char tmp[64];                                             \
-        error(errstr": %s", strerror_r(errno, tmp, sizeof(tmp))); \
-        func;                                                     \
-        ret;                                                      \
-        }                                                         \
+  do {                                        \
+     if (exp) {                               \
+        char tmp[64];                         \
+        strerror_r(errno, tmp, sizeof(tmp));  \
+        error(errstr": %s", tmp);             \
+        func;                                 \
+        ret;                                  \
+        }                                     \
  } while (0)


@@ -77,5 +80,7 @@ struct section_filter_table_type {

 extern const section_filter_table_type section_filter_table[SECTION_FILTER_TABLE_SIZE];

+extern const char VERSION[];
+
 #endif // __IPTV_COMMON_H

--- a/config.c
+++ b/config.c
@@ -42,6 +42,6 @@ void cIptvConfig::SetDisabledFilters(unsigned int Index, int Number)

 void cIptvConfig::SetConfigDirectory(const char *directoryP)
 {
-  debug("cIptvConfig::SetConfigDirectory(%s)", directoryP);
-  strn0cpy(configDirectory, directoryP, sizeof(configDirectory));
+  debug("cIptvConfig::SetConfigDirectory(%s)\n", directoryP);
+  ERROR_IF(!realpath(directoryP, configDirectory), "Cannot canonicalize configuration directory");
 }
--- a/config.h
+++ b/config.h
@@ -20,7 +20,7 @@ private:
  unsigned int useBytes;
  unsigned int sectionFiltering;
  int disabledFilters[SECTION_FILTER_TABLE_SIZE];
-  char configDirectory[255];
+  char configDirectory[PATH_MAX];

 public:
  cIptvConfig();
--- a/device.c
+++ b/device.c
@@ -21,7 +21,8 @@ cIptvDevice::cIptvDevice(unsigned int Index)
  isPacketDelivered(false),
  isOpenDvr(false),
  sidScanEnabled(false),
-  pidScanEnabled(false)
+  pidScanEnabled(false),
+  channelId(tChannelID::InvalidID)
 {
  unsigned int bufsize = (unsigned int)MEGABYTE(IptvConfig.GetTsBufferSize());
  bufsize -= (bufsize % TS_SIZE);
@@ -35,13 +36,13 @@ cIptvDevice::cIptvDevice(unsigned int Index)
  pFileProtocol = new cIptvProtocolFile();
  pExtProtocol = new cIptvProtocolExt();
  pIptvStreamer = new cIptvStreamer(tsBuffer, (100 * TS_SIZE));
-  pPidScanner = new cPidScanner;
+  pPidScanner = new cPidScanner();
  // Initialize filter pointers
  memset(secfilters, '\0', sizeof(secfilters));
  // Start section handler for iptv device
  StartSectionHandler();
  // Sid scanner must be created after the section handler
-  pSidScanner = new cSidScanner;
+  pSidScanner = new cSidScanner();
  if (pSidScanner)
     AttachFilter(pSidScanner);
  // Check if dvr fifo exists
@@ -122,7 +123,7 @@ cIptvDevice *cIptvDevice::GetIptvDevice(int CardIndex)
 cString cIptvDevice::GetGeneralInformation(void)
 {
  //debug("cIptvDevice::GetGeneralInformation(%d)\n", deviceIndex);
-  return cString::sprintf("IPTV device: %d\nCardIndex: %d\n%s%s%sChannel: %s",
+  return cString::sprintf("IPTV device: %d\nCardIndex: %d\nStream: %s\nStream bitrate: %s\n%sChannel: %s",
                          deviceIndex, CardIndex(),
                          pIptvStreamer ? *pIptvStreamer->GetInformation() : "",
                          pIptvStreamer ? *pIptvStreamer->GetStreamerStatistic() : "",
@@ -168,6 +169,12 @@ cString cIptvDevice::GetInformation(unsigned int Page)
    case IPTV_DEVICE_INFO_FILTERS:
         info = GetFiltersInformation();
         break;
+    case IPTV_DEVICE_INFO_PROTOCOL:
+         info = pIptvStreamer ? *pIptvStreamer->GetInformation() : "";
+         break;
+    case IPTV_DEVICE_INFO_BITRATE:
+         info = pIptvStreamer ? *pIptvStreamer->GetStreamerStatistic() : "";
+         break;
    default:
         info = cString::sprintf("%s%s%s",
                                 *GetGeneralInformation(),
@@ -178,6 +185,30 @@ cString cIptvDevice::GetInformation(unsigned int Page)
  return info;
 }

+cString cIptvDevice::DeviceType(void) const
+{
+  debug("cIptvDevice::DeviceType(%d)\n", deviceIndex);
+  return "IPTV";
+}
+
+cString cIptvDevice::DeviceName(void) const
+{
+  debug("cIptvDevice::DeviceName(%d)\n", deviceIndex);
+  return cString::sprintf("IPTV %d", deviceIndex);
+}
+
+int cIptvDevice::SignalStrength(void) const
+{
+  debug("cIptvDevice::SignalStrength(%d)\n", deviceIndex);
+  return (100);
+}
+
+int cIptvDevice::SignalQuality(void) const
+{
+  debug("cIptvDevice::SignalQuality(%d)\n", deviceIndex);
+  return (100);
+}
+
 bool cIptvDevice::ProvidesSource(int Source) const
 {
  debug("cIptvDevice::ProvidesSource(%d)\n", deviceIndex);
@@ -193,16 +224,30 @@ bool cIptvDevice::ProvidesTransponder(const cChannel *Channel) const
 bool cIptvDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
 {
  bool result = false;
+  bool hasPriority = Priority == IDLEPRIORITY || Priority > this->Priority();
  bool needsDetachReceivers = false;

  debug("cIptvDevice::ProvidesChannel(%d)\n", deviceIndex);
-  if (ProvidesTransponder(Channel))
-     result = true;
+
+  if (Channel && ProvidesTransponder(Channel)) {
+     result = hasPriority;
+     if (Receiving()) {
+        if (Channel->GetChannelID() == channelId)
+           result = true;
+        else
+           needsDetachReceivers = Receiving();
+        }
+     }
  if (NeedsDetachReceivers)
     *NeedsDetachReceivers = needsDetachReceivers;
  return result;
 }

+bool cIptvDevice::ProvidesEIT(void) const
+{
+  return false;
+}
+
 int cIptvDevice::NumProvidedSystems(void) const
 {
  return 1;
@@ -214,7 +259,7 @@ bool cIptvDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
  cIptvTransponderParameters itp(Channel->Parameters());

  debug("cIptvDevice::SetChannelDevice(%d)\n", deviceIndex);
-  
+
  if (isempty(itp.Address())) {
     error("Unrecognized IPTV address: %s", Channel->Parameters());
     return false;
@@ -240,10 +285,11 @@ bool cIptvDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
  sidScanEnabled = itp.SidScan() ? true : false;
  pidScanEnabled = itp.PidScan() ? true : false;
  if (pIptvStreamer->Set(itp.Address(), itp.Parameter(), deviceIndex, protocol)) {
+     channelId = Channel->GetChannelID();
     if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
-        pSidScanner->SetChannel(Channel);
+        pSidScanner->SetChannel(channelId);
     if (pidScanEnabled && pPidScanner)
-        pPidScanner->SetChannel(Channel);
+        pPidScanner->SetChannel(channelId);
     }
  return true;
 }
@@ -297,26 +343,37 @@ int cIptvDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
  for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
      if (!secfilters[i]) {
         //debug("cIptvDevice::OpenFilter(%d): Pid=%d Tid=%02X Mask=%02X Index=%d\n", deviceIndex, Pid, Tid, Mask, i);
-         secfilters[i] = new cIptvSectionFilter(deviceIndex, i, Pid, Tid, Mask);
-         return secfilters[i]->GetReadDesc();
+         secfilters[i] = new cIptvSectionFilter(deviceIndex, Pid, Tid, Mask);
+         if (secfilters[i])
+            return i;
+         break;
         }
      }
  // No free filter slot found
  return -1;
 }

+int cIptvDevice::ReadFilter(int Handle, void *Buffer, size_t Length)
+{
+  // Lock
+  cMutexLock MutexLock(&mutex);
+  // ... and load
+  if (secfilters[Handle]) {
+     return secfilters[Handle]->Read(Buffer, Length);
+     //debug("cIptvDevice::ReadFilter(%d): %d %d\n", deviceIndex, Handle, Length);
+     }
+  return 0;
+}
+
 void cIptvDevice::CloseFilter(int Handle)
 {
  // Lock
  cMutexLock MutexLock(&mutex);
-  // Search the filter for deletion
-  for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
-      if (secfilters[i] && (Handle == secfilters[i]->GetReadDesc())) {
-         //debug("cIptvDevice::CloseFilter(%d): %d\n", deviceIndex, Handle);
-         DeleteFilter(i);
-         break;
-         }
-      }
+  // ... and load
+  if (secfilters[Handle]) {
+     //debug("cIptvDevice::CloseFilter(%d): %d\n", deviceIndex, Handle);
+     DeleteFilter(Handle);
+     }
 }

 bool cIptvDevice::OpenDvr(void)
@@ -349,6 +406,12 @@ bool cIptvDevice::HasLock(int TimeoutMs)
  return (!IsBuffering());
 }

+bool cIptvDevice::HasInternalCam(void)
+{
+  //debug("cIptvDevice::HasInternalCam(%d)\n", deviceIndex);
+  return true;
+}
+
 void cIptvDevice::ResetBuffering(void)
 {
  debug("cIptvDevice::ResetBuffering(%d)\n", deviceIndex);
@@ -370,7 +433,6 @@ bool cIptvDevice::IsBuffering(void)

 bool cIptvDevice::GetTSPacket(uchar *&Data)
 {
-  int Count = 0;
  //debug("cIptvDevice::GetTSPacket(%d)\n", deviceIndex);
  if (tsBuffer && !IsBuffering()) {
     if (isPacketDelivered) {
@@ -379,6 +441,7 @@ bool cIptvDevice::GetTSPacket(uchar *&Data)
        // Update buffer statistics
        AddBufferStatistic(TS_SIZE, tsBuffer->Available());
        }
+     int Count = 0;
     uchar *p = tsBuffer->Get(Count);
     if (p && Count >= TS_SIZE) {
        if (*p != TS_SYNC_BYTE) {
--- a/device.h
+++ b/device.h
@@ -41,6 +41,7 @@ private:
  bool pidScanEnabled;
  cRingBufferLinear *tsBuffer;
  int tsBufferPrefill;
+  tChannelID channelId;
  cIptvProtocolUdp *pUdpProtocol;
  cIptvProtocolHttp *pHttpProtocol;
  cIptvProtocolFile *pFileProtocol;
@@ -49,7 +50,7 @@ private:
  cPidScanner *pPidScanner;
  cSidScanner *pSidScanner;
  cMutex mutex;
-  cIptvSectionFilter* secfilters[eMaxSecFilterCount];
+  cIptvSectionFilter *secfilters[eMaxSecFilterCount];

  // constructor & destructor
 public:
@@ -74,11 +75,19 @@ private:
  bool DeleteFilter(unsigned int Index);
  bool IsBlackListed(u_short Pid, u_char Tid, u_char Mask) const;

+  // for channel info
+public:
+  virtual cString DeviceType(void) const;
+  virtual cString DeviceName(void) const;
+  virtual int SignalStrength(void) const;
+  virtual int SignalQuality(void) const;
+
  // for channel selection
 public:
  virtual bool ProvidesSource(int Source) const;
  virtual bool ProvidesTransponder(const cChannel *Channel) const;
  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
+  virtual bool ProvidesEIT(void) const;
  virtual int NumProvidedSystems(void) const;
 protected:
  virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
@@ -93,11 +102,16 @@ protected:
  // for section filtering
 public:
  virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
+  virtual int ReadFilter(int Handle, void *Buffer, size_t Length);
  virtual void CloseFilter(int Handle);

  // for transponder lock
 public:
  virtual bool HasLock(int);
+
+  // for common interface
+public:
+  virtual bool HasInternalCam(void);
 };

 #endif // __IPTV_DEVICE_H
--- a/iptv.c
+++ b/iptv.c
@@ -11,12 +11,17 @@
 #include "config.h"
 #include "setup.h"
 #include "device.h"
+#include "iptvservice.h"

-#if defined(APIVERSNUM) && APIVERSNUM < 10715
-#error "VDR-1.7.15 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10730
+#error "VDR-1.7.30 API version or greater is required!"
 #endif

-static const char VERSION[]     = "0.4.2";
+#ifndef GITVERSION
+#define GITVERSION ""
+#endif
+
+       const char VERSION[]     = "1.1.0" GITVERSION;
 static const char DESCRIPTION[] = trNOOP("Experience the IPTV");

 class cPluginIptv : public cPlugin {
@@ -94,7 +99,7 @@ bool cPluginIptv::Initialize(void)
 {
  debug("cPluginIptv::Initialize()\n");
  // 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);
 }

@@ -196,8 +201,18 @@ bool cPluginIptv::SetupParse(const char *Name, const char *Value)

 bool cPluginIptv::Service(const char *Id, void *Data)
 {
-  //debug("cPluginIptv::Service()\n");
-  // Handle custom service requests from other plugins
+  debug("cPluginIptv::Service()\n");
+  if (strcmp(Id,"IptvService-v1.0") == 0) {
+     if (Data) {
+        IptvService_v1_0 *data = (IptvService_v1_0*)Data;
+        cIptvDevice *dev = cIptvDevice::GetIptvDevice(data->cardIndex);
+        if (!dev)
+           return false;
+        data->protocol = dev->GetInformation(IPTV_DEVICE_INFO_PROTOCOL);
+        data->bitrate  = dev->GetInformation(IPTV_DEVICE_INFO_BITRATE);
+        }
+     return true;
+     }
  return false;
 }

--- a/iptv/iptvstream.sh
+++ b/iptv/iptvstream.sh
@@ -44,6 +44,7 @@ case ${PARAMETER} in
        URL=""
        WIDTH=720
        HEIGHT=576
+        FPS=25
        ;;
    2)
        URL=""
@@ -66,6 +67,9 @@ TRANSCODE_OPTS="vcodec=${VCODEC},acodec=${ACODEC},vb=${VBITRATE},ab=${ABITRATE}"
 if [ -n "${WIDTH}" -a -n "${HEIGHT}" ] ; then
    TRANSCODE_OPTS="${TRANSCODE_OPTS},width=${WIDTH},height=${HEIGHT}"
 fi
+if [ -n "${FPS}" ] ; then
+    TRANSCODE_OPTS="${TRANSCODE_OPTS},fps=${FPS}"
+fi

 # Create unique pids for the stream
 let VPID=${PARAMETER}+1
--- a/iptvservice.h
+++ b/iptvservice.h
@@ -0,0 +1,22 @@
+/*
+ * iptvservice.h: IPTV plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __IPTVSERVICE_H
+#define __IPTVSERVICE_H
+
+#include <vdr/tools.h>
+
+#define stIptv ('I' << 24)
+
+struct IptvService_v1_0 {
+  unsigned int cardIndex;
+  cString protocol;
+  cString bitrate;
+  };
+
+#endif //__IPTVSERVICE_H
+
--- a/patches/vdr-1.7.15-disable_ca_updates.patch
+++ b/patches/vdr-1.7.15-disable_ca_updates.patch
@@ -1,11 +0,0 @@
-diff -Nru vdr-1.7.15-vanilla/pat.c vdr-1.7.15-disable_ca_updates/pat.c
--- vdr-1.7.15-vanilla/pat.c	2010-06-06 19:11:15.000000000 +0300
-+++ vdr-1.7.15-disable_ca_updates/pat.c	2010-06-06 20:42:47.000000000 +0300
-@@ -490,6 +490,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);
-            }
--- a/patches/vdr-1.7.15-disable_eitscan.patch
+++ b/patches/vdr-1.7.15-disable_eitscan.patch
@@ -1,12 +0,0 @@
-diff -Nru vdr-1.7.15-vanilla/eitscan.c vdr-1.7.15-disable_eitscan/eitscan.c
--- vdr-1.7.15-vanilla/eitscan.c	2010-06-06 19:11:14.000000000 +0300
-+++ vdr-1.7.15-disable_eitscan/eitscan.c	2010-06-06 20:44:07.000000000 +0300
-@@ -146,7 +146,7 @@
-                if (Device) {
-                   for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) {
-                       const cChannel *Channel = ScanData->GetChannel();
-                      if (Channel) {
-+                      if (Channel && !cSource::IsType(Channel->Source(), 'I')) {
-                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
-                             if (Device->ProvidesTransponder(Channel)) {
-                                if (!Device->Receiving()) {
--- a/pidscanner.c
+++ b/pidscanner.c
@@ -13,8 +13,9 @@
 #define PIDSCANNER_VPID_COUNT      5     /* minimum count of video pid samples for pid detection */
 #define PIDSCANNER_PID_DELTA_COUNT 100   /* minimum count of pid samples for audio/video only pid detection */

-cPidScanner::cPidScanner(void) 
+cPidScanner::cPidScanner(void)
 : timeout(0),
+  channelId(tChannelID::InvalidID),
  process(true),
  Vpid(0xFFFF),
  Apid(0xFFFF),
@@ -22,24 +23,17 @@ cPidScanner::cPidScanner(void)
  numApids(0)
 {
  debug("cPidScanner::cPidScanner()\n");
-  channel = cChannel();
 }

-cPidScanner::~cPidScanner() 
+cPidScanner::~cPidScanner()
 {
  debug("cPidScanner::~cPidScanner()\n");
 }

-void cPidScanner::SetChannel(const cChannel *Channel)
+void cPidScanner::SetChannel(const tChannelID &ChannelId)
 {
-  if (Channel) {
-     debug("cPidScanner::SetChannel(): %s\n", Channel->Parameters());
-     channel = *Channel;
-     }
-  else {
-     debug("cPidScanner::SetChannel()\n");
-     channel = cChannel();
-     }
+  debug("cPidScanner::SetChannel(): %s\n", *ChannelId.ToString());
+  channelId = ChannelId;
  Vpid = 0xFFFF;
  numVpids = 0;
  Apid = 0xFFFF;
@@ -119,7 +113,7 @@ void cPidScanner::Process(const uint8_t* buf)
              timeout.Set(PIDSCANNER_TIMEOUT_IN_MS);
              return;
              }
-           cChannel *IptvChannel = Channels.GetByChannelID(channel.GetChannelID());
+           cChannel *IptvChannel = Channels.GetByChannelID(channelId);
           if (IptvChannel) {
              int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
              int Atypes[MAXAPIDS + 1] = { 0 };
@@ -129,6 +123,7 @@ void cPidScanner::Process(const uint8_t* buf)
              char ALangs[MAXAPIDS][MAXLANGCODE2] = { "" };
              char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
              char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
+              int Vtype = IptvChannel->Vtype();
              int Ppid = IptvChannel->Ppid();
              int Tpid = IptvChannel->Tpid();
              bool foundApid = false;
@@ -136,7 +131,7 @@ void cPidScanner::Process(const uint8_t* buf)
                 Vpid = 0; // No detected video pid
              else if (numApids < PIDSCANNER_APID_COUNT)
                 Apid = 0; // No detected audio pid
-              for (unsigned int i = 1; i < MAXAPIDS; ++i) {
+              for (unsigned int i = 0; i < MAXAPIDS; ++i) {
                  Apids[i] = IptvChannel->Apid(i);
                  Atypes[i] = IptvChannel->Atype(i);
                  if (Apids[i] && (Apids[i] == Apid))
@@ -153,7 +148,6 @@ 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);
-              int Vtype = IptvChannel->Vtype();
              IptvChannel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
              }
           Channels.Unlock();
--- a/pidscanner.h
+++ b/pidscanner.h
@@ -14,7 +14,7 @@
 class cPidScanner {
 private:
  cTimeMs timeout;
-  cChannel channel;
+  tChannelID channelId;
  bool process;
  int Vpid;
  int Apid;
@@ -24,7 +24,7 @@ private:
 public:
  cPidScanner(void);
  ~cPidScanner();
-  void SetChannel(const cChannel *Channel);
+  void SetChannel(const tChannelID &ChannelId);
  void Process(const uint8_t* buf);
 };

--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iptv 0.4.0\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-03-04 18:12+0200\n"
-"PO-Revision-Date: 2007-10-29 21:19+0100\n"
+"Project-Id-Version: vdr-iptv 1.0.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"
 "Last-Translator: Tobias Grimm <tg@e-tobi.net>\n"
-"Language-Team: German\n"
+"Language-Team: German <vdr@linuxtv.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -135,8 +136,8 @@ msgstr "Tid"
 msgid "Rid"
 msgstr "Rid"

-msgid "Scan sid"
-msgstr "Scanne SID"
+msgid "Scan section ids"
+msgstr "Scanne Section IDS"

 msgid "Scan pids"
 msgstr "Scanne PIDS"
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iptv 0.4.0\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-03-04 18:12+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Project-Id-Version: vdr-iptv 1.0.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"
 "Last-Translator: Rolf Ahrenberg\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -150,8 +151,8 @@ msgstr "Lähete-ID"
 msgid "Rid"
 msgstr "Radio-ID"

-msgid "Scan sid"
-msgstr "Etsi palvelu-ID"
+msgid "Scan section ids"
+msgstr "Etsi sektiotunnisteet"

 msgid "Scan pids"
 msgstr "Etsi pidit"
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -6,12 +6,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iptv 0.4.0\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-03-04 18:12+0200\n"
-"PO-Revision-Date: 2008-01-26 13:14+0100\n"
+"Project-Id-Version: vdr-iptv 1.0.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"
 "Last-Translator: NIVAL Michaël <mnival@club-internet.fr>\n"
-"Language-Team: French\n"
+"Language-Team: French <vdr@linuxtv.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,8 +153,8 @@ msgstr "Tid"
 msgid "Rid"
 msgstr "Rid"

-msgid "Scan sid"
-msgstr "Scanne les SID"
+msgid "Scan section ids"
+msgstr "Scanne les section ID"

 msgid "Scan pids"
 msgstr "Scanne les PID"
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iptv 0.4.0\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-03-04 18:12+0200\n"
-"PO-Revision-Date: 2008-07-13 03:28+0100\n"
+"Project-Id-Version: vdr-iptv 1.0.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"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team: Italian\n"
+"Language-Team: Italian <vdr@linuxtv.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -151,8 +152,8 @@ msgstr "Tid"
 msgid "Rid"
 msgstr "Rid"

-msgid "Scan sid"
-msgstr "Scansione Sid"
+msgid "Scan section ids"
+msgstr "Scansione Section Ids"

 msgid "Scan pids"
 msgstr "Scansione Pids"
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iptv 0.4.0\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-03-05 09:42+0100\n"
-"PO-Revision-Date: 2007-10-29 21:19+0100\n"
+"Project-Id-Version: vdr-iptv 1.0.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"
 "Last-Translator: Carel\n"
-"Language-Team: Dutch\n"
+"Language-Team: Dutch <vdr@linuxtv.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -150,8 +151,8 @@ msgstr "Tid"
 msgid "Rid"
 msgstr "Rid"

-msgid "Scan sid"
-msgstr "Scan SID"
+msgid "Scan section ids"
+msgstr "Scan section IDS"

 msgid "Scan pids"
 msgstr "Scan PIDS"
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iptv 0.4.0\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-03-04 18:12+0200\n"
-"PO-Revision-Date: 2008-03-16 12:14+0100\n"
+"Project-Id-Version: vdr-iptv 1.0.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"
 "Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
-"Language-Team: Russian <de@li.org>\n"
+"Language-Team: Russian <vdr@linuxtv.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -136,8 +137,8 @@ msgstr "Tid"
 msgid "Rid"
 msgstr "Rid"

-msgid "Scan sid"
-msgstr "Сканировать SID"
+msgid "Scan section ids"
+msgstr "Сканировать section ids"

 msgid "Scan pids"
 msgstr "Сканировать пиды"
--- a/protocolext.c
+++ b/protocolext.c
@@ -19,10 +19,15 @@
 #include "config.h"
 #include "protocolext.h"

+#ifndef EXTSHELL
+#define EXTSHELL "/bin/bash"
+#endif
+
 cIptvProtocolExt::cIptvProtocolExt()
 : pid(-1),
  scriptFile(""),
-  scriptParameter(0)
+  scriptParameter(0),
+  streamPort(0)
 {
  debug("cIptvProtocolExt::cIptvProtocolExt()\n");
 }
@@ -38,6 +43,8 @@ void cIptvProtocolExt::ExecuteScript(void)
 {
  debug("cIptvProtocolExt::ExecuteScript()\n");
  // Check if already executing
+  if (isActive || isempty(scriptFile))
+     return;
  if (pid > 0) {
     error("Cannot execute script!");
     return;
@@ -51,9 +58,11 @@ void cIptvProtocolExt::ExecuteScript(void)
     for (int i = STDERR_FILENO + 1; i < MaxPossibleFileDescriptors; i++)
         close(i);
     // Execute the external script
-     cString cmd = cString::sprintf("%s %d %d", *scriptFile, scriptParameter, socketPort);
+     cString cmd = cString::sprintf("%s %d %d", *scriptFile, scriptParameter, streamPort);
     debug("cIptvProtocolExt::ExecuteScript(child): %s\n", *cmd);
-     if (execl("/bin/sh", "sh", "-c", *cmd, (char *)NULL) == -1) {
+     // Create a new session for a process group
+     ERROR_IF_RET(setsid() == -1, "setsid()", _exit(-1));
+     if (execl(EXTSHELL, "sh", "-c", *cmd, (char *)NULL) == -1) {
        error("Script execution failed: %s", *cmd);
        _exit(-1);
        }
@@ -67,30 +76,41 @@ void cIptvProtocolExt::ExecuteScript(void)
 void cIptvProtocolExt::TerminateScript(void)
 {
  debug("cIptvProtocolExt::TerminateScript(): pid=%d\n", pid);
+  if (!isActive || isempty(scriptFile))
+     return;
  if (pid > 0) {
     const unsigned int timeoutms = 100;
     unsigned int waitms = 0;
-     siginfo_t waitStatus;
     bool waitOver = false;
-     // signal and wait for termination
-     int retval = kill(pid, SIGINT);
+     // Signal and wait for termination
+     int retval = killpg(pid, SIGINT);
     ERROR_IF_RET(retval < 0, "kill()", waitOver = true);
     while (!waitOver) {
       retval = 0;
       waitms += timeoutms;
       if ((waitms % 2000) == 0) {
          error("Script '%s' won't terminate - killing it!", *scriptFile);
-          kill(pid, SIGKILL);
+          killpg(pid, 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);
+#else  // __FreeBSD__
+       siginfo_t waitStatus;
       memset(&waitStatus, '\0', sizeof(waitStatus));
-       // Wait for child termination
       retval = waitid(P_PID, pid, &waitStatus, (WNOHANG | WEXITED));
+#endif // __FreeBSD__
       ERROR_IF_RET(retval < 0, "waitid()", waitOver = true);
       // These are the acceptable conditions under which child exit is
       // regarded as successful
+#ifdef __FreeBSD__
+       if (retval > 0 && (WIFEXITED(waitStatus) || WIFSIGNALED(waitStatus))) {
+#else  // __FreeBSD__
       if (!retval && waitStatus.si_pid && (waitStatus.si_pid == pid) &&
          ((waitStatus.si_code == CLD_EXITED) || (waitStatus.si_code == CLD_KILLED))) {
+#endif // __FreeBSD__
          debug("Child (%d) exited as expected\n", pid);
          waitOver = true;
          }
@@ -109,7 +129,7 @@ bool cIptvProtocolExt::Open(void)
  if (!strlen(*scriptFile))
     return false;
  // Create the listening socket
-  OpenSocket(socketPort);
+  OpenSocket(streamPort);
  // Execute the external script
  ExecuteScript();
  isActive = true;
@@ -119,11 +139,11 @@ bool cIptvProtocolExt::Open(void)
 bool cIptvProtocolExt::Close(void)
 {
  debug("cIptvProtocolExt::Close()\n");
-  // Close the socket
-  CloseSocket();
  // Terminate the external script
  TerminateScript();
  isActive = false;
+  // Close the socket
+  CloseSocket();
  return true;
 }

@@ -145,7 +165,7 @@ bool cIptvProtocolExt::Set(const char* Location, const int Parameter, const int
        }
     scriptParameter = Parameter;
     // Update listen port
-     socketPort = IptvConfig.GetExtProtocolBasePort() + Index;
+     streamPort = IptvConfig.GetExtProtocolBasePort() + Index;
     }
  return true;
 }
--- a/protocolext.h
+++ b/protocolext.h
@@ -17,6 +17,7 @@ private:
  int pid;
  cString scriptFile;
  int scriptParameter;
+  int streamPort;

 private:
  void TerminateScript(void);
--- a/protocolhttp.c
+++ b/protocolhttp.c
@@ -19,10 +19,11 @@
 #include "protocolhttp.h"

 cIptvProtocolHttp::cIptvProtocolHttp()
+: streamAddr(strdup("")),
+  streamPath(strdup("/")),
+  streamPort(0)
 {
  debug("cIptvProtocolHttp::cIptvProtocolHttp()\n");
-  streamAddr = strdup("");
-  streamPath = strdup("/");
 }

 cIptvProtocolHttp::~cIptvProtocolHttp()
@@ -40,66 +41,29 @@ bool cIptvProtocolHttp::Connect(void)
  debug("cIptvProtocolHttp::Connect()\n");
  // Check that stream address is valid
  if (!isActive && !isempty(streamAddr) && !isempty(streamPath)) {
-     // Ensure that socket is valid
-     OpenSocket(socketPort);
-
-     // 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("%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);
-        }
-
-     int err = connect(socketDesc, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
-     // Non-blocking sockets always report in-progress error when connected
-     ERROR_IF_FUNC(err < 0 && errno != EINPROGRESS, "connect()", CloseSocket(), return false);
-     // Select with 800ms timeout on the socket completion, check if it is writable
-     int retval = select_single_desc(socketDesc, 800000, true);
-     if (retval < 0)
-        return retval;
-
-     // Select has returned. Get socket errors if there are any
-     int socketStatus = 0;
-     socklen_t len = sizeof(socketStatus);
-     getsockopt(socketDesc, SOL_SOCKET, SO_ERROR, &socketStatus, &len);
-
-     // If not any errors, then socket must be ready and connected
-     if (socketStatus != 0) {
-        char tmp[64];
-        error("Cannot connect to %s: %s", streamAddr, strerror_r(socketStatus, tmp, sizeof(tmp)));
+     // Ensure that socket is valid and connect
+     OpenSocket(streamPort, streamAddr);
+     if (!ConnectSocket()) {
        CloseSocket();
        return false;
        }
-
     // Formulate and send HTTP request
     cString buffer = cString::sprintf("GET %s HTTP/1.1\r\n"
                                       "Host: %s\r\n"
-                                       "User-Agent: vdr-iptv\r\n"
+                                       "User-Agent: vdr-%s/%s\r\n"
                                       "Range: bytes=0-\r\n"
                                       "Connection: Close\r\n"
-                                       "\r\n", streamPath, streamAddr);
-
+                                       "\r\n", streamPath, streamAddr, PLUGIN_NAME_I18N, VERSION);
     debug("Sending http request: %s\n", *buffer);
-     ssize_t err2 = send(socketDesc, buffer, strlen(buffer), 0);
-     ERROR_IF_FUNC(err2 < 0, "send()", CloseSocket(), return false);
-
+     if (!Write(*buffer, (unsigned int)strlen(*buffer))) {
+        CloseSocket();
+        return false;
+        }
     // Now process headers
     if (!ProcessHeaders()) {
        CloseSocket();
        return false;
        }
-
     // Update active flag
     isActive = true;
     }
@@ -109,7 +73,6 @@ bool cIptvProtocolHttp::Connect(void)
 bool cIptvProtocolHttp::Disconnect(void)
 {
  debug("cIptvProtocolHttp::Disconnect()\n");
-  // Check that stream address is valid
  if (isActive) {
     // Close the socket
     CloseSocket();
@@ -125,24 +88,15 @@ bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
  debug("cIptvProtocolHttp::GetHeaderLine()\n");
  bool linefeed = false;
  bool newline = false;
-  char buf[4096];
-  char *bufptr = buf;
-  memset(buf, '\0', sizeof(buf));
+  char *bufptr = dest;
  recvLen = 0;

+  if (!dest)
+     return false;
+
  while (!newline || !linefeed) {
-    socklen_t addrlen = sizeof(sockAddr);
    // Wait 500ms for data
-    int retval = select_single_desc(socketDesc, 500000, false);
-    // Check if error
-    if (retval < 0)
-       return false;
-    // Check if data available
-    else if (retval) {
-       ssize_t retval = recvfrom(socketDesc, bufptr, 1, MSG_DONTWAIT,
-                             (struct sockaddr *)&sockAddr, &addrlen);
-       if (retval <= 0)
-          return false;
+    if (ReadChar(bufptr, 500)) {
       // Parsing end conditions, if line ends with \r\n
       if (linefeed && *bufptr == '\n')
          newline = true;
@@ -155,19 +109,18 @@ bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
          ++recvLen;
          }
       ++bufptr;
-       // Check that buffers won't be exceeded
-       if (recvLen >= sizeof(buf) || recvLen >= destLen) {
+       // Check that buffer won't be exceeded
+       if (recvLen >= destLen) {
          error("Header wouldn't fit into buffer\n");
          recvLen = 0;
          return false;
          }
       }
    else {
-       error("No HTTP response received\n");
+       error("No HTTP response received in 500ms\n");
       return false;
       }
    }
-  memcpy(dest, buf, recvLen);
  return true;
 }

@@ -175,22 +128,27 @@ bool cIptvProtocolHttp::ProcessHeaders(void)
 {
  debug("cIptvProtocolHttp::ProcessHeaders()\n");
  unsigned int lineLength = 0;
-  int response = 0;
+  int version = 0, response = 0;
  bool responseFound = false;
+  char fmt[32];
  char buf[4096];

+  // Generate HTTP response format string with 2 arguments
+  snprintf(fmt, sizeof(fmt), "HTTP/1.%%%zui %%%zui ", sizeof(version) - 1, sizeof(response) - 1);
+
  while (!responseFound || lineLength != 0) {
    memset(buf, '\0', sizeof(buf));
    if (!GetHeaderLine(buf, sizeof(buf), lineLength))
       return false;
-    if (!responseFound && sscanf(buf, "HTTP/1.%*i %i ", &response) != 1) {
+    if (!responseFound && sscanf(buf, fmt, &version, &response) != 2) {
       error("Expected HTTP header not found\n");
       continue;
       }
    else
       responseFound = true;
-    if (response != 200) {
-       error("%s\n", buf);
+    // Allow only 'OK' and 'Partial Content'
+    if ((response != 200) && (response != 206)) {
+       error("Invalid HTTP response (%d): %s\n", response, buf);
       return false;
       }
    }
@@ -232,8 +190,8 @@ bool cIptvProtocolHttp::Set(const char* Location, const int Parameter, const int
        }
     else
        streamPath = strcpyrealloc(streamPath, "/");
-     socketPort = Parameter;
-     //debug("http://%s:%d%s\n", streamAddr, socketPort, streamPath);
+     streamPort = Parameter;
+     //debug("http://%s:%d%s\n", streamAddr, streamPort, streamPath);
     // Re-connect the socket
     Connect();
     }
@@ -243,5 +201,5 @@ bool cIptvProtocolHttp::Set(const char* Location, const int Parameter, const int
 cString cIptvProtocolHttp::GetInformation(void)
 {
  //debug("cIptvProtocolHttp::GetInformation()");
-  return cString::sprintf("http://%s:%d%s", streamAddr, socketPort, streamPath);
+  return cString::sprintf("http://%s:%d%s", streamAddr, streamPort, streamPath);
 }
--- a/protocolhttp.h
+++ b/protocolhttp.h
@@ -16,6 +16,7 @@ class cIptvProtocolHttp : public cIptvTcpSocket, public cIptvProtocolIf {
 private:
  char* streamAddr;
  char* streamPath;
+  int streamPort;

 private:
  bool Connect(void);
--- a/protocoludp.c
+++ b/protocoludp.c
@@ -19,9 +19,12 @@
 #include "socket.h"

 cIptvProtocolUdp::cIptvProtocolUdp()
+: isIGMPv3(false),
+  sourceAddr(strdup("")),
+  streamAddr(strdup("")),
+  streamPort(0)
 {
  debug("cIptvProtocolUdp::cIptvProtocolUdp()\n");
-  streamAddr = strdup("");
 }

 cIptvProtocolUdp::~cIptvProtocolUdp()
@@ -31,63 +34,34 @@ cIptvProtocolUdp::~cIptvProtocolUdp()
  cIptvProtocolUdp::Close();
  // Free allocated memory
  free(streamAddr);
-}
-
-bool cIptvProtocolUdp::JoinMulticast(void)
-{
-  debug("cIptvProtocolUdp::JoinMulticast()\n");
-  // Check that stream address is valid
-  if (!isActive && !isempty(streamAddr)) {
-     // Ensure that socket is valid
-     OpenSocket(socketPort);
-     // Join a new multicast group
-     struct ip_mreq mreq;
-     mreq.imr_multiaddr.s_addr = inet_addr(streamAddr);
-     mreq.imr_interface.s_addr = htonl(INADDR_ANY);
-     int err = setsockopt(socketDesc, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq,
-                          sizeof(mreq));
-     ERROR_IF_RET(err < 0, "setsockopt()", return false);
-     // Update multicasting flag
-     isActive = true;
-     }
-  return true;
-}
-
-bool cIptvProtocolUdp::DropMulticast(void)
-{
-  debug("cIptvProtocolUdp::DropMulticast()\n");
-  // Check that stream address is valid
-  if (isActive && !isempty(streamAddr)) {
-      // Ensure that socket is valid
-      OpenSocket(socketPort);
-      // Drop the multicast group
-      struct ip_mreq mreq;
-      mreq.imr_multiaddr.s_addr = inet_addr(streamAddr);
-      mreq.imr_interface.s_addr = htonl(INADDR_ANY);
-      int err = setsockopt(socketDesc, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq,
-                           sizeof(mreq));
-      ERROR_IF_RET(err < 0, "setsockopt()", return false);
-      // Update multicasting flag
-      isActive = false;
-     }
-  return true;
+  free(sourceAddr);
 }

 bool cIptvProtocolUdp::Open(void)
 {
-  debug("cIptvProtocolUdp::Open()\n");
-  // Join a new multicast group
-  JoinMulticast();
+  debug("cIptvProtocolUdp::Open(): streamAddr=%s\n", streamAddr);
+  OpenSocket(streamPort, streamAddr, sourceAddr, isIGMPv3);
+  if (!isempty(streamAddr)) {
+     // Join a new multicast group
+     JoinMulticast();
+     }
  return true;
 }

 bool cIptvProtocolUdp::Close(void)
 {
-  debug("cIptvProtocolUdp::Close()\n");
-  // Drop the multicast group
-  DropMulticast();
+  debug("cIptvProtocolUdp::Close(): streamAddr=%s\n", streamAddr);
+  if (!isempty(streamAddr)) {
+     // Drop the multicast group
+     OpenSocket(streamPort, streamAddr, sourceAddr, isIGMPv3);
+     DropMulticast();
+     }
  // Close the socket
  CloseSocket();
+  // Do NOT reset stream and source addresses
+  //sourceAddr = strcpyrealloc(sourceAddr, "");
+  //streamAddr = strcpyrealloc(streamAddr, "");
+  //streamPort = 0;
  return true;
 }

@@ -100,19 +74,39 @@ bool cIptvProtocolUdp::Set(const char* Location, const int Parameter, const int
 {
  debug("cIptvProtocolUdp::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
  if (!isempty(Location)) {
-    // Drop the multicast group
-    DropMulticast();
-    // Update stream address and port
-    streamAddr = strcpyrealloc(streamAddr, Location);
-    socketPort = Parameter;
-    // Join a new multicast group
-    JoinMulticast();
-    }
+     // Drop the multicast group
+     if (!isempty(streamAddr)) {
+        OpenSocket(streamPort, streamAddr, sourceAddr, isIGMPv3);
+        DropMulticast();
+        }
+     // Update stream address and port
+     streamAddr = strcpyrealloc(streamAddr, Location);
+     // <group address> or <source address>@<group address>
+     char *p = strstr(streamAddr, "@");
+     if (p) {
+        *p = 0;
+        sourceAddr = strcpyrealloc(sourceAddr, streamAddr);
+        streamAddr = strcpyrealloc(streamAddr, p + 1);
+        isIGMPv3 = true;
+        }
+     else {
+        sourceAddr = strcpyrealloc(sourceAddr, streamAddr);
+        isIGMPv3 = false;
+        }
+     streamPort = Parameter;
+     // Join a new multicast group
+     if (!isempty(streamAddr)) {
+        OpenSocket(streamPort, streamAddr, sourceAddr, isIGMPv3);
+        JoinMulticast();
+        }
+     }
  return true;
 }

 cString cIptvProtocolUdp::GetInformation(void)
 {
  //debug("cIptvProtocolUdp::GetInformation()");
-  return cString::sprintf("udp://%s:%d", streamAddr, socketPort);
+  if (isIGMPv3)
+     return cString::sprintf("udp://%s@%s:%d", sourceAddr, streamAddr, streamPort);
+  return cString::sprintf("udp://%s:%d", streamAddr, streamPort);
 }
--- a/protocoludp.h
+++ b/protocoludp.h
@@ -14,11 +14,10 @@

 class cIptvProtocolUdp : public cIptvUdpSocket, public cIptvProtocolIf {
 private:
+  bool isIGMPv3;
+  char* sourceAddr;
  char* streamAddr;
-
-private:
-  bool JoinMulticast(void);
-  bool DropMulticast(void);
+  int streamPort;

 public:
  cIptvProtocolUdp();
--- a/sectionfilter.c
+++ b/sectionfilter.c
@@ -5,10 +5,10 @@
 *
 */

+#include "config.h"
 #include "sectionfilter.h"

-cIptvSectionFilter::cIptvSectionFilter(int DeviceIndex, int Index,
-                                       uint16_t Pid, uint8_t Tid, uint8_t Mask)
+cIptvSectionFilter::cIptvSectionFilter(int DeviceIndex, uint16_t Pid, uint8_t Tid, uint8_t Mask)
 : pusi_seen(0),
  feedcc(0),
  doneq(0),
@@ -17,10 +17,9 @@ cIptvSectionFilter::cIptvSectionFilter(int DeviceIndex, int Index,
  seclen(0),
  tsfeedp(0),
  pid(Pid),
-  devid(DeviceIndex),
-  id(Index)
+  devid(DeviceIndex)
 {
-  //debug("cIptvSectionFilter::cIptvSectionFilter(%d, %d)\n", devid, id);
+  //debug("cIptvSectionFilter::cIptvSectionFilter(%d, %d)\n", devid, pid);
  int i;

  memset(secbuf_base, '\0', sizeof(secbuf_base));
@@ -47,35 +46,30 @@ cIptvSectionFilter::cIptvSectionFilter(int DeviceIndex, int Index,
      }
  doneq = local_doneq ? 1 : 0;

-  // Create sockets
-  socket[0] = socket[1] = -1;
-  if (socketpair(AF_UNIX, SOCK_DGRAM, 0, socket) != 0) {
-     char tmp[64];
-     error("Opening section filter sockets failed (device=%d id=%d): %s\n", devid, id, strerror_r(errno, tmp, sizeof(tmp)));
-     }
-  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)));
-     }
+  // Create filtering buffer
+  ringbuffer = new cRingBufferLinear(KILOBYTE(128), 0, false, *cString::sprintf("IPTV SECTION %d/%d", devid, pid));
+  if (ringbuffer)
+     ringbuffer->SetTimeouts(10, 10);
+  else
+     error("Failed to allocate buffer for section filter (device=%d pid=%d): ", devid, pid);
 }

 cIptvSectionFilter::~cIptvSectionFilter()
 {
-  //debug("cIptvSectionFilter::~cIptvSectionfilter(%d, %d)\n", devid, id);
-  int tmp = socket[1];
-  socket[1] = -1;
-  if (tmp >= 0)
-     close(tmp);
-  tmp = socket[0];
-  socket[0] = -1;
-  if (tmp >= 0)
-     close(tmp);
+  //debug("cIptvSectionFilter::~cIptvSectionfilter(%d, %d)\n", devid, pid);
+  DELETE_POINTER(ringbuffer);
  secbuf = NULL;
 }

-int cIptvSectionFilter::GetReadDesc(void)
+int cIptvSectionFilter::Read(void *Data, size_t Length)
 {
-  return socket[0];
+  int count = 0;
+  uchar *p = ringbuffer->Get(count);
+  if (p && count > 0) {
+     memcpy(Data, p, count);
+     ringbuffer->Del(count);
+     }
+  return count;
 }

 inline uint16_t cIptvSectionFilter::GetLength(const uint8_t *Data)
@@ -91,10 +85,10 @@ void cIptvSectionFilter::New(void)

 int cIptvSectionFilter::Filter(void)
 {
-  uint8_t neq = 0;
-  int i;
-
  if (secbuf) {
+     int i;
+     uint8_t neq = 0;
+
     for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
         uint8_t local_xor = (uint8_t)(filter_value[i] ^ secbuf[i]);
         if (maskandmode[i] & local_xor)
@@ -105,10 +99,10 @@ int cIptvSectionFilter::Filter(void)
     if (doneq && !neq)
        return 0;

-     // There is no data in the read socket, more can be written
-     if ((socket[0] >= 0) && (socket[1] >= 0) /*&& !select_single_desc(socket[0], 0, false)*/) {
-        ssize_t len = write(socket[1], secbuf, seclen);
-        ERROR_IF(len < 0, "write()");
+     if (ringbuffer) {
+        int len = ringbuffer->Put(secbuf, seclen);
+        if (len != seclen)
+           ringbuffer->ReportOverflow(seclen - len);
        // Update statistics
        AddSectionStatistic(len, 1);
        }
@@ -138,7 +132,7 @@ int cIptvSectionFilter::CopyDump(const uint8_t *buf, uint8_t len)
     return 0;

  memcpy(secbuf_base + tsfeedp, buf, len);
-  tsfeedp += len;
+  tsfeedp = uint16_t(tsfeedp + len);

  limit = tsfeedp;
  if (limit > DMX_MAX_SECFEED_SIZE)
@@ -154,7 +148,7 @@ int cIptvSectionFilter::CopyDump(const uint8_t *buf, uint8_t len)
      seclen = seclen_local;
      if (pusi_seen)
         Feed();
-      secbufp += seclen_local;
+      secbufp = uint16_t(secbufp + seclen_local);
      secbuf += seclen_local;
      }
  return 0;
--- a/sectionfilter.h
+++ b/sectionfilter.h
@@ -8,6 +8,9 @@
 #ifndef __IPTV_SECTIONFILTER_H
 #define __IPTV_SECTIONFILTER_H

+#ifdef __FreeBSD__
+#include <sys/socket.h>
+#endif // __FreeBSD__
 #include <vdr/device.h>

 #include "common.h"
@@ -33,8 +36,6 @@ private:
  uint16_t pid;

  int devid;
-  int id;
-  int socket[2];

  uint8_t filter_value[DMX_MAX_FILTER_SIZE];
  uint8_t filter_mask[DMX_MAX_FILTER_SIZE];
@@ -43,6 +44,8 @@ private:
  uint8_t maskandmode[DMX_MAX_FILTER_SIZE];
  uint8_t maskandnotmode[DMX_MAX_FILTER_SIZE];

+  cRingBufferLinear *ringbuffer;
+
  inline uint16_t GetLength(const uint8_t *Data);
  void New(void);
  int Filter(void);
@@ -51,11 +54,10 @@ private:

 public:
  // constructor & destructor
-  cIptvSectionFilter(int Index, int DeviceIndex, uint16_t Pid,
-                     uint8_t Tid, uint8_t Mask);
+  cIptvSectionFilter(int DeviceIndex, uint16_t Pid, uint8_t Tid, uint8_t Mask);
  virtual ~cIptvSectionFilter();
  void Process(const uint8_t* Data);
-  int GetReadDesc(void);
+  int Read(void *Buffer, size_t Length);
  uint16_t GetPid(void) const { return pid; }
 };

--- a/setup.c
+++ b/setup.c
@@ -66,7 +66,7 @@ void cIptvMenuInfo::Display(void)

 eOSState cIptvMenuInfo::ProcessKey(eKeys Key)
 {
-  switch (Key) {
+  switch (int(Key)) {
    case kUp|k_Repeat:
    case kUp:
    case kDown|k_Repeat:
--- a/sidscanner.c
+++ b/sidscanner.c
@@ -11,10 +11,19 @@
 #include "sidscanner.h"

 cSidScanner::cSidScanner(void)
+: channelId(tChannelID::InvalidID),
+  sidFound(false),
+  nidFound(false),
+  tidFound(false)
 {
  debug("cSidScanner::cSidScanner()\n");
-  channel = cChannel();
  Set(0x00, 0x00);  // PAT
+  Set(0x10, 0x40);  // NIT
+}
+
+cSidScanner::~cSidScanner()
+{
+  debug("cSidScanner::~cSidScanner()\n");
 }

 void cSidScanner::SetStatus(bool On)
@@ -23,43 +32,70 @@ void cSidScanner::SetStatus(bool On)
  cFilter::SetStatus(On);
 }

-void cSidScanner::SetChannel(const cChannel *Channel)
+void cSidScanner::SetChannel(const tChannelID &ChannelId)
 {
-  if (Channel) {
-     debug("cSidScanner::SetChannel(): %s\n", Channel->Parameters());
-     channel = *Channel;
-     }
-  else {
-     debug("cSidScanner::SetChannel()\n");
-     channel = cChannel();
-     }
+  debug("cSidScanner::SetChannel(): %s\n", *ChannelId.ToString());
+  channelId = ChannelId;
+  sidFound = false;
+  nidFound = false;
+  tidFound = false;
 }

 void cSidScanner::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
 {
+  int newSid = -1, newNid = -1, newTid = -1;
+
  //debug("cSidScanner::Process()\n");
-  if ((Pid == 0x00) && (Tid == 0x00) && channel.GetChannelID().Valid()) {
-     debug("cSidScanner::Process(): Pid=%d Tid=%02X\n", Pid, Tid);
-     SI::PAT pat(Data, 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() != channel.Sid()) {
-               debug("cSidScanner::Process(): Sid=%d\n", assoc.getServiceId());
-               if (!Channels.Lock(true, 10))
-                  return;
-               cChannel *IptvChannel = Channels.GetByChannelID(channel.GetChannelID());
-               if (IptvChannel)
-                  IptvChannel->SetId(IptvChannel->Nid(), IptvChannel->Tid(),
-                                    assoc.getServiceId(), IptvChannel->Rid());
-               Channels.Unlock();
+  if (channelId.Valid()) {
+     if ((Pid == 0x00) && (Tid == 0x00)) {
+        debug("cSidScanner::Process(): Pid=%d Tid=%02X\n", Pid, Tid);
+        SI::PAT pat(Data, false);
+        if (!pat.CheckCRCAndParse())
+           return;
+        SI::PAT::Association assoc;
+        for (SI::Loop::Iterator it; pat.associationLoop.getNext(assoc, it); ) {
+            if (!assoc.isNITPid()) {
+               if (assoc.getServiceId() != channelId.Sid()) {
+                  debug("cSidScanner::Process(): Sid=%d\n", assoc.getServiceId());
+                  newSid = assoc.getServiceId();
+                  }
+               sidFound = true;
+               break;
               }
-            SetChannel(NULL);
-            SetStatus(false);
-            return;
            }
-         }
+        }
+     else if ((Pid == 0x10) && (Tid == 0x40)) {
+        debug("cSidScanner::Process(): Pid=%d Tid=%02X\n", Pid, Tid);
+        SI::NIT nit(Data, false);
+        if (!nit.CheckCRCAndParse())
+           return;
+        SI::NIT::TransportStream ts;
+        for (SI::Loop::Iterator it; nit.transportStreamLoop.getNext(ts, it); ) {
+            if (ts.getTransportStreamId() != channelId.Tid()) {
+               debug("cSidScanner::Process(): TSid=%d\n", ts.getTransportStreamId());
+               newTid = ts.getTransportStreamId();
+               }
+            tidFound = true;
+            break; // default to the first one
+            }
+        if (nit.getNetworkId() != channelId.Nid()) {
+           debug("cSidScanner::Process(): Nid=%d\n", ts.getTransportStreamId());
+           newNid = nit.getNetworkId();
+           }
+        nidFound = true; 
+        }
+     }
+  if ((newSid >= 0) || (newNid >= 0) || (newTid >= 0)) {
+     if (!Channels.Lock(true, 10))
+        return;
+     cChannel *IptvChannel = Channels.GetByChannelID(channelId);
+     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) {
+     SetChannel(tChannelID::InvalidID);
+     SetStatus(false);
     }
 }
--- a/sidscanner.h
+++ b/sidscanner.h
@@ -13,7 +13,10 @@

 class cSidScanner : public cFilter {
 private:
-  cChannel channel;
+  tChannelID channelId;
+  bool sidFound;
+  bool nidFound;
+  bool tidFound;

 protected:
  virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
@@ -21,7 +24,8 @@ protected:

 public:
  cSidScanner(void);
-  void SetChannel(const cChannel *Channel);
+  ~cSidScanner();
+  void SetChannel(const tChannelID &ChannelId);
  void Open() { SetStatus(true); }
  void Close() { SetStatus(false); }
 };
--- a/socket.c
+++ b/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>
@@ -23,6 +24,7 @@ cIptvSocket::cIptvSocket()
  isActive(false)
 {
  debug("cIptvSocket::cIptvSocket()\n");
+  memset(&sockAddr, '\0', sizeof(sockAddr));
 }

 cIptvSocket::~cIptvSocket()
@@ -51,13 +53,18 @@ bool cIptvSocket::OpenSocket(const int Port, const bool isUdp)
        socketDesc = socket(PF_INET, SOCK_STREAM, 0);
     ERROR_IF_RET(socketDesc < 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()",
+     ERROR_IF_FUNC(fcntl(socketDesc, 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()",
+     ERROR_IF_FUNC(setsockopt(socketDesc, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0, "setsockopt(SO_REUSEADDR)",
                   CloseSocket(), return false);
+#ifndef __FreeBSD__
+     // Allow packet information to be fetched
+     ERROR_IF_FUNC(setsockopt(socketDesc, SOL_IP, IP_PKTINFO, &yes, sizeof(yes)) < 0, "setsockopt(IP_PKTINFO)",
+                   CloseSocket(), return false);
+#endif // __FreeBSD__
     // Bind socket
-     memset(&sockAddr, '\0', sizeof(sockAddr));
+     memset(&sockAddr, 0, sizeof(sockAddr));
     sockAddr.sin_family = AF_INET;
     sockAddr.sin_port = htons((uint16_t)(Port & 0xFFFF));
     sockAddr.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -78,11 +85,38 @@ void cIptvSocket::CloseSocket(void)
  if (socketDesc >= 0) {
     close(socketDesc);
     socketDesc = -1;
+     socketPort = 0;
+     memset(&sockAddr, 0, sizeof(sockAddr));
     }
 }

+bool cIptvSocket::CheckAddress(const char *Addr, in_addr_t *InAddr)
+{
+  if (InAddr) {
+     // First try only the IP address
+     *InAddr = htonl(inet_addr(Addr));
+     if (*InAddr == htonl(INADDR_NONE)) {
+        debug("Cannot convert %s directly to internet address\n", Addr);
+        // It may be a host name, get the name
+        struct hostent *host;
+        host = gethostbyname(Addr);
+        if (!host) {
+           char tmp[64];
+           error("gethostbyname() failed: %s is not valid address: %s", Addr, strerror_r(h_errno, tmp, sizeof(tmp)));
+           return false;
+           }
+        *InAddr = htonl(inet_addr(*host->h_addr_list));
+        }
+     return true;
+     }
+  return false;
+}
+
 // UDP socket class
 cIptvUdpSocket::cIptvUdpSocket()
+: streamAddr(htonl(INADDR_ANY)),
+  sourceAddr(htonl(INADDR_ANY)),
+  useIGMPv3(false)
 {
  debug("cIptvUdpSocket::cIptvUdpSocket()\n");
 }
@@ -95,9 +129,99 @@ cIptvUdpSocket::~cIptvUdpSocket()
 bool cIptvUdpSocket::OpenSocket(const int Port)
 {
  debug("cIptvUdpSocket::OpenSocket()\n");
+  streamAddr = htonl(INADDR_ANY);
+  sourceAddr = htonl(INADDR_ANY);
+  useIGMPv3 = false;
  return cIptvSocket::OpenSocket(Port, true);
 }

+bool cIptvUdpSocket::OpenSocket(const int Port, const char *StreamAddr, const char *SourceAddr, bool UseIGMPv3)
+{
+  debug("cIptvUdpSocket::OpenSocket()\n");
+  CheckAddress(StreamAddr, &streamAddr);
+  CheckAddress(SourceAddr, &sourceAddr);
+  useIGMPv3 = UseIGMPv3;
+  return cIptvSocket::OpenSocket(Port, true);
+}
+
+void cIptvUdpSocket::CloseSocket(void)
+{
+  debug("cIptvUdpSocket::CloseSocket()\n");
+  streamAddr = htonl(INADDR_ANY);
+  sourceAddr = htonl(INADDR_ANY);
+  useIGMPv3 = false;
+  cIptvSocket::CloseSocket();
+}
+
+bool cIptvUdpSocket::JoinMulticast(void)
+{
+  debug("cIptvUdpSocket::JoinMulticast()\n");
+  // Check if socket exists
+  if (!isActive && (socketDesc >= 0)) {
+     // Join a new multicast group
+     if (useIGMPv3) {
+        // Source-specific multicast (SSM) is used
+        struct group_source_req gsr;
+        struct sockaddr_in *grp;
+        struct sockaddr_in *src;
+        gsr.gsr_interface = 0; // if_nametoindex("any") ?
+        grp = (struct sockaddr_in*)&gsr.gsr_group;
+        grp->sin_family = AF_INET;
+        grp->sin_addr.s_addr = streamAddr;
+        grp->sin_port = 0;
+        src = (struct sockaddr_in*)&gsr.gsr_source;
+        src->sin_family = AF_INET;
+        src->sin_addr.s_addr = sourceAddr;
+        src->sin_port = 0;
+        ERROR_IF_RET(setsockopt(socketDesc, 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 = streamAddr;
+        mreq.imr_interface.s_addr = htonl(INADDR_ANY);
+        ERROR_IF_RET(setsockopt(socketDesc, SOL_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0, "setsockopt(IP_ADD_MEMBERSHIP)", return false);
+        }
+     // Update multicasting flag
+     isActive = true;
+     }
+  return true;
+}
+
+bool cIptvUdpSocket::DropMulticast(void)
+{
+  debug("cIptvUdpSocket::DropMulticast()\n");
+  // Check if socket exists
+  if (isActive && (socketDesc >= 0)) {
+     // Drop the existing multicast group
+     if (useIGMPv3) {
+        // Source-specific multicast (SSM) is used
+        struct group_source_req gsr;
+        struct sockaddr_in *grp;
+        struct sockaddr_in *src;
+        gsr.gsr_interface = 0; // if_nametoindex("any") ?
+        grp = (struct sockaddr_in*)&gsr.gsr_group;
+        grp->sin_family = AF_INET;
+        grp->sin_addr.s_addr = streamAddr;
+        grp->sin_port = 0;
+        src = (struct sockaddr_in*)&gsr.gsr_source;
+        src->sin_family = AF_INET;
+        src->sin_addr.s_addr = sourceAddr;
+        src->sin_port = 0;
+        ERROR_IF_RET(setsockopt(socketDesc, 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 = streamAddr;
+        mreq.imr_interface.s_addr = htonl(INADDR_ANY);
+        ERROR_IF_RET(setsockopt(socketDesc, SOL_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0, "setsockopt(IP_DROP_MEMBERSHIP)", return false);
+        }
+     // Update multicasting flag
+     isActive = false;
+     }
+  return true;
+}
+
+
 int cIptvUdpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
 {
  //debug("cIptvUdpSocket::Read()\n");
@@ -106,43 +230,77 @@ int cIptvUdpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
     error("Invalid socket in %s\n", __FUNCTION__);
     return -1;
     }
-  socklen_t addrlen = sizeof(sockAddr);
  int len = 0;
-  // Read data from socket
-  if (isActive && socketDesc && BufferAddr && (BufferLen > 0))
-     len = (int)recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
-                    (struct sockaddr *)&sockAddr, &addrlen);
-  if ((len > 0) && (BufferAddr[0] == TS_SYNC_BYTE)) {
-     return len;
-     }
-  else if (len > 3) {
-     // http://www.networksorcery.com/enp/rfc/rfc2250.txt
-     // version
-     unsigned int v = (BufferAddr[0] >> 6) & 0x03;
-     // extension bit
-     unsigned int x = (BufferAddr[0] >> 4) & 0x01;
-     // cscr count
-     unsigned int cc = BufferAddr[0] & 0x0F;
-     // payload type: MPEG2 TS = 33
-     //unsigned int pt = readBuffer[1] & 0x7F;
-     // header lenght
-     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) |
-                            (BufferAddr[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)) {
-        // Set argument point to payload in read buffer
-        memmove(BufferAddr, &BufferAddr[headerlen], (len - headerlen));
-        return (len - headerlen);
-        }
-     }
+  // Read data from socket in a loop
+  do {
+    socklen_t addrlen = sizeof(sockAddr);
+    struct msghdr msgh;
+    struct iovec iov;
+    char cbuf[256];
+    len = 0;
+    // Initialize iov and msgh structures
+    memset(&msgh, 0, sizeof(struct msghdr));
+    iov.iov_base = BufferAddr;
+    iov.iov_len = BufferLen;
+    msgh.msg_control = cbuf;
+    msgh.msg_controllen = sizeof(cbuf);
+    msgh.msg_name = &sockAddr;
+    msgh.msg_namelen = addrlen;
+    msgh.msg_iov  = &iov;
+    msgh.msg_iovlen = 1;
+    msgh.msg_flags = 0;
+
+    if (isActive && socketDesc && BufferAddr && (BufferLen > 0))
+       len = (int)recvmsg(socketDesc, &msgh, MSG_DONTWAIT);
+    else
+       break;
+    if (len > 0) {
+#ifndef __FreeBSD__
+       // Process auxiliary received data and validate source address
+       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) || (htonl(INADDR_ANY) == streamAddr)) {
+#endif // __FreeBSD__
+                 if (BufferAddr[0] == TS_SYNC_BYTE)
+                    return len;
+                 else if (len > 3) {
+                    // http://www.networksorcery.com/enp/rfc/rfc2250.txt
+                    // version
+                    unsigned int v = (BufferAddr[0] >> 6) & 0x03;
+                    // extension bit
+                    unsigned int x = (BufferAddr[0] >> 4) & 0x01;
+                    // cscr count
+                    unsigned int cc = BufferAddr[0] & 0x0F;
+                    // payload type: MPEG2 TS = 33
+                    //unsigned int pt = readBuffer[1] & 0x7F;
+                    // header lenght
+                    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) |
+                                           (BufferAddr[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)) {
+                       // Set argument point to payload in read buffer
+                       memmove(BufferAddr, &BufferAddr[headerlen], (len - headerlen));
+                       return (len - headerlen);
+                       }
+                    }
+#ifndef __FreeBSD__
+                 }
+              }
+           }
+#endif // __FreeBSD__
+       }
+    } while (len > 0);
+  ERROR_IF_RET(len < 0 && errno != EAGAIN, "recvmsg()", return -1);
+
  return 0;
 }

@@ -157,10 +315,43 @@ cIptvTcpSocket::~cIptvTcpSocket()
  debug("cIptvTcpSocket::~cIptvTcpSocket()\n");
 }

-bool cIptvTcpSocket::OpenSocket(const int Port)
+bool cIptvTcpSocket::OpenSocket(const int Port, const char *StreamAddr)
 {
  debug("cIptvTcpSocket::OpenSocket()\n");
-  return cIptvSocket::OpenSocket(Port, false);
+  // Socket must be opened before setting the host address
+  return (cIptvSocket::OpenSocket(Port, false) && CheckAddress(StreamAddr, &sockAddr.sin_addr.s_addr));
+}
+
+void cIptvTcpSocket::CloseSocket(void)
+{
+  debug("cIptvTcpSocket::CloseSocket()\n");
+  cIptvSocket::CloseSocket();
+}
+
+bool cIptvTcpSocket::ConnectSocket(void)
+{
+  debug("cIptvTcpSocket::ConnectSocket()\n");
+  if (!isActive && (socketDesc >= 0)) {
+     int retval = connect(socketDesc, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
+     // 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);
+     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);
+     // If not any errors, then socket must be ready and connected
+     if (retval != 0) {
+        char tmp[64];
+        error("Connect() failed: %s", strerror_r(retval, tmp, sizeof(tmp)));
+        return false;
+        }
+     }
+
+  return true;
 }

 int cIptvTcpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
@@ -171,10 +362,49 @@ int cIptvTcpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
     error("Invalid socket in %s\n", __FUNCTION__);
     return -1;
     }
+  int len = 0;
  socklen_t addrlen = sizeof(sockAddr);
  // Read data from socket
  if (isActive && socketDesc && BufferAddr && (BufferLen > 0))
-     return (int)recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
-                     (struct sockaddr *)&sockAddr, &addrlen);
-  return 0;
+     len = (int)recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
+                         (struct sockaddr *)&sockAddr, &addrlen);
+  return len;
+}
+
+bool cIptvTcpSocket::ReadChar(char* BufferAddr, unsigned int TimeoutMs)
+{
+  //debug("cIptvTcpSocket::ReadChar()\n");
+  // Error out if socket not initialized
+  if (socketDesc <= 0) {
+     error("Invalid socket in %s\n", __FUNCTION__);
+     return false;
+     }
+  socklen_t addrlen = sizeof(sockAddr);
+  // Wait 500ms for data
+  int retval = select_single_desc(socketDesc, 1000 * TimeoutMs, false);
+  // Check if error
+  if (retval < 0)
+     return false;
+  // Check if data available
+  else if (retval) {
+     retval = (int)recvfrom(socketDesc, BufferAddr, 1, MSG_DONTWAIT,
+                            (struct sockaddr *)&sockAddr, &addrlen);
+     if (retval <= 0)
+        return false;
+     }
+
+  return true;
+}
+
+bool cIptvTcpSocket::Write(const char* BufferAddr, unsigned int BufferLen)
+{
+  //debug("cIptvTcpSocket::Write()\n");
+  // Error out if socket not initialized
+  if (socketDesc <= 0) {
+     error("Invalid socket in %s\n", __FUNCTION__);
+     return false;
+     }
+  ERROR_IF_RET(send(socketDesc, BufferAddr, BufferLen, 0) < 0, "send()", return false);
+
+  return true;
 }
--- a/socket.h
+++ b/socket.h
@@ -9,10 +9,15 @@
 #define __IPTV_SOCKET_H

 #include <arpa/inet.h>
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif // __FreeBSD__

 class cIptvSocket {
-protected:
+private:
  int socketPort;
+
+protected:
  int socketDesc;
  struct sockaddr_in sockAddr;
  bool isActive;
@@ -20,6 +25,7 @@ protected:
 protected:
  bool OpenSocket(const int Port, const bool isUdp);
  void CloseSocket(void);
+  bool CheckAddress(const char *Addr, in_addr_t *InAddr);

 public:
  cIptvSocket();
@@ -27,11 +33,20 @@ public:
 };

 class cIptvUdpSocket : public cIptvSocket {
+private:
+  in_addr_t streamAddr;
+  in_addr_t sourceAddr;
+  bool useIGMPv3;
+
 public:
  cIptvUdpSocket();
  virtual ~cIptvUdpSocket();
  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen);
  bool OpenSocket(const int Port);
+  bool OpenSocket(const int Port, const char *StreamAddr, const char *SourceAddr, bool UseIGMPv3);
+  void CloseSocket(void);
+  bool JoinMulticast(void);
+  bool DropMulticast(void);
 };

 class cIptvTcpSocket : public cIptvSocket {
@@ -39,7 +54,11 @@ public:
  cIptvTcpSocket();
  virtual ~cIptvTcpSocket();
  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen);
-  bool OpenSocket(const int Port);
+  bool OpenSocket(const int Port, const char *StreamAddr);
+  void CloseSocket(void);
+  bool ConnectSocket(void);
+  bool ReadChar(char* BufferAddr, unsigned int TimeoutMs);
+  bool Write(const char* BufferAddr, unsigned int BufferLen);
 };

 #endif // __IPTV_SOCKET_H
--- a/source.c
+++ b/source.c
@@ -127,7 +127,9 @@ cIptvSourceParam::cIptvSourceParam(char Source, const char *Description)
    param(0),
    nid(0),
    tid(0),
-    rid(0)
+    rid(0),
+    data(),
+    itp()
 {
  debug("cIptvSourceParam::cIptvSourceParam(): Source=%c Description=%s\n", Source, Description);

@@ -160,14 +162,14 @@ cOsdItem *cIptvSourceParam::GetOsdItem(void)
 {
  debug("cIptvSourceParam::GetOsdItem()\n");
  switch (param++) {
-    case  0: return new cMenuEditIntItem( tr("Nid"),       &nid,      0);
-    case  1: return new cMenuEditIntItem( tr("Tid"),       &tid,      0);
-    case  2: return new cMenuEditIntItem( tr("Rid"),       &rid,      0);
-    case  3: return new cMenuEditBoolItem(tr("Scan sid"),  &itp.sidscan);
-    case  4: return new cMenuEditBoolItem(tr("Scan pids"), &itp.pidscan);
-    case  5: return new cMenuEditStraItem(tr("Protocol"),  &itp.protocol,  ELEMENTS(protocols), protocols);
-    case  6: return new cMenuEditStrItem( tr("Address"),    itp.address,   sizeof(itp.address));
-    case  7: return new cMenuEditIntItem( tr("Parameter"), &itp.parameter, 0,                   0xFFFF);
+    case  0: return new cMenuEditIntItem( tr("Nid"),              &nid, 0);
+    case  1: return new cMenuEditIntItem( tr("Tid"),              &tid, 0);
+    case  2: return new cMenuEditIntItem( tr("Rid"),              &rid, 0);
+    case  3: return new cMenuEditBoolItem(tr("Scan section ids"), &itp.sidscan);
+    case  4: return new cMenuEditBoolItem(tr("Scan pids"),        &itp.pidscan);
+    case  5: return new cMenuEditStraItem(tr("Protocol"),         &itp.protocol,  ELEMENTS(protocols), protocols);
+    case  6: return new cMenuEditStrItem( tr("Address"),           itp.address,   sizeof(itp.address));
+    case  7: return new cMenuEditIntItem( tr("Parameter"),        &itp.parameter, 0,                   0xFFFF);
    default: return NULL;
    }
  return NULL;
--- a/statistics.c
+++ b/statistics.c
@@ -148,7 +148,7 @@ cString cIptvStreamerStatistics::GetStreamerStatistic()
  long bitrate = elapsed ? (long)(1000.0L * dataBytes / KILOBYTE(1) / elapsed) : 0L;
  if (!IptvConfig.GetUseBytes())
     bitrate *= 8;
-  cString info = cString::sprintf("Stream bitrate: %ld k%s/s\n", bitrate, IptvConfig.GetUseBytes() ? "B" : "bit");
+  cString info = cString::sprintf("%ld k%s/s", bitrate, IptvConfig.GetUseBytes() ? "B" : "bit");
  dataBytes = 0;
  return info;
 }
@@ -164,6 +164,7 @@ void cIptvStreamerStatistics::AddStreamerStatistic(long Bytes)
 // Buffer statistic class
 cIptvBufferStatistics::cIptvBufferStatistics()
 : dataBytes(0),
+  freeSpace(0),
  usedSpace(0),
  timer(),
  mutex()
--- a/streamer.c
+++ b/streamer.c
@@ -108,8 +108,8 @@ bool cIptvStreamer::Set(const char* Location, const int Parameter, const int Ind
 cString cIptvStreamer::GetInformation(void)
 {
  //debug("cIptvStreamer::GetInformation()");
-  cString info("Stream:");
+  cString info;
  if (protocol)
-     info = cString::sprintf("%s %s", *info, *protocol->GetInformation());
-  return cString::sprintf("%s\n", *info);
+     info = protocol->GetInformation();
+  return info;
 }
Author	SHA1	Message	Date
Rolf Ahrenberg	c975d458f5	Removed the disable_ca_updates patch.	2012-09-30 18:44:45 +03:00
Rolf Ahrenberg	11d864c16b	Updated for vdr-1.7.30 and added support for source-specific multicasts (SSM). Changed default external script directory from the configuration to the resource.	2012-09-30 18:42:40 +03:00
Rolf Ahrenberg	75d17b289b	Added FreeBSD support (Thanks to Jürgen Lock).	2012-07-10 22:12:29 +03:00
Rolf Ahrenberg	547306b67c	Updated translations.	2012-06-03 12:31:33 +03:00
Rolf Ahrenberg	763c83209d	Updated README.	2012-06-03 12:24:09 +03:00
Rolf Ahrenberg	af85ef1703	Prepared for 1.0.0 release.	2012-06-02 21:57:29 +03:00
Rolf Ahrenberg	24ecadf414	Updated device selection.	2012-06-02 15:37:05 +03:00
Antti Seppälä	f4126b7e2c	Try to read all data from udp socket at once Existing implementation of udp read mechanism was giving up too easily. Replaced it with version that tries more actively to drain the entire socket buffer. Signed-off-by: Antti Seppälä <a.seppala@gmail.com>	2012-06-02 14:34:41 +03:00
Rolf Ahrenberg	c7cbde301b	Tweaked reading from UDP sockets.	2012-06-02 13:32:28 +03:00
Rolf Ahrenberg	06506c41f6	Fixed TCP socket connection and silenced compilation warnings.	2012-04-26 21:32:20 +03:00
Rolf Ahrenberg	c33b05076a	Incremented version number and updated HISTORY.	2012-04-26 00:29:46 +03:00
Rolf Ahrenberg	38bd9a21f6	Fixed response header parsing in HTTP protocol.	2012-04-26 00:27:24 +03:00
Rolf Ahrenberg	4c7b2ea69b	Added cIptvDevice::DeviceType() and updated HISTORY.	2012-04-02 19:15:53 +03:00
Rolf Ahrenberg	c475b26515	Changed UDP protocol to always utilize the source address validation.	2012-04-02 00:35:32 +03:00
Rolf Ahrenberg	9145fb8bb8	Silenced a warning in the HTTP protocol.	2012-04-01 22:47:50 +03:00
Rolf Ahrenberg	7a8b2962b2	Added support for a service interface.	2012-04-01 22:46:08 +03:00
Rolf Ahrenberg	626d0402c2	Updated the disable ca updates patch.	2012-03-31 20:43:10 +03:00
Rolf Ahrenberg	b3b06e569f	Fixed some channel switching bugs.	2012-03-31 20:32:04 +03:00
Rolf Ahrenberg	ff84c54d50	Fixed channel switching in UDP protocol.	2012-03-30 19:01:46 +03:00
Rolf Ahrenberg	4c39d8cf72	Updated device name.	2012-03-30 18:22:10 +03:00
Rolf Ahrenberg	0b790260fa	Updated for vdr-1.7.27.	2012-03-25 16:42:06 +03:00
Rolf Ahrenberg	79113bbe09	Updated default CXXFLAGS.	2012-03-25 16:03:22 +03:00
Rolf Ahrenberg	30de763a4b	Updated for vdr-1.7.26.	2012-03-10 23:22:20 +02:00
Rolf Ahrenberg	868865c47d	Updated for vdr-1.7.25.	2012-03-03 15:18:59 +02:00
Rolf Ahrenberg	a73921041f	Added a GIT tag into the version string.	2012-02-26 22:54:45 +02:00
Rolf Ahrenberg	49e3a9e23a	Silenced compilation warnings.	2012-02-19 19:14:10 +02:00
Rolf Ahrenberg	73311873bc	Updated Makefile.	2012-02-19 17:47:43 +02:00
Rolf Ahrenberg	816c357065	Updated the patch.	2012-02-19 17:43:43 +02:00
Rolf Ahrenberg	5838bda3f0	Added missing initializers.	2012-02-02 19:09:08 +02:00
Rolf Ahrenberg	079b02d69e	Updated translation files.	2012-02-02 18:56:05 +02:00
Rolf Ahrenberg	6582f137b9	Updated for vdr-1.7.23 and version number.	2012-02-02 18:50:18 +02:00
Rolf Ahrenberg	2bd31e9eda	Silenced harmless "case value not in enumerated type" warnings.	2011-12-04 19:40:46 +02:00
Rolf Ahrenberg	c2f88fbbb3	Updated for vdr-1.7.21.	2011-09-04 17:58:18 +03:00
Rolf Ahrenberg	52ae2bdf63	Updated patches.	2011-08-20 20:28:12 +03:00
Rolf Ahrenberg	1898defeb6	Updated for vdr-1.7.19.	2011-06-19 22:07:01 +03:00
Rolf Ahrenberg	21719d3397	Updated I18N target and patches.	2011-06-19 16:57:40 +03:00
Rolf Ahrenberg	bf3fc70d2d	Added cppcheck target into Makefile.	2011-06-15 17:49:15 +03:00
Rolf Ahrenberg	99d6c0f207	Updated patches.	2011-03-13 23:45:51 +02:00
Rolf Ahrenberg	ca4fdc761f	Added package name and version to xgettext and made 'dist' target dependent on up to date *.po files.	2011-03-13 18:58:22 +02:00
Rolf Ahrenberg	37c5ee26ae	Added support for LDFLAGS.	2010-12-14 19:27:00 +02:00
Rolf Ahrenberg	8ba0b3a417	Enabled one debug message.	2010-12-08 18:33:24 +02:00
Rolf Ahrenberg	cfb60a06ba	Tweaked translation files.	2010-12-08 10:47:44 +02:00
Rolf Ahrenberg	6ed0ebd734	Updated translation files.	2010-12-04 18:58:52 +02:00
Rolf Ahrenberg	2081ab41a8	Canonicalized the configuration directory.	2010-12-03 16:00:40 +02:00
Rolf Ahrenberg	66ab92584b	Fixed a regression introduced in HTTP protocol.	2010-12-02 17:32:02 +02:00
Rolf Ahrenberg	05e57802c3	Fixed debug compilation.	2010-12-01 10:09:11 +02:00
Rolf Ahrenberg	55bb0e65df	Disable detaching of receivers if retuned to an existing channel (Thanks to Zdeněk Kopřivík).	2010-11-29 21:09:17 +02:00
Rolf Ahrenberg	ea4f8fde31	Fixed Open()/Close() when using UDP protocol.	2010-11-29 18:27:39 +02:00
Rolf Ahrenberg	ef615c4bc5	Reverted script changes.	2010-11-29 12:26:01 +02:00
Rolf Ahrenberg	a6d4e850fc	Fixed EXT protocol execution (Thanks to Peter Holik). Changed scripts to use bash instead of sh.	2010-10-25 14:43:38 +03:00
Rolf Ahrenberg	fd06641449	Added Makefile depencency for objects. Changed ProvidesChannel() to set needsDetachReceivers only if any receivers are attached.	2010-10-11 23:19:59 +03:00
Rolf Ahrenberg	05e52079f8	Fixed the messed up version number.	2010-09-19 22:01:24 +03:00
Rolf Ahrenberg	f0469e24cc	Updated for vdr-1.7.16.	2010-09-19 20:48:07 +03:00
Rolf Ahrenberg	7629e34d2a	Refactored cIptvTcpSocket class.	2010-09-15 23:41:25 +03:00
Rolf Ahrenberg	ac458b0c36	Moved JoinMulticast()/DropMulticast() into cIptvUdpSocket class.	2010-09-15 18:18:46 +03:00
Rolf Ahrenberg	2d583e8cfa	Refactored multicast source address validation.	2010-09-15 17:37:20 +03:00
Rolf Ahrenberg	b0dba49fbc	Added missing setsockopt() for IP_PKTINFO. Cleaned up Italian translation.	2010-09-12 12:54:14 +03:00
Rolf Ahrenberg	a05766c90d	The "inetAddr" must be set after CloseSocket().	2010-09-10 23:41:26 +03:00
Rolf Ahrenberg	d1fdc390c9	Enabled partial content responses for HTTP protocol. Updated README and PO headers.	2010-09-10 10:54:06 +03:00
Rolf Ahrenberg	d126da8ed8	Changed ProvidesChannel() to set the need of detaching receivers due to VDR's channel selection mechanism.	2010-08-23 09:34:57 +03:00
Rolf Ahrenberg	2567501b65	Fixed audio pid detection in pid scanner.	2010-07-10 23:27:07 +03:00
Rolf Ahrenberg	12b54fbbc2	Refactored source address validation.	2010-07-02 23:08:02 +03:00
Rolf Ahrenberg	a2d8c367f6	Changed translation bug address and tweaked an example script.	2010-07-02 22:25:55 +03:00
Rolf Ahrenberg	3f88e7a911	Added validation for source addresses of socket data.	2010-07-02 18:28:49 +03:00
Rolf Ahrenberg	8a96e5b327	Renamed Sid scanner to section id scanner and added experimental Tid/Nid support into it.	2010-07-02 15:54:32 +03:00