mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-23 10:11:08 +00:00
rtspconnection: Connect to proxy if specified
Reference: https://bugzilla.gnome.org/show_bug.cgi?id=708880
This commit is contained in:
parent
a6cf3c8aac
commit
6bb58eec8a
1 changed files with 14 additions and 4 deletions
|
@ -517,8 +517,13 @@ setup_tunneling (GstRTSPConnection * conn, GTimeVal * timeout, gchar * uri)
|
|||
url->abspath, url->query ? "?" : "", url->query ? url->query : "");
|
||||
|
||||
/* connect to the host/port */
|
||||
connection = g_socket_client_connect_to_uri (conn->client,
|
||||
uri, 0, conn->cancellable, &error);
|
||||
if (conn->proxy_host) {
|
||||
connection = g_socket_client_connect_to_host (conn->client,
|
||||
conn->proxy_host, conn->proxy_port, conn->cancellable, &error);
|
||||
} else {
|
||||
connection = g_socket_client_connect_to_uri (conn->client,
|
||||
uri, 0, conn->cancellable, &error);
|
||||
}
|
||||
if (connection == NULL)
|
||||
goto connect_failed;
|
||||
|
||||
|
@ -652,8 +657,13 @@ gst_rtsp_connection_connect (GstRTSPConnection * conn, GTimeVal * timeout)
|
|||
uri = gst_rtsp_url_get_request_uri (url);
|
||||
}
|
||||
|
||||
connection = g_socket_client_connect_to_uri (conn->client,
|
||||
uri, url_port, conn->cancellable, &error);
|
||||
if (conn->proxy_host) {
|
||||
connection = g_socket_client_connect_to_host (conn->client,
|
||||
conn->proxy_host, conn->proxy_port, conn->cancellable, &error);
|
||||
} else {
|
||||
connection = g_socket_client_connect_to_uri (conn->client,
|
||||
uri, url_port, conn->cancellable, &error);
|
||||
}
|
||||
if (connection == NULL)
|
||||
goto connect_failed;
|
||||
|
||||
|
|
Loading…
Reference in a new issue