From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Aug 2017 08:00:13 +0000 (+0200)
Subject: satip server: allow to disable RTP/AVP/TCP transfer mode, fixes #4505
X-Git-Tag: v4.2.4~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc069fc41c47542299131209185e6c3d6804e3b7;p=thirdparty%2Ftvheadend.git

satip server: allow to disable RTP/AVP/TCP transfer mode, fixes #4505

From: Mono Polimorph
---

diff --git a/src/satip/rtsp.c b/src/satip/rtsp.c
index d16fecbd8..b1793d35c 100644
--- a/src/satip/rtsp.c
+++ b/src/satip/rtsp.c
@@ -876,7 +876,8 @@ parse_transport(http_connection_t *hc)
     if (a + 1 != b)
       return -1;
     return a;
-  } else if (strncmp(s, "RTP/AVP/TCP;interleaved=0-1", 27) == 0) {
+  } else if ((strncmp(s, "RTP/AVP/TCP;interleaved=0-1", 27) == 0) &&
+             !satip_server_conf.satip_notcp_mode) {
     return RTSP_TCP_DATA;
   }
   return -1;
diff --git a/src/satip/server.c b/src/satip/server.c
index c429056ab..feca0a881 100644
--- a/src/satip/server.c
+++ b/src/satip/server.c
@@ -716,6 +716,16 @@ const idclass_t satip_server_class = {
       .opts   = PO_EXPERT,
       .group  = 1,
     },
+    {
+      .type   = PT_BOOL,
+      .id     = "satip_notcp_mode",
+      .name   = N_("Disable RTP/AVP/TCP support"),
+      .desc   = N_("Remove server support for RTP/AVP/TCP transfer mode "
+                   "(embedded data in the RTSP session)."),
+      .off    = offsetof(struct satip_server_conf, satip_notcp_mode),
+      .opts   = PO_EXPERT,
+      .group  = 1,
+    },
     {
       .type   = PT_U32,
       .id     = "satip_iptv_sig_level",
diff --git a/src/satip/server.h b/src/satip/server.h
index eaa475c6d..d0c381940 100644
--- a/src/satip/server.h
+++ b/src/satip/server.h
@@ -47,6 +47,7 @@ struct satip_server_conf {
   int satip_rewrite_pmt;
   int satip_muxcnf;
   int satip_nom3u;
+  int satip_notcp_mode;
   int satip_anonymize;
   int satip_iptv_sig_level;
   int satip_force_sig_level;