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

gstrtspconnection: Add IPv6 support for tunneled mode

Browse source 
An IPv6 address must be specified within [] brackets.
Add brackets for IPv6 address used for tunneled mode,
for non-tunneled this is already supported.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1145>
This commit is contained in:
Per Förlin 2021-04-23 18:03:20 +02:00 committed by GStreamer Marge Bot
parent be6793d0d1
commit 30f88aa7c8
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst-libs/gst/rtsp/gstrtspconnection.c
View file

@ -799,6 +799,22 @@ gst_rtsp_connection_set_accept_certificate_func (GstRTSPConnection * conn,
conn->accept_certificate_destroy_notify = destroy_notify;
}
static gchar *
get_tunneled_connection_uri_strdup (GstRTSPUrl * url, guint16 port)
{
const gchar *pre_host = "";
const gchar *post_host = "";
if (url->family == GST_RTSP_FAM_INET6) {
pre_host = "[";
post_host = "]";
}
return g_strdup_printf ("http://%s%s%s:%d%s%s%s", pre_host, url->host,
post_host, port, url->abspath, url->query ? "?" : "",
url->query ? url->query : "");
}
static GstRTSPResult
setup_tunneling (GstRTSPConnection * conn, gint64 timeout, gchar * uri,
GstRTSPMessage * response)
@ -870,8 +886,7 @@ setup_tunneling (GstRTSPConnection * conn, gint64 timeout, gchar * uri,
conn->remote_ip = g_strdup (value);
}
connection_uri = g_strdup_printf ("http://%s:%d%s%s%s", url->host, url_port,
url->abspath, url->query ? "?" : "", url->query ? url->query : "");
connection_uri = get_tunneled_connection_uri_strdup (url, url_port);
/* connect to the host/port */
if (conn->proxy_host) {
@ -1024,8 +1039,7 @@ gst_rtsp_connection_connect_with_response_usec (GstRTSPConnection * conn,
gst_rtsp_url_get_port (url, &url_port);
if (conn->tunneled) {
connection_uri = g_strdup_printf ("http://%s:%d%s%s%s", url->host, url_port,
url->abspath, url->query ? "?" : "", url->query ? url->query : "");
connection_uri = get_tunneled_connection_uri_strdup (url, url_port);
} else {
connection_uri = gst_rtsp_url_get_request_uri (url);
}