Updated HISTORY.

Fixed argument corruption.

HISTORY

@@ -108,3 +108,16 @@ VDR Plugin 'iptv' Revision History
   (Thanks to Peter Holik for reporting this one).
 - Updated example scripts to use ffmpeg's direct UDP output
   and added a new "image.sh" script (Thanks to Peter Holik).
+
+2009-10-01: Version 0.3.1
+
+- Updated patches.
+- Added optional patches to disable EIT scanning.
+- Fixed handling of HTTP protocol headers.
+- Modified sectionfilters to use socket pair instead of
+  filesystem fifos.
+
+2010-03-05: Version 0.3.2
+
+- Updated patches.
+- Fixed argument corruption.

common.c

@@ -10,7 +10,7 @@
 
 uint16_t ts_pid(const uint8_t *buf)
 {
-  return ((buf[1] & 0x1f) << 8) + buf[2];
+  return (uint16_t)(((buf[1] & 0x1f) << 8) + buf[2]);
 }
 
 uint8_t payload(const uint8_t *tsp)
@@ -22,7 +22,7 @@ uint8_t payload(const uint8_t *tsp)
      if (tsp[4] > 183) // corrupted data?
         return 0;
      else
-        return (184 - 1) - tsp[4];
+        return (uint8_t)((184 - 1) - tsp[4]);
      }
 
   return 184;

common.h

@@ -14,10 +14,10 @@
 
 #ifdef DEBUG
 #define debug(x...) dsyslog("IPTV: " x);
-#define error(x...) esyslog("IPTV: " x);
+#define error(x...) esyslog("ERROR: " x);
 #else
 #define debug(x...) ;
-#define error(x...) esyslog("IPTV: " x);
+#define error(x...) esyslog("ERROR: " x);
 #endif
 
 #ifndef trNOOP
@@ -28,7 +28,6 @@
 #define trVDR(s) tr(s)
 #endif
 
-#define IPTV_FILTER_FILENAME            "/tmp/vdr-iptv%d.filter%d"
 #define IPTV_DVR_FILENAME               "/tmp/vdr-iptv%d.dvr"
 
 #define IPTV_DEVICE_INFO_ALL            0
@@ -45,7 +44,7 @@
   do {                                                            \
      if (exp) {                                                   \
         char tmp[64];                                             \
-        error("ERROR: "errstr": %s", strerror_r(errno, tmp, sizeof(tmp))); \
+        error(errstr": %s", strerror_r(errno, tmp, sizeof(tmp))); \
         func;                                                     \
         ret;                                                      \
         }                                                         \

device.c

@@ -272,7 +272,7 @@ bool cIptvDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   debug("cIptvDevice::SetChannelDevice(%d)\n", deviceIndex);
   location = GetChannelSettings(Channel->PluginParam(), &parameter, &sidscan, &pidscan, &protocol);
   if (isempty(location)) {
-     error("ERROR: Unrecognized IPTV channel settings: %s", Channel->PluginParam());
+     error("Unrecognized IPTV channel settings: %s", Channel->PluginParam());
      return false;
      }
   sidScanEnabled = sidscan ? true : false;
@@ -427,7 +427,7 @@ bool cIptvDevice::GetTSPacket(uchar *&Data)
                   }
                }
            tsBuffer->Del(Count);
-           error("ERROR: skipped %d bytes to sync on TS packet\n", Count);
+           error("Skipped %d bytes to sync on TS packet\n", Count);
            return false;
            }
         isPacketDelivered = true;
@@ -436,7 +436,7 @@ bool cIptvDevice::GetTSPacket(uchar *&Data)
         AddPidStatistic(ts_pid(p), payload(p));
         // Send data also to dvr fifo
         if (dvrFd >= 0)
-           Count = write(dvrFd, p, TS_SIZE);
+           Count = (int)write(dvrFd, p, TS_SIZE);
         // Analyze incomplete streams with built-in pid analyzer
         if (pidScanEnabled && pPidScanner)
            pPidScanner->Process(p);

iptv.c

@@ -20,7 +20,7 @@
 #error "VDR-1.6.0 API version or greater is required!"
 #endif
 
-static const char VERSION[]     = "0.3.0";
+static const char VERSION[]     = "0.3.2";
 static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
 
 class cPluginIptv : public cPlugin {
@@ -78,7 +78,7 @@ bool cPluginIptv::ProcessArgs(int argc, char *argv[])
   // Implement command line argument processing here if applicable.
   static const struct option long_options[] = {
     { "devices", required_argument, NULL, 'd' },
-    { NULL, 0, NULL, 0 }
+    { NULL,      no_argument,       NULL,  0  }
     };
 
   int c;

patches/vdr-1.6.0-disable_eitscan.patch

@@ -0,0 +1,12 @@
+diff -Nru vdr-1.6.0-vanilla/eitscan.c vdr-1.6.0-disable_eitscan/eitscan.c
+--- vdr-1.6.0-vanilla/eitscan.c	2006-01-07 16:10:17.000000000 +0200
++++ vdr-1.6.0-disable_eitscan/eitscan.c	2009-06-17 16:04:23.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 && !Channel->IsPlug()) {
+                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
+                             if (Device->ProvidesTransponder(Channel)) {
+                                if (!Device->Receiving()) {

patches/vdr-1.7.12-disable_ca_updates.patch

@@ -0,0 +1,11 @@
+diff -Nru vdr-1.7.12-vanilla/pat.c vdr-1.7.12-disable_ca_updates/pat.c
+--- vdr-1.7.12-vanilla/pat.c	2010-02-01 11:45:40.000000000 +0200
++++ vdr-1.7.12-disable_ca_updates/pat.c	2010-02-01 13:54:32.000000000 +0200
+@@ -458,6 +458,7 @@
+             }
+         if (Setup.UpdateChannels >= 2) {
+            Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
++           if (!Channel->IsPlug())
+            Channel->SetCaIds(CaDescriptors->CaIds());
+            Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
+            }

patches/vdr-1.7.12-disable_eitscan.patch

@@ -0,0 +1,12 @@
+diff -Nru vdr-1.7.12-vanilla/eitscan.c vdr-1.7.12-disable_eitscan/eitscan.c
+--- vdr-1.7.12-vanilla/eitscan.c	2010-02-01 11:45:39.000000000 +0200
++++ vdr-1.7.12-disable_eitscan/eitscan.c	2010-02-01 13:54:20.000000000 +0200
+@@ -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 && !Channel->IsPlug()) {
+                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
+                             if (Device->ProvidesTransponder(Channel)) {
+                                if (!Device->Receiving()) {

patches/vdr-1.7.12-pluginparam.patch

@@ -1,6 +1,6 @@
-diff -Nru vdr-1.7.7-vanilla/channels.c vdr-1.7.7-pluginparam/channels.c
---- vdr-1.7.7-vanilla/channels.c	2009-04-25 16:57:32.000000000 +0300
-+++ vdr-1.7.7-pluginparam/channels.c	2009-05-22 10:57:39.000000000 +0300
+diff -Nru vdr-1.7.12-vanilla/channels.c vdr-1.7.12-pluginparam/channels.c
+--- vdr-1.7.12-vanilla/channels.c	2010-02-01 11:45:39.000000000 +0200
++++ vdr-1.7.12-pluginparam/channels.c	2010-02-01 13:52:56.000000000 +0200
 @@ -188,6 +188,7 @@
    shortName = strdup("");
    provider = strdup("");
@@ -33,7 +33,7 @@ diff -Nru vdr-1.7.7-vanilla/channels.c vdr-1.7.7-pluginparam/channels.c
    memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
    return *this;
  }
-@@ -306,9 +310,26 @@
+@@ -307,9 +311,26 @@
       guard        = Channel->guard;
       hierarchy    = Channel->hierarchy;
       rollOff      = Channel->rollOff;
@@ -60,7 +60,7 @@ diff -Nru vdr-1.7.7-vanilla/channels.c vdr-1.7.7-pluginparam/channels.c
  bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff)
  {
    // Workarounds for broadcaster stupidity:
-@@ -438,6 +459,18 @@
+@@ -439,6 +460,18 @@
       }
  }
  
@@ -79,7 +79,7 @@ diff -Nru vdr-1.7.7-vanilla/channels.c vdr-1.7.7-pluginparam/channels.c
  #define STRDIFF 0x01
  #define VALDIFF 0x02
  
-@@ -632,7 +665,7 @@
+@@ -652,7 +685,7 @@
    if (isdigit(type))
       type = 'S';
  #define ST(s) if (strchr(s, type))
@@ -88,7 +88,7 @@ diff -Nru vdr-1.7.7-vanilla/channels.c vdr-1.7.7-pluginparam/channels.c
    char *q = buffer;
    *q = 0;
    ST(" S ")  q += sprintf(q, "%c", polarization);
-@@ -646,6 +679,7 @@
+@@ -666,6 +699,7 @@
    ST(" S ")  q += PrintParameter(q, 'S', MapToUser(system, SystemValues));
    ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
    ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
@@ -96,7 +96,7 @@ diff -Nru vdr-1.7.7-vanilla/channels.c vdr-1.7.7-pluginparam/channels.c
    return buffer;
  }
  
-@@ -674,7 +708,7 @@
+@@ -694,7 +728,7 @@
  
  bool cChannel::StringToParameters(const char *s)
  {
@@ -105,7 +105,7 @@ diff -Nru vdr-1.7.7-vanilla/channels.c vdr-1.7.7-pluginparam/channels.c
          switch (toupper(*s)) {
            case 'A': s = SkipDigits(s); break; // for compatibility with the "multiproto" approach - may be removed in future versions
            case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
-@@ -792,7 +826,7 @@
+@@ -814,7 +848,7 @@
          dpids[0] = 0;
          ok = false;
          if (parambuf && sourcebuf && vpidbuf && apidbuf) {
@@ -114,7 +114,7 @@ diff -Nru vdr-1.7.7-vanilla/channels.c vdr-1.7.7-pluginparam/channels.c
  
             char *p;
             if ((p = strchr(vpidbuf, '=')) != NULL) {
-@@ -887,6 +921,7 @@
+@@ -911,6 +945,7 @@
             shortName = strcpyrealloc(shortName, p);
             }
          name = strcpyrealloc(name, namebuf);
@@ -122,9 +122,9 @@ diff -Nru vdr-1.7.7-vanilla/channels.c vdr-1.7.7-pluginparam/channels.c
  
          free(parambuf);
          free(sourcebuf);
-diff -Nru vdr-1.7.7-vanilla/channels.h vdr-1.7.7-pluginparam/channels.h
---- vdr-1.7.7-vanilla/channels.h	2008-11-22 15:35:52.000000000 +0200
-+++ vdr-1.7.7-pluginparam/channels.h	2009-05-22 10:57:39.000000000 +0300
+diff -Nru vdr-1.7.12-vanilla/channels.h vdr-1.7.12-pluginparam/channels.h
+--- vdr-1.7.12-vanilla/channels.h	2010-02-01 11:45:39.000000000 +0200
++++ vdr-1.7.12-pluginparam/channels.h	2010-02-01 13:52:56.000000000 +0200
 @@ -116,6 +116,7 @@
    char *shortName;
    char *provider;
@@ -133,7 +133,7 @@ diff -Nru vdr-1.7.7-vanilla/channels.h vdr-1.7.7-pluginparam/channels.h
    int __BeginData__;
    int frequency; // MHz
    int source;
-@@ -171,6 +172,7 @@
+@@ -174,6 +175,7 @@
    int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf'
    int Transponder(void) const;                    ///< Returns the transponder frequency in MHz, plus the polarization in case of sat
    static int Transponder(int Frequency, char Polarization); ///< builds the transponder from the given Frequency and Polarization
@@ -141,7 +141,7 @@ diff -Nru vdr-1.7.7-vanilla/channels.h vdr-1.7.7-pluginparam/channels.h
    int Source(void) const { return source; }
    int Srate(void) const { return srate; }
    int Vpid(void) const { return vpid; }
-@@ -208,6 +210,7 @@
+@@ -214,6 +216,7 @@
    int RollOff(void) const { return rollOff; }
    const cLinkChannels* LinkChannels(void) const { return linkChannels; }
    const cChannel *RefChannel(void) const { return refChannel; }
@@ -149,7 +149,7 @@ diff -Nru vdr-1.7.7-vanilla/channels.h vdr-1.7.7-pluginparam/channels.h
    bool IsCable(void) const { return cSource::IsCable(source); }
    bool IsSat(void) const { return cSource::IsSat(source); }
    bool IsTerr(void) const { return cSource::IsTerr(source); }
-@@ -215,12 +218,14 @@
+@@ -221,12 +224,14 @@
    bool HasTimer(void) const;
    int Modification(int Mask = CHANNELMOD_ALL);
    void CopyTransponderData(const cChannel *Channel);
@@ -164,21 +164,21 @@ diff -Nru vdr-1.7.7-vanilla/channels.h vdr-1.7.7-pluginparam/channels.h
    void SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
    void SetCaIds(const int *CaIds); // list must be zero-terminated
    void SetCaDescriptors(int Level);
-diff -Nru vdr-1.7.7-vanilla/config.h vdr-1.7.7-pluginparam/config.h
---- vdr-1.7.7-vanilla/config.h	2009-05-03 16:15:35.000000000 +0300
-+++ vdr-1.7.7-pluginparam/config.h	2009-05-22 10:57:39.000000000 +0300
+diff -Nru vdr-1.7.12-vanilla/config.h vdr-1.7.12-pluginparam/config.h
+--- vdr-1.7.12-vanilla/config.h	2010-02-01 11:45:39.000000000 +0200
++++ vdr-1.7.12-pluginparam/config.h	2010-02-01 13:52:56.000000000 +0200
 @@ -30,6 +30,8 @@
- #define APIVERSION  "1.7.7"
- #define APIVERSNUM   10707  // Version * 10000 + Major * 100 + Minor
+ #define APIVERSION  "1.7.12"
+ #define APIVERSNUM   10712  // Version * 10000 + Major * 100 + Minor
  
 +#define PLUGINPARAMPATCHVERSNUM 1
 +
  // When loading plugins, VDR searches them by their APIVERSION, which
  // may be smaller than VDRVERSION in case there have been no changes to
  // VDR header files since the last APIVERSION. This allows compiled
-diff -Nru vdr-1.7.7-vanilla/menu.c vdr-1.7.7-pluginparam/menu.c
---- vdr-1.7.7-vanilla/menu.c	2009-05-03 16:30:13.000000000 +0300
-+++ vdr-1.7.7-pluginparam/menu.c	2009-05-22 10:57:39.000000000 +0300
+diff -Nru vdr-1.7.12-vanilla/menu.c vdr-1.7.12-pluginparam/menu.c
+--- vdr-1.7.12-vanilla/menu.c	2010-02-01 11:45:39.000000000 +0200
++++ vdr-1.7.12-pluginparam/menu.c	2010-02-01 13:52:56.000000000 +0200
 @@ -190,6 +190,7 @@
    cChannel *channel;
    cChannel data;
@@ -211,29 +211,29 @@ diff -Nru vdr-1.7.7-vanilla/menu.c vdr-1.7.7-pluginparam/menu.c
             if (channel) {
                *channel = data;
                isyslog("edited channel %d %s", channel->Number(), *data.ToText());
-diff -Nru vdr-1.7.7-vanilla/po/fi_FI.po vdr-1.7.7-pluginparam/po/fi_FI.po
---- vdr-1.7.7-vanilla/po/fi_FI.po	2009-05-03 17:15:20.000000000 +0300
-+++ vdr-1.7.7-pluginparam/po/fi_FI.po	2009-05-22 10:57:39.000000000 +0300
-@@ -1010,3 +1010,6 @@
+diff -Nru vdr-1.7.12-vanilla/po/fi_FI.po vdr-1.7.12-pluginparam/po/fi_FI.po
+--- vdr-1.7.12-vanilla/po/fi_FI.po	2010-02-01 11:45:40.000000000 +0200
++++ vdr-1.7.12-pluginparam/po/fi_FI.po	2010-02-01 13:52:56.000000000 +0200
+@@ -1306,3 +1306,6 @@
  #, c-format
  msgid "VDR will shut down in %s minutes"
  msgstr "VDR sammuu %s minuutin kuluttua"
 +
 +msgid "Parameters"
 +msgstr "Parametrit"
-diff -Nru vdr-1.7.7-vanilla/po/fr_FR.po vdr-1.7.7-pluginparam/po/fr_FR.po
---- vdr-1.7.7-vanilla/po/fr_FR.po	2009-05-03 17:15:20.000000000 +0300
-+++ vdr-1.7.7-pluginparam/po/fr_FR.po	2009-05-22 10:57:39.000000000 +0300
-@@ -1013,3 +1013,6 @@
+diff -Nru vdr-1.7.12-vanilla/po/fr_FR.po vdr-1.7.12-pluginparam/po/fr_FR.po
+--- vdr-1.7.12-vanilla/po/fr_FR.po	2010-02-01 11:45:40.000000000 +0200
++++ vdr-1.7.12-pluginparam/po/fr_FR.po	2010-02-01 13:52:56.000000000 +0200
+@@ -1309,3 +1309,6 @@
  #, c-format
  msgid "VDR will shut down in %s minutes"
  msgstr "VDR s'arrêtera dans %s minutes"
 +
 +msgid "Parameters"
 +msgstr "Paramètres"
-diff -Nru vdr-1.7.7-vanilla/sources.c vdr-1.7.7-pluginparam/sources.c
---- vdr-1.7.7-vanilla/sources.c	2008-02-10 16:07:26.000000000 +0200
-+++ vdr-1.7.7-pluginparam/sources.c	2009-05-22 10:57:39.000000000 +0300
+diff -Nru vdr-1.7.12-vanilla/sources.c vdr-1.7.12-pluginparam/sources.c
+--- vdr-1.7.12-vanilla/sources.c	2010-02-01 11:45:40.000000000 +0200
++++ vdr-1.7.12-pluginparam/sources.c	2010-02-01 13:52:56.000000000 +0200
 @@ -37,6 +37,7 @@
    char buffer[16];
    char *q = buffer;
@@ -250,10 +250,10 @@ diff -Nru vdr-1.7.7-vanilla/sources.c vdr-1.7.7-pluginparam/sources.c
      case 'C': type = stCable; break;
      case 'S': type = stSat;   break;
      case 'T': type = stTerr;  break;
-diff -Nru vdr-1.7.7-vanilla/sources.conf vdr-1.7.7-pluginparam/sources.conf
---- vdr-1.7.7-vanilla/sources.conf	2008-08-16 13:02:27.000000000 +0300
-+++ vdr-1.7.7-pluginparam/sources.conf	2009-05-22 10:57:39.000000000 +0300
-@@ -194,3 +194,7 @@
+diff -Nru vdr-1.7.12-vanilla/sources.conf vdr-1.7.12-pluginparam/sources.conf
+--- vdr-1.7.12-vanilla/sources.conf	2010-02-01 11:45:39.000000000 +0200
++++ vdr-1.7.12-pluginparam/sources.conf	2010-02-01 13:52:56.000000000 +0200
+@@ -195,3 +195,7 @@
  # Terrestrial
  
  T       Terrestrial
@@ -261,9 +261,9 @@ diff -Nru vdr-1.7.7-vanilla/sources.conf vdr-1.7.7-pluginparam/sources.conf
 +# Plugin
 +
 +P       Plugin
-diff -Nru vdr-1.7.7-vanilla/sources.h vdr-1.7.7-pluginparam/sources.h
---- vdr-1.7.7-vanilla/sources.h	2005-05-14 12:30:41.000000000 +0300
-+++ vdr-1.7.7-pluginparam/sources.h	2009-05-22 10:57:39.000000000 +0300
+diff -Nru vdr-1.7.12-vanilla/sources.h vdr-1.7.12-pluginparam/sources.h
+--- vdr-1.7.12-vanilla/sources.h	2010-02-01 11:45:39.000000000 +0200
++++ vdr-1.7.12-pluginparam/sources.h	2010-02-01 13:52:56.000000000 +0200
 @@ -16,10 +16,11 @@
  public:
    enum eSourceType {

patches/vdr-1.7.7-disable_ca_updates.patch

@@ -1,11 +0,0 @@
-diff -Nru vdr-1.7.7-vanilla/pat.c vdr-1.7.7-disable_ca_updates/pat.c
---- vdr-1.7.7-vanilla/pat.c	2008-07-06 17:01:32.000000000 +0300
-+++ vdr-1.7.7-disable_ca_updates/pat.c	2009-05-22 10:57:58.000000000 +0300
-@@ -444,6 +444,7 @@
-             }
-         if (Setup.UpdateChannels >= 2) {
-            Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
-+           if (!Channel->IsPlug())
-            Channel->SetCaIds(CaDescriptors->CaIds());
-            }
-         Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));

protocolext.c

@@ -39,7 +39,7 @@ void cIptvProtocolExt::ExecuteScript(void)
   debug("cIptvProtocolExt::ExecuteScript()\n");
   // Check if already executing
   if (pid > 0) {
-     error("ERROR: Cannot execute script!");
+     error("Cannot execute script!");
      return;
      }
   // Let's fork
@@ -54,7 +54,7 @@ void cIptvProtocolExt::ExecuteScript(void)
      cString cmd = cString::sprintf("%s %d %d", *scriptFile, scriptParameter, socketPort);
      debug("cIptvProtocolExt::ExecuteScript(child): %s\n", *cmd);
      if (execl("/bin/sh", "sh", "-c", *cmd, NULL) == -1) {
-        error("ERROR: Script execution failed: %s", *cmd);
+        error("Script execution failed: %s", *cmd);
         _exit(-1);
         }
      _exit(0);
@@ -79,7 +79,7 @@ void cIptvProtocolExt::TerminateScript(void)
        retval = 0;
        waitms += timeoutms;
        if ((waitms % 2000) == 0) {
-          error("ERROR: Script '%s' won't terminate - killing it!", *scriptFile);
+          error("Script '%s' won't terminate - killing it!", *scriptFile);
           kill(pid, SIGKILL);
           }
        // Clear wait status to make sure child exit status is accessible
@@ -140,7 +140,7 @@ bool cIptvProtocolExt::Set(const char* Location, const int Parameter, const int
      // Update script file and parameter
      scriptFile = cString::sprintf("%s/%s", IptvConfig.GetConfigDirectory(), Location);
      if ((stat(*scriptFile, &stbuf) != 0) || (strstr(*scriptFile, "..") != 0)) {
-        error("ERROR: Non-existent or relative path script '%s'", *scriptFile);
+        error("Non-existent or relative path script '%s'", *scriptFile);
         return false;
         }
      scriptParameter = Parameter;

protocolfile.c

@@ -75,7 +75,7 @@ int cIptvProtocolFile::Read(unsigned char* BufferAddr, unsigned int BufferLen)
    // during the sleep and buffers are disposed. Check here that the plugin is
    // still active before accessing the buffers
    if (isActive)
-      return fread(BufferAddr, sizeof(unsigned char), BufferLen, fileStream);
+      return (int)fread(BufferAddr, sizeof(unsigned char), BufferLen, fileStream);
    return -1;
 }
 

protocolhttp.c

@@ -53,9 +53,8 @@ bool cIptvProtocolHttp::Connect(void)
         struct hostent *host;
         host = gethostbyname(streamAddr);
         if (!host) {
-           error("%s is not valid address\n", streamAddr);
            char tmp[64];
-           error("ERROR: %s", strerror_r(h_errno, tmp, sizeof(tmp)));
+           error("%s is not valid address: %s", streamAddr, strerror_r(h_errno, tmp, sizeof(tmp)));
            return false;
            }
 
@@ -77,9 +76,8 @@ bool cIptvProtocolHttp::Connect(void)
 
      // If not any errors, then socket must be ready and connected
      if (socketStatus != 0) {
-        error("Cannot connect to %s\n", streamAddr);
         char tmp[64];
-        error("ERROR: %s", strerror_r(socketStatus, tmp, sizeof(tmp)));
+        error("Cannot connect to %s: %s", streamAddr, strerror_r(socketStatus, tmp, sizeof(tmp)));
         CloseSocket();
         return false;
         }
@@ -93,8 +91,8 @@ bool cIptvProtocolHttp::Connect(void)
                                        "\r\n", streamPath, streamAddr);
 
      debug("Sending http request: %s\n", *buffer);
-     err = send(socketDesc, buffer, strlen(buffer), 0);
-     ERROR_IF_FUNC(err < 0, "send()", CloseSocket(), return false);
+     ssize_t err2 = send(socketDesc, buffer, strlen(buffer), 0);
+     ERROR_IF_FUNC(err2 < 0, "send()", CloseSocket(), return false);
 
      // Now process headers
      if (!ProcessHeaders()) {
@@ -127,7 +125,7 @@ bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
   debug("cIptvProtocolHttp::GetHeaderLine()\n");
   bool linefeed = false;
   bool newline = false;
-  char buf[256];
+  char buf[4096];
   char *bufptr = buf;
   memset(buf, '\0', sizeof(buf));
   recvLen = 0;
@@ -141,7 +139,7 @@ bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
        return false;
     // Check if data available
     else if (retval) {
-       int retval = recvfrom(socketDesc, bufptr, 1, MSG_DONTWAIT,
+       ssize_t retval = recvfrom(socketDesc, bufptr, 1, MSG_DONTWAIT,
                              (struct sockaddr *)&sockAddr, &addrlen);
        if (retval <= 0)
           return false;
@@ -160,6 +158,7 @@ bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
        // Check that buffers won't be exceeded
        if (recvLen >= sizeof(buf) || recvLen >= destLen) {
           error("Header wouldn't fit into buffer\n");
+          recvLen = 0;
           return false;
           }
        }
@@ -178,20 +177,20 @@ bool cIptvProtocolHttp::ProcessHeaders(void)
   unsigned int lineLength = 0;
   int response = 0;
   bool responseFound = false;
-  char buf[256];
+  char buf[4096];
 
   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, "HTTP/1.%*i %i ", &response) != 1) {
        error("Expected HTTP header not found\n");
        continue;
        }
     else
        responseFound = true;
     if (response != 200) {
-       error("ERROR: %s\n", buf);
+       error("%s\n", buf);
        return false;
        }
     }

sectionfilter.c

@@ -8,7 +8,7 @@
 #include "sectionfilter.h"
 
 cIptvSectionFilter::cIptvSectionFilter(int DeviceIndex, int Index,
-                                       u_short Pid, u_char Tid, u_char Mask)
+                                       uint16_t Pid, uint8_t Tid, uint8_t Mask)
 : pusi_seen(0),
   feedcc(0),
   doneq(0),
@@ -18,8 +18,7 @@ cIptvSectionFilter::cIptvSectionFilter(int DeviceIndex, int Index,
   tsfeedp(0),
   pid(Pid),
   devid(DeviceIndex),
-  id(Index),
-  pipeName("")
+  id(Index)
 {
   //debug("cIptvSectionFilter::cIptvSectionFilter(%d, %d)\n", devid, id);
   int i;
@@ -42,43 +41,46 @@ cIptvSectionFilter::cIptvSectionFilter(int DeviceIndex, int Index,
   for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
       mode = filter_mode[i];
       mask = filter_mask[i];
-      maskandmode[i] = mask & mode;
-      local_doneq |= maskandnotmode[i] = mask & ~mode;
+      maskandmode[i] = (uint8_t)(mask & mode);
+      maskandnotmode[i] = (uint8_t)(mask & ~mode);
+      local_doneq |= maskandnotmode[i];
       }
   doneq = local_doneq ? 1 : 0;
 
-  struct stat sb;
-  pipeName = cString::sprintf(IPTV_FILTER_FILENAME, devid, id);
-  stat(pipeName, &sb);
-  if (S_ISFIFO(sb.st_mode))
-     unlink(pipeName);
-  i = mknod(pipeName, 0644 | S_IFIFO, 0);
-  ERROR_IF_RET(i < 0, "mknod()", return);
-
-  // Create descriptors
-  fifoDescriptor = open(pipeName, O_RDWR | O_NONBLOCK);
-  readDescriptor = open(pipeName, O_RDONLY | O_NONBLOCK);
+  // 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)));
+     }
 }
 
 cIptvSectionFilter::~cIptvSectionFilter()
 {
   //debug("cIptvSectionFilter::~cIptvSectionfilter(%d, %d)\n", devid, id);
-  close(fifoDescriptor);
-  close(readDescriptor);
-  unlink(pipeName);
-  fifoDescriptor = -1;
-  readDescriptor = -1;
+  int tmp = socket[1];
+  socket[1] = -1;
+  if (tmp >= 0)
+     close(tmp);
+  tmp = socket[0];
+  socket[0] = -1;
+  if (tmp >= 0)
+     close(tmp);
   secbuf = NULL;
 }
 
 int cIptvSectionFilter::GetReadDesc(void)
 {
-  return readDescriptor;
+  return socket[0];
 }
 
 inline uint16_t cIptvSectionFilter::GetLength(const uint8_t *Data)
 {
-  return 3 + ((Data[1] & 0x0f) << 8) + Data[2];
+  return (uint16_t)(3 + ((Data[1] & 0x0f) << 8) + Data[2]);
 }
 
 void cIptvSectionFilter::New(void)
@@ -94,21 +96,21 @@ int cIptvSectionFilter::Filter(void)
 
   if (secbuf) {
      for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
-         uint8_t local_xor = filter_value[i] ^ secbuf[i];
+         uint8_t local_xor = (uint8_t)(filter_value[i] ^ secbuf[i]);
          if (maskandmode[i] & local_xor)
             return 0;
-         neq |= maskandnotmode[i] & local_xor;
+         neq |= (maskandnotmode[i] & local_xor);
          }
 
      if (doneq && !neq)
         return 0;
 
-     // There is no data in the fifo, more can be written
-     if (!select_single_desc(fifoDescriptor, 0, false)) {
-        i = write(fifoDescriptor, secbuf, seclen);
-        ERROR_IF(i < 0, "write()");
+     // 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()");
         // Update statistics
-        AddSectionStatistic(i, 1);
+        AddSectionStatistic(len, 1);
         }
      }
   return 0;
@@ -130,7 +132,7 @@ int cIptvSectionFilter::CopyDump(const uint8_t *buf, uint8_t len)
      return 0;
 
   if (tsfeedp + len > DMX_MAX_SECFEED_SIZE)
-     len = DMX_MAX_SECFEED_SIZE - tsfeedp;
+     len = (uint8_t)(DMX_MAX_SECFEED_SIZE - tsfeedp);
 
   if (len <= 0)
      return 0;
@@ -147,8 +149,7 @@ int cIptvSectionFilter::CopyDump(const uint8_t *buf, uint8_t len)
 
   for (n = 0; secbufp + 2 < limit; ++n) {
       seclen_local = GetLength(secbuf);
-      if (seclen_local <= 0 || seclen_local > DMX_MAX_SECTION_SIZE ||
-         seclen_local + secbufp > limit)
+      if ((seclen_local <= 0) || (seclen_local > DMX_MAX_SECTION_SIZE) || ((seclen_local + secbufp) > limit))
          return 0;
       seclen = seclen_local;
       if (pusi_seen)
@@ -175,9 +176,9 @@ void cIptvSectionFilter::Process(const uint8_t* Data)
      return;
 
   // Payload start
-  uint8_t p = TS_SIZE - count;
+  uint8_t p = (uint8_t)(TS_SIZE - count);
 
-  uint8_t cc = Data[3] & 0x0f;
+  uint8_t cc = (uint8_t)(Data[3] & 0x0f);
   int ccok = ((feedcc + 1) & 0x0f) == cc;
   feedcc = cc;
 
@@ -201,7 +202,7 @@ void cIptvSectionFilter::Process(const uint8_t* Data)
         const uint8_t *before = &Data[p + 1];
         uint8_t before_len = Data[p];
         const uint8_t *after = &before[before_len];
-        uint8_t after_len = (count - 1) - 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

sectionfilter.h

@@ -21,9 +21,6 @@ private:
     DMX_MAX_SECFEED_SIZE = (DMX_MAX_SECTION_SIZE + TS_SIZE)
   };
 
-  int fifoDescriptor;
-  int readDescriptor;
-
   int pusi_seen;
   int feedcc;
   int doneq;
@@ -37,7 +34,7 @@ private:
 
   int devid;
   int id;
-  cString pipeName;
+  int socket[2];
 
   uint8_t filter_value[DMX_MAX_FILTER_SIZE];
   uint8_t filter_mask[DMX_MAX_FILTER_SIZE];
@@ -54,8 +51,8 @@ private:
 
 public:
   // constructor & destructor
-  cIptvSectionFilter(int Index, int DeviceIndex, u_short Pid,
-                     u_char Tid, u_char Mask);
+  cIptvSectionFilter(int Index, int DeviceIndex, uint16_t Pid,
+                     uint8_t Tid, uint8_t Mask);
   virtual ~cIptvSectionFilter();
   void Process(const uint8_t* Data);
   int GetReadDesc(void);

socket.c

@@ -59,7 +59,7 @@ bool cIptvSocket::OpenSocket(const int Port, const bool isUdp)
      // Bind socket
      memset(&sockAddr, '\0', sizeof(sockAddr));
      sockAddr.sin_family = AF_INET;
-     sockAddr.sin_port = htons(Port);
+     sockAddr.sin_port = htons((uint16_t)(Port & 0xFFFF));
      sockAddr.sin_addr.s_addr = htonl(INADDR_ANY);
      if (isUdp) {
         int err = bind(socketDesc, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
@@ -103,14 +103,14 @@ int cIptvUdpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
   //debug("cIptvUdpSocket::Read()\n");
   // Error out if socket not initialized
   if (socketDesc <= 0) {
-     error("ERROR: Invalid socket in %s\n", __FUNCTION__);
+     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 = recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
+     len = (int)recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
                     (struct sockaddr *)&sockAddr, &addrlen);
   if ((len > 0) && (BufferAddr[0] == TS_SYNC_BYTE)) {
      return len;
@@ -126,14 +126,14 @@ int cIptvUdpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
      // payload type: MPEG2 TS = 33
      //unsigned int pt = readBuffer[1] & 0x7F;
      // header lenght
-     unsigned int headerlen = (3 + cc) * sizeof(uint32_t);
+     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) * sizeof(uint32_t);
+        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) &&
@@ -168,13 +168,13 @@ int cIptvTcpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
   //debug("cIptvTcpSocket::Read()\n");
   // Error out if socket not initialized
   if (socketDesc <= 0) {
-     error("ERROR: Invalid socket in %s\n", __FUNCTION__);
+     error("Invalid socket in %s\n", __FUNCTION__);
      return -1;
      }
   socklen_t addrlen = sizeof(sockAddr);
   // Read data from socket
   if (isActive && socketDesc && BufferAddr && (BufferLen > 0))
-     return recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
+     return (int)recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
                      (struct sockaddr *)&sockAddr, &addrlen);
   return 0;
 }

statistics.c

@@ -32,7 +32,7 @@ cString cIptvSectionStatistics::GetSectionStatistic()
   cMutexLock MutexLock(&mutex);
   uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
   timer.Set();
-  long bitrate = elapsed ? (long)(((float)1000 / KILOBYTE(1)) * filteredData / elapsed) : 0L;
+  long bitrate = elapsed ? (long)(1000.0L * filteredData / KILOBYTE(1) / elapsed) : 0L;
   if (!IptvConfig.GetUseBytes())
      bitrate *= 8;
   // no trailing linefeed here!
@@ -75,7 +75,7 @@ cString cIptvPidStatistics::GetPidStatistic()
   cString info("Active pids:\n");
   for (unsigned int i = 0; i < IPTV_STATS_ACTIVE_PIDS_COUNT; ++i) {
       if (mostActivePids[i].pid) {
-         long bitrate = elapsed ? (long)(((float)1000 / KILOBYTE(1)) * mostActivePids[i].DataAmount / elapsed) : 0L;
+         long bitrate = elapsed ? (long)(1000.0L * mostActivePids[i].DataAmount / KILOBYTE(1) / elapsed) : 0L;
          if (!IptvConfig.GetUseBytes())
             bitrate *= 8;
          info = cString::sprintf("%sPid %d: %4d (%4ld k%s/s)\n", *info, i,
@@ -145,7 +145,7 @@ cString cIptvStreamerStatistics::GetStreamerStatistic()
   cMutexLock MutexLock(&mutex);
   uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
   timer.Set();
-  long bitrate = elapsed ? (long)(((float)1000 / KILOBYTE(1)) * dataBytes / elapsed) : 0L;
+  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");
@@ -182,7 +182,7 @@ cString cIptvBufferStatistics::GetBufferStatistic()
   cMutexLock MutexLock(&mutex);
   uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
   timer.Set();
-  long bitrate = elapsed ? (long)(((float)1000 / KILOBYTE(1)) * dataBytes / elapsed) : 0L;
+  long bitrate = elapsed ? (long)(1000.0L * dataBytes / KILOBYTE(1) / elapsed) : 0L;
   long totalSpace = MEGABYTE(IptvConfig.GetTsBufferSize());
   float percentage = (float)((float)usedSpace / (float)totalSpace * 100.0);
   long totalKilos = totalSpace / KILOBYTE(1);

streamer.c

@@ -23,7 +23,7 @@ cIptvStreamer::cIptvStreamer(cRingBufferLinear* RingBuffer, unsigned int PacketL
   if (packetBuffer)
      memset(packetBuffer, 0, packetBufferLen);
   else
-     error("ERROR: MALLOC() failed for packet buffer");
+     error("MALLOC() failed for packet buffer");
 }
 
 cIptvStreamer::~cIptvStreamer()