stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

SAT>IP: Add Triax tss400 support

Browse source
This commit is contained in:
Jaroslav Kysela 2014-05-21 14:43:48 +02:00
parent dd6b47dcf8
commit 5fc3768c40
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/input/mpegts/satip/satip.c
View file

@ -550,9 +550,12 @@ satip_discovery_http_closed(http_client_t *hc, int errn)
int i, n; int i, n;
s = http_arg_get(&hc->hc_args, "Content-Type"); s = http_arg_get(&hc->hc_args, "Content-Type");
if (s && strcasecmp(s, "text/xml")) { if (s) {
errn = EMEDIUMTYPE; n = http_tokenize(s, argv, ARRAY_SIZE(argv), ';');
s = NULL; if (n <= 0 || strcasecmp(s, "text/xml")) {
errn = EMEDIUMTYPE;
s = NULL;
}
} }
if (errn != 0 || s == NULL || hc->hc_code != 200 || if (errn != 0 || s == NULL || hc->hc_code != 200 ||
hc->hc_data_size == 0 || hc->hc_data == NULL) { hc->hc_data_size == 0 || hc->hc_data == NULL) {
@ -613,15 +616,15 @@ satip_discovery_http_closed(http_client_t *hc, int errn)
if ((manufacturerURL = htsmsg_xml_get_cdata_str(device, "manufacturerURL")) == NULL) if ((manufacturerURL = htsmsg_xml_get_cdata_str(device, "manufacturerURL")) == NULL)
goto finish; goto finish;
if ((modeldesc = htsmsg_xml_get_cdata_str(device, "modelDescription")) == NULL) if ((modeldesc = htsmsg_xml_get_cdata_str(device, "modelDescription")) == NULL)
goto finish; modeldesc = "";
if ((modelname = htsmsg_xml_get_cdata_str(device, "modelName")) == NULL) if ((modelname = htsmsg_xml_get_cdata_str(device, "modelName")) == NULL)
goto finish; goto finish;
if ((modelnum = htsmsg_xml_get_cdata_str(device, "modelNumber")) == NULL) if ((modelnum = htsmsg_xml_get_cdata_str(device, "modelNumber")) == NULL)
goto finish; modelnum = "";
if ((serialnum = htsmsg_xml_get_cdata_str(device, "serialNumber")) == NULL) if ((serialnum = htsmsg_xml_get_cdata_str(device, "serialNumber")) == NULL)
goto finish; serialnum = "";
if ((presentation = htsmsg_xml_get_cdata_str(device, "presentationURL")) == NULL) if ((presentation = htsmsg_xml_get_cdata_str(device, "presentationURL")) == NULL)
goto finish; presentation = "";
if ((udn = htsmsg_xml_get_cdata_str(device, "UDN")) == NULL) if ((udn = htsmsg_xml_get_cdata_str(device, "UDN")) == NULL)
goto finish; goto finish;
if ((tunercfg = htsmsg_xml_get_cdata_str(device, "urn:ses-com:satipX_SATIPCAP")) == NULL) if ((tunercfg = htsmsg_xml_get_cdata_str(device, "urn:ses-com:satipX_SATIPCAP")) == NULL)