Skip to content

Commit aaccc14

Browse files
committed
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"
1 parent a68d340 commit aaccc14

1 file changed

Lines changed: 16 additions & 11 deletions

File tree

src/satip/rtsp.c

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,7 +1175,10 @@ rtsp_parse_cmd
11751175
plts = pilot_to_tvh(hc);
11761176
if (plts == DVB_PILOT_NONE) goto end;
11771177

1178-
if (!TAILQ_EMPTY(&hc->hc_req_args)) goto eargs;
1178+
TAILQ_FOREACH(arg, &hc->hc_req_args, link)
1179+
tvhwarn(LS_SATIPS, "%i/%s/%i: extra parameter '%s'='%s'",
1180+
rs->frontend, rs->session, rs->stream,
1181+
arg->key, arg->val);
11791182

11801183
dmc->dmc_fe_rolloff = ro;
11811184
dmc->dmc_fe_pilot = plts;
@@ -1207,7 +1210,10 @@ rtsp_parse_cmd
12071210
sm = atoi(http_arg_get_remove(&hc->hc_req_args, "sm") ?: "0");
12081211
if (sm < 0 || sm > 1) goto end;
12091212

1210-
if (!TAILQ_EMPTY(&hc->hc_req_args)) goto eargs;
1213+
TAILQ_FOREACH(arg, &hc->hc_req_args, link)
1214+
tvhwarn(LS_SATIPS, "%i/%s/%i: extra parameter '%s'='%s'",
1215+
rs->frontend, rs->session, rs->stream,
1216+
arg->key, arg->val);
12111217

12121218
dmc->u.dmc_fe_ofdm.bandwidth = bw;
12131219
dmc->u.dmc_fe_ofdm.code_rate_HP = fec;
@@ -1243,7 +1249,10 @@ rtsp_parse_cmd
12431249
fec = fec_to_tvh(hc);
12441250
if (fec == DVB_FEC_NONE) goto end;
12451251

1246-
if (!TAILQ_EMPTY(&hc->hc_req_args)) goto eargs;
1252+
TAILQ_FOREACH(arg, &hc->hc_req_args, link)
1253+
tvhwarn(LS_SATIPS, "%i/%s/%i: extra parameter '%s'='%s'",
1254+
rs->frontend, rs->session, rs->stream,
1255+
arg->key, arg->val);
12471256

12481257
dmc->u.dmc_fe_qam.symbol_rate = sr;
12491258
dmc->u.dmc_fe_qam.fec_inner = fec;
@@ -1255,7 +1264,10 @@ rtsp_parse_cmd
12551264

12561265
freq *= 1000;
12571266
if (freq < 0) goto end;
1258-
if (!TAILQ_EMPTY(&hc->hc_req_args)) goto eargs;
1267+
TAILQ_FOREACH(arg, &hc->hc_req_args, link)
1268+
tvhwarn(LS_SATIPS, "%i/%s/%i: extra parameter '%s'='%s'",
1269+
rs->frontend, rs->session, rs->stream,
1270+
arg->key, arg->val);
12591271

12601272
} else {
12611273

@@ -1319,13 +1331,6 @@ rtsp_parse_cmd
13191331
mpegts_pid_done(&delpids);
13201332
mpegts_pid_done(&pids);
13211333
return errcode;
1322-
1323-
eargs:
1324-
TAILQ_FOREACH(arg, &hc->hc_req_args, link)
1325-
tvhwarn(LS_SATIPS, "%i/%s/%i: extra parameter '%s'='%s'",
1326-
rs->frontend, rs->session, rs->stream,
1327-
arg->key, arg->val);
1328-
goto end;
13291334
}
13301335

13311336
/*

0 commit comments

Comments
 (0)