Added a session id quirk for Triax TSS 400.

HISTORY

@@ -59,3 +59,8 @@ VDR Plugin 'satip' Revision History
 
 - Fixed model detection and OctopusNet DVB-C model quirks.
 - Added a session id quirk for GSSBOX.
+
+2014-05-18: Version 0.3.3
+
+- Added a validity check for the session member.
+- Added a session id quirk for Triax TSS 400.

common.c

@@ -57,6 +57,15 @@ char *StripTags(char *strP)
   return NULL;
 }
 
+char *SkipZeroes(const char *strP)
+{
+  if ((uchar)*strP != '0')
+     return (char *)strP;
+  while (*strP && (uchar)*strP == '0')
+        strP++;
+  return (char *)strP;
+}
+
 cString ChangeCase(const cString &strP, bool upperP)
 {
   cString res(strP);

common.h

@@ -93,6 +93,7 @@ uint16_t ts_pid(const uint8_t *bufP);
 uint8_t payload(const uint8_t *bufP);
 const char *id_pid(const u_short pidP);
 char *StripTags(char *strP);
+char *SkipZeroes(const char *strP);
 cString ChangeCase(const cString &strP, bool upperP);
 
 struct section_filter_table_type {

po/ca_ES.po

@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 0.3.2\n"
+"Project-Id-Version: vdr-satip 0.3.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-05-10 05:10+0200\n"
+"POT-Creation-Date: 2014-05-18 05:18+0200\n"
-"PO-Revision-Date: 2014-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-18 05:18+0200\n"
 "Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
 "Language: ca\n"

po/de_DE.po

@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 0.3.2\n"
+"Project-Id-Version: vdr-satip 0.3.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-05-10 05:10+0200\n"
+"POT-Creation-Date: 2014-05-18 05:18+0200\n"
-"PO-Revision-Date: 2014-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-18 05:18+0200\n"
 "Last-Translator: Frank Neumann <fnu@yavdr.org>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
 "Language: de\n"

po/es_ES.po

@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 0.3.2\n"
+"Project-Id-Version: vdr-satip 0.3.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-05-10 05:10+0200\n"
+"POT-Creation-Date: 2014-05-18 05:18+0200\n"
-"PO-Revision-Date: 2014-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-18 05:18+0200\n"
 "Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
 "Language: es\n"

po/fi_FI.po

@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 0.3.2\n"
+"Project-Id-Version: vdr-satip 0.3.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-05-10 05:10+0200\n"
+"POT-Creation-Date: 2014-05-18 05:18+0200\n"
-"PO-Revision-Date: 2014-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-18 05:18+0200\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"

satip.c

@@ -25,7 +25,7 @@
 #define GITVERSION ""
 #endif
 
-       const char VERSION[]     = "0.3.2" GITVERSION;
+       const char VERSION[]     = "0.3.3" GITVERSION;
 static const char DESCRIPTION[] = trNOOP("SAT>IP Devices");
 
 class cPluginSatip : public cPlugin {

server.c

@@ -25,8 +25,14 @@ cSatipServer::cSatipServer(const char *addressP, const char *descriptionP, const
   memset(modelCountM, 0, sizeof(modelCountM));
   if (isempty(*modelM))
      modelM = "DVBS-1";
-  // Grundig Sat Systems GSS.box DSI 400 has a session id bug
+  // These devices contain a session id bug:
-  if (strstr(*descriptionM, "GSSBOX"))
+  // Inverto Airscreen Server IDL 400 ?
+  // Telestar Digibit R1 ?
+  // Elgato EyeTV Netstream 4Sat ?
+  if (!isempty(*descriptionM) &&
+      (strstr(*descriptionM, "GSSBOX") ||             // Grundig Sat Systems GSS.box DSI 400
+       strstr(*descriptionM, "Triax SatIP Converter") // Triax TSS 400
+     ))
      quirkM |= eSatipQuirkSessionId;
   char *s, *p = strdup(*modelM);
   char *r = strtok_r(p, ",", &s);
@@ -45,7 +51,7 @@ cSatipServer::cSatipServer(const char *addressP, const char *descriptionP, const
            else
               modelCountM[eSatipModuleDVBT2] = 1;
            // Add model quirks here
-           if (strstr(*descriptionM, "OctopusNet"))
+           if (!isempty(*descriptionM) && strstr(*descriptionM, "OctopusNet"))
               modelTypeM |= cSatipServer::eSatipModelTypeDVBC;
            }
         if (strstr(r, "DVBT")) {
@@ -55,7 +61,7 @@ cSatipServer::cSatipServer(const char *addressP, const char *descriptionP, const
            else
               modelCountM[eSatipModuleDVBT] = 1;
            // Add model quirks here
-           if (strstr(*descriptionM, "OctopusNet"))
+           if (!isempty(*descriptionM) && strstr(*descriptionM, "OctopusNet"))
               modelTypeM |= cSatipServer::eSatipModelTypeDVBC;
            }
         r = strtok_r(NULL, ",", &s);

tuner.c

@@ -242,7 +242,7 @@ bool cSatipTuner::Connect(void)
      SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_WRITEHEADER, NULL);
      if (nextServerM && nextServerM->Quirk(cSatipServer::eSatipQuirkSessionId) && !isempty(*sessionM) && startswith(*sessionM, "0")) {
         debug("cSatipTuner::%s(): session id quirk [device %d]", __FUNCTION__, deviceM->GetId());
-        SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_RTSP_SESSION_ID, *sessionM + 1);
+        SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_RTSP_SESSION_ID, SkipZeroes(*sessionM));
         }
      if (!ValidateLatestResponse())
         return false;