From: Flole <Flole998@users.noreply.github.com>
Date: Wed, 24 Apr 2024 14:24:06 +0000 (+0200)
Subject: satip: Ignore additional parameters
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaccc147ea0aac385241d038fd7f1bd3f6d32d10;p=thirdparty%2Ftvheadend.git

satip: Ignore additional parameters

Instead or erroring, ignore additional parameters, as required by the specs in  3.5.11 where it says "Unknown attributes shall be ignored by the server"
---

diff --git a/src/satip/rtsp.c b/src/satip/rtsp.c
index a95f2313d..98f85724e 100644
--- a/src/satip/rtsp.c
+++ b/src/satip/rtsp.c
@@ -1175,7 +1175,10 @@ rtsp_parse_cmd
     plts = pilot_to_tvh(hc);
     if (plts == DVB_PILOT_NONE) goto end;
 
-    if (!TAILQ_EMPTY(&hc->hc_req_args)) goto eargs;
+    TAILQ_FOREACH(arg, &hc->hc_req_args, link)
+      tvhwarn(LS_SATIPS, "%i/%s/%i: extra parameter '%s'='%s'",
+        rs->frontend, rs->session, rs->stream,
+        arg->key, arg->val);
 
     dmc->dmc_fe_rolloff = ro;
     dmc->dmc_fe_pilot = plts;
@@ -1207,7 +1210,10 @@ rtsp_parse_cmd
     sm = atoi(http_arg_get_remove(&hc->hc_req_args, "sm") ?: "0");
     if (sm < 0 || sm > 1) goto end;
 
-    if (!TAILQ_EMPTY(&hc->hc_req_args)) goto eargs;
+    TAILQ_FOREACH(arg, &hc->hc_req_args, link)
+      tvhwarn(LS_SATIPS, "%i/%s/%i: extra parameter '%s'='%s'",
+        rs->frontend, rs->session, rs->stream,
+        arg->key, arg->val);
 
     dmc->u.dmc_fe_ofdm.bandwidth = bw;
     dmc->u.dmc_fe_ofdm.code_rate_HP = fec;
@@ -1243,7 +1249,10 @@ rtsp_parse_cmd
     fec = fec_to_tvh(hc);
     if (fec == DVB_FEC_NONE) goto end;
 
-    if (!TAILQ_EMPTY(&hc->hc_req_args)) goto eargs;
+    TAILQ_FOREACH(arg, &hc->hc_req_args, link)
+      tvhwarn(LS_SATIPS, "%i/%s/%i: extra parameter '%s'='%s'",
+        rs->frontend, rs->session, rs->stream,
+        arg->key, arg->val);
 
     dmc->u.dmc_fe_qam.symbol_rate = sr;
     dmc->u.dmc_fe_qam.fec_inner = fec;
@@ -1255,7 +1264,10 @@ rtsp_parse_cmd
 
     freq *= 1000;
     if (freq < 0) goto end;
-    if (!TAILQ_EMPTY(&hc->hc_req_args)) goto eargs;
+    TAILQ_FOREACH(arg, &hc->hc_req_args, link)
+      tvhwarn(LS_SATIPS, "%i/%s/%i: extra parameter '%s'='%s'",
+        rs->frontend, rs->session, rs->stream,
+        arg->key, arg->val);
 
   } else {
 
@@ -1319,13 +1331,6 @@ end:
   mpegts_pid_done(&delpids);
   mpegts_pid_done(&pids);
   return errcode;
-
-eargs:
-  TAILQ_FOREACH(arg, &hc->hc_req_args, link)
-    tvhwarn(LS_SATIPS, "%i/%s/%i: extra parameter '%s'='%s'",
-      rs->frontend, rs->session, rs->stream,
-      arg->key, arg->val);
-  goto end;
 }
 
 /*