From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 9 Oct 2017 13:18:11 +0000 (+0200)
Subject: satip server: Drop fe parameter on demand, fixes #4619
X-Git-Tag: v4.2.4~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1effc238ab461dd8251893a13ed824eab1b600b6;p=thirdparty%2Ftvheadend.git

satip server: Drop fe parameter on demand, fixes #4619

From: Mono Polimorph
---

diff --git a/src/satip/rtsp.c b/src/satip/rtsp.c
index d2d5cb661..74460e1ca 100644
--- a/src/satip/rtsp.c
+++ b/src/satip/rtsp.c
@@ -946,6 +946,7 @@ rtsp_parse_cmd
   has_args = !TAILQ_EMPTY(&hc->hc_req_args);
 
   fe = atoi(http_arg_get_remove(&hc->hc_req_args, "fe") ?: 0);
+  fe = satip_server_conf.satip_drop_fe ? 0 : fe;
   s = http_arg_get_remove(&hc->hc_req_args, "addpids");
   if (parse_pids(s, &addpids)) goto end;
   s = http_arg_get_remove(&hc->hc_req_args, "delpids");
diff --git a/src/satip/server.c b/src/satip/server.c
index fa958890f..2721b9afd 100644
--- a/src/satip/server.c
+++ b/src/satip/server.c
@@ -728,6 +728,16 @@ const idclass_t satip_server_class = {
       .opts   = PO_EXPERT,
       .group  = 1,
     },
+    {
+      .type   = PT_BOOL,
+      .id     = "satip_drop_fe",
+      .name   = N_("Drop \"fe=\" parameter"),
+      .desc   = N_("Discard the frontend parameter in RTSP requests, "
+                   "as some clients incorretly use it."),
+      .off    = offsetof(struct satip_server_conf, satip_drop_fe),
+      .opts   = PO_EXPERT,
+      .group  = 1,
+    },
     {
       .type   = PT_INT,
       .id     = "satip_muxcnf",
diff --git a/src/satip/server.h b/src/satip/server.h
index 8c3c37ace..eb11ca614 100644
--- a/src/satip/server.h
+++ b/src/satip/server.h
@@ -51,6 +51,7 @@ struct satip_server_conf {
   int satip_notcp_mode;
   int satip_anonymize;
   int satip_noupnp;
+  int satip_drop_fe;
   int satip_restrict_pids_all;
   int satip_iptv_sig_level;
   int satip_force_sig_level;