From: Hans Månsson <hansm@axis.com>
Date: Mon, 30 Sep 2013 19:46:10 +0000 (+0200)
Subject: rtspconnection: Connect to proxy if specified
X-Git-Tag: 1.3.1~418
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bb58eec8a9b3caa7cb88ab7c2a16032bf2cf396;p=platform%2Fupstream%2Fgst-plugins-base.git

rtspconnection: Connect to proxy if specified

Reference: https://bugzilla.gnome.org/show_bug.cgi?id=708880
---

diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c
index 3a76d1b..6946c94 100644
--- a/gst-libs/gst/rtsp/gstrtspconnection.c
+++ b/gst-libs/gst/rtsp/gstrtspconnection.c
@@ -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;