mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp: gstrtspurl: gst_rtsp_url_get_request_uri: fix incorrect scheme for tls transport methods

Browse source 
gst_rtsp_url_get_request_uri returns rtsp://... url when requested url is rtsps://, this is not
in accordance with https://www.rfc-editor.org/rfc/rfc7826.html#section-19.2.
This also impedes setting up a rtsps session with a live555 rtsp server.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3568>
This commit is contained in:
Bart Van Severen 2023-01-25 13:58:16 +01:00 committed by GStreamer Marge Bot
parent a62b07f3b4
commit 024ef7659d
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
subprojects/gst-plugins-base/gst-libs/gst/rtsp/gstrtspurl.c
View file

@ -59,9 +59,11 @@
G_DEFINE_BOXED_TYPE (GstRTSPUrl, gst_rtsp_url, G_DEFINE_BOXED_TYPE (GstRTSPUrl, gst_rtsp_url,
(GBoxedCopyFunc) gst_rtsp_url_copy, (GBoxedFreeFunc) gst_rtsp_url_free); (GBoxedCopyFunc) gst_rtsp_url_copy, (GBoxedFreeFunc) gst_rtsp_url_free);
#define SCHEME_SIZE 7
static const struct static const struct
{ {
const char scheme[6]; const char scheme[SCHEME_SIZE];
GstRTSPLowerTrans transports; GstRTSPLowerTrans transports;
} rtsp_schemes_map[] = { } rtsp_schemes_map[] = {
{ {
@ -326,6 +328,8 @@ gst_rtsp_url_get_request_uri (const GstRTSPUrl * url)
const gchar *post_host; const gchar *post_host;
const gchar *pre_query; const gchar *pre_query;
const gchar *query; const gchar *query;
gchar scheme[SCHEME_SIZE] = "rtsp";
guint i;
g_return_val_if_fail (url != NULL, NULL); g_return_val_if_fail (url != NULL, NULL);
@ -333,12 +337,18 @@ gst_rtsp_url_get_request_uri (const GstRTSPUrl * url)
post_host = url->family == GST_RTSP_FAM_INET6 ? "]" : ""; post_host = url->family == GST_RTSP_FAM_INET6 ? "]" : "";
pre_query = url->query ? "?" : ""; pre_query = url->query ? "?" : "";
query = url->query ? url->query : ""; query = url->query ? url->query : "";
for (i = 0; i < G_N_ELEMENTS (rtsp_schemes_map); i++) {
if (url->transports == rtsp_schemes_map[i].transports) {
strcpy (scheme, rtsp_schemes_map[i].scheme);
break;
}
}
if (url->port != 0) { if (url->port != 0) {
uri = g_strdup_printf ("rtsp://%s%s%s:%u%s%s%s", pre_host, url->host, uri = g_strdup_printf ("%s://%s%s%s:%u%s%s%s", scheme, pre_host, url->host,
post_host, url->port, url->abspath, pre_query, query); post_host, url->port, url->abspath, pre_query, query);
} else { } else {
uri = g_strdup_printf ("rtsp://%s%s%s%s%s%s", pre_host, url->host, uri = g_strdup_printf ("%s://%s%s%s%s%s%s", scheme, pre_host, url->host,
post_host, url->abspath, pre_query, query); post_host, url->abspath, pre_query, query);
} }
return uri; return uri;