Added missing RTSP/UDP support.

HISTORY

@@ -231,6 +231,7 @@ VDR Plugin 'iptv' Revision History
 VDR Plugin 'iptv' Revision History
 ==================================
 
-2014-XX-XX: Version 2.1.0
+2014-02-20: Version 2.1.0
 
 - Added initial CAM support.
+- Added missing RTSP/UDP support.

README

@@ -53,10 +53,12 @@ Setup menu:
                                    stream ringbuffer before data is
                                    transferred to VDR.
                                    Valid range: 0...40
-- EXT protocol base port = 4321    Defines base port used in EXT protocol.
+- Protocol base port = 4321        Defines base port used in CURL/EXT
+                                   protocol. Two ports are defined for
+                                   each device.
                                    The port range is defined by the number
-                                   of IPTV devices (max. 8).
+                                   of IPTV devices times two (max. 32).
-                                   Valid range: 0...65527
+                                   Valid range: 0...65503
 - Use section filtering = 1        Defines whether section filtering shall
                                    be used.
                                    Valid range: 0...1
@@ -127,11 +129,11 @@ External streaming:
   script parameter is passed to the script and it can be used to select for
   example between different URLs.
 
-- When an EXT channel is opened the IPTV plugin opens an UDP listening port
+- When an EXT or CURL/RTSP channel is opened the IPTV plugin opens an UDP
-  on the localhost. The external script is responsible for supplying IPTV
+  listening port on the localhost. The external script is responsible for
-  plugin with MPEG2 TS data in UDP/RTP format to the listening port. The
+  supplying IPTV plugin with MPEG2 TS data in UDP/RTP format to the listening
-  data will be processed in VDR like a normal DVB broadcast. The listening
+  port. The data will be processed in VDR like a normal DVB broadcast. The
-  base port can be specified in the plugin configuration menu.
+  listening base port can be specified in the plugin configuration menu.
 
 - Each IPTV device has different listen port. The port number is specified
   as a base port number plus IPTV device index minus one. Maximum of 8 IPTV
@@ -175,8 +177,8 @@ Notes:
   IGMP v3 protocol:
   "U=<source address>@<group address>"
 
-- The CURL implementation supports only HTTP/HTTPS protocols and an optional
+- The CURL implementation supports only RTSP/HTTP/HTTPS protocols and an
-  netrc configuration file for authentication:
+  optional netrc configuration file for authentication:
   $(CONFDIR)/iptv/netrc
 
 - You can quite easily figure out correct DVB triplet values by using the

config.c

@@ -12,7 +12,7 @@ cIptvConfig IptvConfig;
 cIptvConfig::cIptvConfig(void)
 : tsBufferSizeM(2),
   tsBufferPrefillRatioM(0),
-  extProtocolBasePortM(4321),
+  protocolBasePortM(4321),
   useBytesM(1),
   sectionFilteringM(1)
 {

config.h

@@ -16,7 +16,7 @@ class cIptvConfig
 private:
   unsigned int tsBufferSizeM;
   unsigned int tsBufferPrefillRatioM;
-  unsigned int extProtocolBasePortM;
+  unsigned int protocolBasePortM;
   unsigned int useBytesM;
   unsigned int sectionFilteringM;
   int disabledFiltersM[SECTION_FILTER_TABLE_SIZE];
@@ -26,7 +26,7 @@ public:
   cIptvConfig();
   unsigned int GetTsBufferSize(void) const { return tsBufferSizeM; }
   unsigned int GetTsBufferPrefillRatio(void) const { return tsBufferPrefillRatioM; }
-  unsigned int GetExtProtocolBasePort(void) const { return extProtocolBasePortM; }
+  unsigned int GetProtocolBasePort(void) const { return protocolBasePortM; }
   unsigned int GetUseBytes(void) const { return useBytesM; }
   unsigned int GetSectionFiltering(void) const { return sectionFilteringM; }
   const char *GetConfigDirectory(void) const { return configDirectoryM; }
@@ -34,7 +34,7 @@ public:
   int GetDisabledFilters(unsigned int indexP) const;
   void SetTsBufferSize(unsigned int sizeP) { tsBufferSizeM = sizeP; }
   void SetTsBufferPrefillRatio(unsigned int ratioP) { tsBufferPrefillRatioM = ratioP; }
-  void SetExtProtocolBasePort(unsigned int portNumberP) { extProtocolBasePortM = portNumberP; }
+  void SetProtocolBasePort(unsigned int portNumberP) { protocolBasePortM = portNumberP; }
   void SetUseBytes(unsigned int onOffP) { useBytesM = onOffP; }
   void SetSectionFiltering(unsigned int onOffP) { sectionFilteringM = onOffP; }
   void SetDisabledFilters(unsigned int indexP, int numberP);

iptv.c

@@ -109,7 +109,14 @@ bool cPluginIptv::Start(void)
   // Start any background activities the plugin shall perform.
   if (curl_global_init(CURL_GLOBAL_ALL) == CURLE_OK) {
      curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-     info("Using CURL %s", data->version);
+     cString info = cString::sprintf("Using CURL %s", data->version);
+     for (int i = 0; data->protocols[i]; ++i) {
+         // Supported protocols: HTTP(S), RTSP, FILE
+         if (startswith(data->protocols[i], "http") || startswith(data->protocols[i], "rtsp") ||
+             startswith(data->protocols[i], "file"))
+            info = cString::sprintf("%s %s", *info, data->protocols[i]);
+         }
+     info("%s", *info);
      }
   return true;
 }
@@ -189,7 +196,7 @@ bool cPluginIptv::SetupParse(const char *nameP, const char *valueP)
   else if (!strcasecmp(nameP, "TsBufferPrefill"))
      IptvConfig.SetTsBufferPrefillRatio(atoi(valueP));
   else if (!strcasecmp(nameP, "ExtProtocolBasePort"))
-     IptvConfig.SetExtProtocolBasePort(atoi(valueP));
+     IptvConfig.SetProtocolBasePort(atoi(valueP));
   else if (!strcasecmp(nameP, "SectionFiltering"))
      IptvConfig.SetSectionFiltering(atoi(valueP));
   else if (!strcasecmp(nameP, "DisabledFilters")) {

po/de_DE.po

@@ -77,13 +77,13 @@ msgid ""
 "This is useful if streaming media over a slow or unreliable connection."
 msgstr ""
 
-msgid "EXT protocol base port"
+msgid "Protocol base port"
-msgstr "EXT Protokoll Basisport"
+msgstr "Protokoll Basisport"
 
 msgid ""
-"Define a base port used by EXT protocol.\n"
+"Define a base port used by CURL/EXT protocol.\n"
 "\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
 msgstr ""
 
 msgid "Use section filtering"

po/fi_FI.po

@@ -82,17 +82,17 @@ msgstr ""
 "\n"
 "Puskurin esitäyttö parantaa suoratoistoa hitailla ja epäluotettavilla yhteyksillä."
 
-msgid "EXT protocol base port"
+msgid "Protocol base port"
-msgstr "EXT-protokollan perusportti"
+msgstr "Protokollan perusportti"
 
 msgid ""
-"Define a base port used by EXT protocol.\n"
+"Define a base port used by CURL/EXT protocol.\n"
 "\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
 msgstr ""
-"Määrittele EXT-protokollan käyttämä perusportti.\n"
+"Määrittele protokollan käyttämä perusportti.\n"
 "\n"
-"Porttiavaruuden koko määräytyy käytettyjen IPTV-laitteiden mukaan. Laajennos lukee EXT-protokollan yhteydessä perusportista dataa, jota ulkoiset ohjelmistot tarjoavat."
+"Porttiavaruuden koko määräytyy käytettyjen IPTV-laitteiden mukaan. Laajennos lukee CURL/EXT-protokollan yhteydessä perusportista dataa, jota ulkoiset ohjelmistot tarjoavat."
 
 msgid "Use section filtering"
 msgstr "Käytä sektioiden suodatusta"

po/fr_FR.po

@@ -84,17 +84,17 @@ msgstr ""
 "\n"
 "Cette option est utile si le streaming est sur une connexion lente ou peu fiables."
 
-msgid "EXT protocol base port"
+msgid "Protocol base port"
-msgstr "Port de base du protocole EXT"
+msgstr "Port de base du protocole"
 
 msgid ""
-"Define a base port used by EXT protocol.\n"
+"Define a base port used by CURL/EXT protocol.\n"
 "\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
 msgstr ""
-"Définit le port de base utilisé par le protocole EXT.\n"
+"Définit le port de base utilisé par le protocole CURL/EXT.\n"
 "\n"
-"La plage de port est défini par le nombre de dispositif IPTV. Ce paramètre défini le port qui est écouté pour les connexions à partir d'applications externes en utilisant le protocole EXT."
+"La plage de port est défini par le nombre de dispositif IPTV. Ce paramètre défini le port qui est écouté pour les connexions à partir d'applications externes en utilisant le protocole CURL/EXT."
 
 msgid "Use section filtering"
 msgstr "Utiliser le filtrage de section"

po/it_IT.po

@@ -83,17 +83,17 @@ msgstr ""
 "\n"
 "Questo è utile se si trasmette dati su una connessione lenta oppure inaffidabile."
 
-msgid "EXT protocol base port"
+msgid "Protocol base port"
-msgstr "Porta base protocollo EXT"
+msgstr "Porta base protocollo"
 
 msgid ""
-"Define a base port used by EXT protocol.\n"
+"Define a base port used by CURL/EXT protocol.\n"
 "\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
 msgstr ""
-"Definisci una porta base usata dal protocollo EXT.\n"
+"Definisci una porta base usata dal protocollo CURL/EXT.\n"
 "\n"
-"Il range della porta è definito dal numero di periferiche IPTV. Questo parametro imposta la porta che è in ascolto per connessioni da applicazioni esterne quando si usa il protocollo EXT."
+"Il range della porta è definito dal numero di periferiche IPTV. Questo parametro imposta la porta che è in ascolto per connessioni da applicazioni esterne quando si usa il protocollo CURL/EXT."
 
 msgid "Use section filtering"
 msgstr "Utilizza sezione filtri"

po/nl_NL.po

@@ -83,17 +83,17 @@ msgstr ""
 "\n"
 "Dit is aan te bevelen bij onbetrouwbare of langzame verbindingen."
 
-msgid "EXT protocol base port"
+msgid "Protocol base port"
-msgstr "EXT protocol basispoort"
+msgstr "Protocol basispoort"
 
 msgid ""
-"Define a base port used by EXT protocol.\n"
+"Define a base port used by CURL/EXT protocol.\n"
 "\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
 msgstr ""
-"Bepaal de basispoort voor het EXT protocol.\n"
+"Bepaal de basispoort voor het CURL/EXT protocol.\n"
 "\n"
-"De poortrange wordt bepaald door het aantal IPTV apparaten. Deze poort luistert naar inkomende verbindingen wanneer het EXT protocol wordt gebruikt."
+"De poortrange wordt bepaald door het aantal IPTV apparaten. Deze poort luistert naar inkomende verbindingen wanneer het CURL/EXT protocol wordt gebruikt."
 
 msgid "Use section filtering"
 msgstr "Benutze Abschnittsfilterung"

po/ru_RU.po

@@ -78,13 +78,13 @@ msgid ""
 "This is useful if streaming media over a slow or unreliable connection."
 msgstr ""
 
-msgid "EXT protocol base port"
+msgid "Protocol base port"
-msgstr "Базисный порт EXT протокола"
+msgstr "Базисный порт протокола"
 
 msgid ""
-"Define a base port used by EXT protocol.\n"
+"Define a base port used by CURL/EXT protocol.\n"
 "\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
 msgstr ""
 
 msgid "Use section filtering"

protocolcurl.c

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

protocolcurl.h

@@ -16,8 +16,9 @@
 #include <vdr/tools.h>
 
 #include "protocolif.h"
+#include "socket.h"
 
-class cIptvProtocolCurl : public cIptvProtocolIf {
+class cIptvProtocolCurl : public cIptvUdpSocket, public cIptvProtocolIf {
 private:
   enum eModeType {
     eModeUnknown = 0,
@@ -28,8 +29,9 @@ private:
     eModeCount
   };
   enum {
-    eConnectTimeoutS       = 5,  // in seconds
+    eConnectTimeoutS       = 5,     // in seconds
-    eMaxDownloadSpeedMBits = 20  // in megabits per second
+    eMaxDownloadSpeedMBits = 20,    // in megabits per second
+    eKeepAliveIntervalMs   = 300000 // in milliseconds
   };
 
   static size_t WriteCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP);
@@ -39,6 +41,7 @@ private:
 
   cString streamUrlM;
   int streamParamM;
+  int streamPortM;
   cMutex mutexM;
   CURL *handleM;
   CURLM *multiM;
@@ -46,6 +49,7 @@ private:
   cRingBufferLinear *ringBufferM;
   cString rtspControlM;
   eModeType modeM;
+  cTimeMs timeoutM;
   bool connectedM;
   bool pausedM;
 

protocolext.c

@@ -165,7 +165,7 @@ bool cIptvProtocolExt::SetSource(const char* locationP, const int parameterP, co
         }
      scriptParameterM = parameterP;
      // Update listen port
-     streamPortM = IptvConfig.GetExtProtocolBasePort() + indexP;
+     streamPortM = IptvConfig.GetProtocolBasePort() + indexP * 2;
      }
   return true;
 }

setup.c

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

setup.h

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

socket.c

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

statistics.c

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

statistics.h

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