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

Revert "rtspconnection: Use a GSocketAddressNumerator to resolve the addresses"

Browse source 
This reverts commit 15a0bb0a10.

We should be using GSocketClient
This commit is contained in:
Wim Taymans 2013-05-27 15:32:50 +02:00
parent 00bbca2f9f
commit 15f3c995aa
1 changed files with 98 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -370,14 +370,71 @@ getnameinfo_failed:
}
}
static gchar *
do_resolve (const gchar * host, GCancellable * cancellable)
{
GResolver *resolver;
GInetAddress *addr;
GError *err = NULL;
gchar *ip;
addr = g_inet_address_new_from_string (host);
if (!addr) {
GList *results, *l;
resolver = g_resolver_get_default ();
results = g_resolver_lookup_by_name (resolver, host, cancellable, &err);
if (!results)
goto name_resolve;
for (l = results; l; l = l->next) {
GInetAddress *tmp = l->data;
if (g_inet_address_get_family (tmp) == G_SOCKET_FAMILY_IPV4 ||
g_inet_address_get_family (tmp) == G_SOCKET_FAMILY_IPV6) {
addr = G_INET_ADDRESS (g_object_ref (tmp));
break;
}
}
g_resolver_free_addresses (results);
g_object_unref (resolver);
}
if (!addr)
return NULL;
ip = g_inet_address_to_string (addr);
g_object_unref (addr);
return ip;
/* ERRORS */
name_resolve:
{
GST_ERROR ("failed to resolve %s: %s", host, err->message);
g_clear_error (&err);
g_object_unref (resolver);
return NULL;
}
}
static GstRTSPResult
do_connect (GSocketAddress * saddr, GSocket ** socket_out,
do_connect (const gchar * ip, guint16 port, GSocket ** socket_out,
GTimeVal * timeout, GCancellable * cancellable)
{
GSocket *socket;
GstClockTime to;
GInetAddress *addr;
GSocketAddress *saddr;
GError *err = NULL;
addr = g_inet_address_new_from_string (ip);
g_assert (addr);
saddr = g_inet_socket_address_new (addr, port);
g_object_unref (addr);
socket =
g_socket_new (g_socket_address_get_family (saddr), G_SOCKET_TYPE_STREAM,
G_SOCKET_PROTOCOL_TCP, &err);
@ -414,6 +471,7 @@ do_connect (GSocketAddress * saddr, GSocket ** socket_out,
goto sys_error;
done:
g_object_unref (saddr);
*socket_out = socket;
@ -424,12 +482,14 @@ no_socket:
{
GST_ERROR ("no socket: %s", err->message);
g_clear_error (&err);
g_object_unref (saddr);
return GST_RTSP_ESYS;
}
sys_error:
{
GST_ERROR ("system error: %s", err->message);
g_clear_error (&err);
g_object_unref (saddr);
g_object_unref (socket);
return GST_RTSP_ESYS;
}
@ -437,20 +497,21 @@ timeout:
{
GST_ERROR ("timeout");
g_clear_error (&err);
g_object_unref (saddr);
g_object_unref (socket);
return GST_RTSP_ETIMEOUT;
}
}
static GstRTSPResult
setup_tunneling (GstRTSPConnection * conn, GSocketAddress * sockaddr,
GTimeVal * timeout)
setup_tunneling (GstRTSPConnection * conn, GTimeVal * timeout)
{
gint i;
GstRTSPResult res;
gchar *ip;
gchar *uri;
gchar *value;
guint16 url_port;
guint16 port, url_port;
GstRTSPUrl *url;
gchar *hostparam;
GstRTSPMessage *msg;
@ -473,10 +534,14 @@ setup_tunneling (GstRTSPConnection * conn, GSocketAddress * sockaddr,
uri = g_strdup_printf ("http://%s:%d%s%s%s", url->host, url_port,
url->abspath, url->query ? "?" : "", url->query ? url->query : "");
hostparam = g_strdup_printf ("%s:%d", url->host, url_port);
ip = conn->proxy_host;
port = conn->proxy_port;
} else {
uri = g_strdup_printf ("%s%s%s", url->abspath, url->query ? "?" : "",
url->query ? url->query : "");
hostparam = NULL;
ip = conn->remote_ip;
port = url_port;
}
/* create the GET request for the read connection */
@ -525,67 +590,20 @@ setup_tunneling (GstRTSPConnection * conn, GSocketAddress * sockaddr,
url->host = g_strdup (value);
g_free (hostparam);
hostparam = g_strdup_printf ("%s:%d", url->host, url_port);
/* connect to the host/port */
res = do_connect (sockaddr, &conn->socket1, timeout, conn->cancellable);
if (res != GST_RTSP_OK)
goto connect_failed;
} else {
GSocketConnectable *connectable;
GSocketAddressEnumerator *enumerator;
GError *error = NULL;
gboolean first = TRUE;
sockaddr = NULL;
/* and resolve the new ip address */
connectable = g_network_address_new (value, url_port);
enumerator = g_socket_connectable_enumerate (connectable);
g_object_unref (connectable);
while (TRUE) {
sockaddr =
g_socket_address_enumerator_next (enumerator, conn->cancellable,
&error);
if (!sockaddr) {
if (!error)
GST_DEBUG ("no more addresses");
else
GST_DEBUG ("failed to retrieve next address %s", error->message);
g_object_unref (enumerator);
res = GST_RTSP_ESYS;
if (first)
goto not_resolved;
else
goto connect_failed;
}
first = FALSE;
/* connect to the host/port */
res = do_connect (sockaddr, &conn->socket0, timeout, conn->cancellable);
if (res == GST_RTSP_OK) {
g_free (conn->remote_ip);
conn->remote_ip =
g_inet_address_to_string (g_inet_socket_address_get_address
(G_INET_SOCKET_ADDRESS (sockaddr)));
g_object_unref (sockaddr);
break;
}
g_object_unref (sockaddr);
sockaddr = NULL;
}
g_object_unref (enumerator);
if (!(ip = do_resolve (value, conn->cancellable)))
goto not_resolved;
g_free (conn->remote_ip);
conn->remote_ip = ip;
}
} else {
/* connect to the host/port */
res = do_connect (sockaddr, &conn->socket1, timeout, conn->cancellable);
if (res != GST_RTSP_OK)
goto connect_failed;
}
/* connect to the host/port */
res = do_connect (ip, port, &conn->socket1, timeout, conn->cancellable);
if (res != GST_RTSP_OK)
goto connect_failed;
/* this is now our writing socket */
conn->write_socket = conn->socket1;
@ -678,11 +696,8 @@ gst_rtsp_connection_connect (GstRTSPConnection * conn, GTimeVal * timeout)
{
GstRTSPResult res;
gchar *ip;
guint16 port;
GstRTSPUrl *url;
gboolean proxy = FALSE, first = TRUE;
GSocketConnectable *connectable;
GSocketAddressEnumerator *enumerator;
GSocketAddress *sockaddr = NULL;
g_return_val_if_fail (conn != NULL, GST_RTSP_EINVAL);
g_return_val_if_fail (conn->url != NULL, GST_RTSP_EINVAL);
@ -690,73 +705,39 @@ gst_rtsp_connection_connect (GstRTSPConnection * conn, GTimeVal * timeout)
url = conn->url;
if (conn->proxy_host && conn->tunneled) {
connectable = g_network_address_new (conn->proxy_host, conn->proxy_port);
proxy = TRUE;
if (!(ip = do_resolve (conn->proxy_host, conn->cancellable))) {
GST_ERROR ("could not resolve %s", conn->proxy_host);
goto not_resolved;
}
port = conn->proxy_port;
g_free (conn->proxy_host);
conn->proxy_host = ip;
} else {
guint16 port;
if (!(ip = do_resolve (url->host, conn->cancellable))) {
GST_ERROR ("could not resolve %s", url->host);
goto not_resolved;
}
/* get the port from the url */
gst_rtsp_url_get_port (url, &port);
connectable = g_network_address_new (url->host, port);
g_free (conn->remote_ip);
conn->remote_ip = ip;
}
enumerator = g_socket_connectable_enumerate (connectable);
g_object_unref (connectable);
while (TRUE) {
GError *error = NULL;
sockaddr =
g_socket_address_enumerator_next (enumerator, conn->cancellable,
&error);
if (!sockaddr) {
if (!error)
GST_DEBUG ("no more addresses");
else
GST_DEBUG ("failed to retrieve next address %s", error->message);
g_clear_error (&error);
g_object_unref (enumerator);
res = GST_RTSP_ESYS;
if (first)
goto not_resolved;
else
goto connect_failed;
}
first = FALSE;
/* connect to the host/port */
res = do_connect (sockaddr, &conn->socket0, timeout, conn->cancellable);
if (res == GST_RTSP_OK) {
ip = g_inet_address_to_string (g_inet_socket_address_get_address
(G_INET_SOCKET_ADDRESS (sockaddr)));
if (proxy) {
conn->proxy_host = ip;
} else {
g_free (conn->remote_ip);
conn->remote_ip = ip;
}
break;
}
g_object_unref (sockaddr);
sockaddr = NULL;
}
g_object_unref (enumerator);
g_assert (sockaddr);
/* connect to the host/port */
res = do_connect (ip, port, &conn->socket0, timeout, conn->cancellable);
if (res != GST_RTSP_OK)
goto connect_failed;
/* this is our read URL */
conn->read_socket = conn->socket0;
if (conn->tunneled) {
res = setup_tunneling (conn, sockaddr, timeout);
g_object_unref (sockaddr);
res = setup_tunneling (conn, timeout);
if (res != GST_RTSP_OK)
goto tunneling_failed;
} else {
g_object_unref (sockaddr);
conn->write_socket = conn->socket0;
}