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

Fix relative URL problems in RTSP sdp

Browse source
This commit is contained in:
Andreas Öman 2010-02-04 21:30:32 +00:00
parent 8d665eb013
commit f74b8970f7
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/rtsp.c
View file

@ -539,7 +539,7 @@ rtsp_subscribe(http_connection_t *hc, rtsp_t *rtsp,
s = subscription_create_from_channel(ch, pri, "RTSP", &rtsp->rtsp_input, s = subscription_create_from_channel(ch, pri, "RTSP", &rtsp->rtsp_input,
subflags); subflags);
snprintf(baseurl, baseurllen, "channel/%s", ch->ch_name); snprintf(baseurl, baseurllen, "%s/channelid/%d", urlprefix, ch->ch_id);
snprintf(title, titlelen, "%s", ch->ch_name); snprintf(title, titlelen, "%s", ch->ch_name);
} else if(!strcmp(components[0], "channelid")) { } else if(!strcmp(components[0], "channelid")) {
@ -554,7 +554,7 @@ rtsp_subscribe(http_connection_t *hc, rtsp_t *rtsp,
s = subscription_create_from_channel(ch, pri, "RTSP", &rtsp->rtsp_input, s = subscription_create_from_channel(ch, pri, "RTSP", &rtsp->rtsp_input,
subflags); subflags);
snprintf(baseurl, baseurllen, "channel/%s", ch->ch_name); snprintf(baseurl, baseurllen, "%s/channelid/%d", urlprefix, ch->ch_id);
snprintf(title, titlelen, "%s", ch->ch_name); snprintf(title, titlelen, "%s", ch->ch_name);
} else if(!strcmp(components[0], "service")) { } else if(!strcmp(components[0], "service")) {
@ -568,7 +568,8 @@ rtsp_subscribe(http_connection_t *hc, rtsp_t *rtsp,
s = subscription_create_from_transport(t, "RTSP", &rtsp->rtsp_input, s = subscription_create_from_transport(t, "RTSP", &rtsp->rtsp_input,
subflags); subflags);
snprintf(baseurl, baseurllen, "service/%s", t->tht_identifier); snprintf(baseurl, baseurllen, "%s/service/%s",
urlprefix, t->tht_identifier);
snprintf(title, titlelen, "%s", t->tht_identifier); snprintf(title, titlelen, "%s", t->tht_identifier);
} else { } else {
@ -909,10 +910,10 @@ rtsp_cmd_setup(http_connection_t *hc, rtsp_t *rtsp)
int streamid; int streamid;
char *remain; char *remain;
const streaming_start_component_t *ssc; const streaming_start_component_t *ssc;
remain = strstr(hc->hc_url, "streamid="); remain = strstr(hc->hc_url, "streamid=");
if(remain == NULL) { if(remain == NULL) {
rtsp_error(hc, RTSP_STATUS_SERVICE, "URL does not resolve"); rtsp_error(hc, RTSP_STATUS_SERVICE, "SETUP: URL does not resolve");
return 0; return 0;
} }