mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 11:32:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

stream: add more support for IPv6

Browse source 
Rename _get_address to _get_multicast_address in GstRTSPStream to
make it clear that this function only deals with multicast.
Make it possible to have both an IPv4 and IPv6 multicast address on
a stream. Give the client an IPv4 or IPv6 address depending on the
address it used to connect to the server.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=702002
This commit is contained in:
Wim Taymans 2013-07-01 16:46:07 +02:00
parent 13016309b1
commit a7fe63298c
3 changed files with 58 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst/rtsp-server/rtsp-client.c
View file

@ -1184,8 +1184,11 @@ default_configure_client_transport (GstRTSPClient * client,
gst_rtsp_address_free (addr);
} else {
GstRTSPAddress *addr;
GSocketFamily family;
addr = gst_rtsp_stream_get_address (state->stream);
family = priv->is_ipv6 ? G_SOCKET_FAMILY_IPV6 : G_SOCKET_FAMILY_IPV4;
addr = gst_rtsp_stream_get_multicast_address (state->stream, family);
if (addr == NULL)
goto no_address;

69
gst/rtsp-server/rtsp-stream.c
View file

@ -77,7 +77,8 @@ struct _GstRTSPStreamPrivate
/* multicast addresses */
GstRTSPAddressPool *pool;
GstRTSPAddress *addr;
GstRTSPAddress *addr_v4;
GstRTSPAddress *addr_v6;
/* the caps of the stream */
gulong caps_sig;
@ -150,8 +151,10 @@ gst_rtsp_stream_finalize (GObject * obj)
/* we really need to be unjoined now */
g_return_if_fail (!priv->is_joined);
if (priv->addr)
gst_rtsp_address_free (priv->addr);
if (priv->addr_v4)
gst_rtsp_address_free (priv->addr_v4);
if (priv->addr_v6)
gst_rtsp_address_free (priv->addr_v6);
if (priv->server_addr_v4)
gst_rtsp_address_free (priv->server_addr_v4);
if (priv->server_addr_v6)
@ -400,35 +403,48 @@ gst_rtsp_stream_get_address_pool (GstRTSPStream * stream)
}
/**
* gst_rtsp_stream_get_address:
* gst_rtsp_stream_get_multicast_address:
* @stream: a #GstRTSPStream
* @family: the #GSocketFamily
*
* Get the multicast address of @stream.
* Get the multicast address of @stream for @family.
*
* Returns: the #GstRTSPAddress of @stream or %NULL when no address could be
* allocated. gst_rtsp_address_free() after usage.
*/
GstRTSPAddress *
gst_rtsp_stream_get_address (GstRTSPStream * stream)
gst_rtsp_stream_get_multicast_address (GstRTSPStream * stream,
GSocketFamily family)
{
GstRTSPStreamPrivate *priv;
GstRTSPAddress *result;
GstRTSPAddress **addrp;
GstRTSPAddressFlags flags;
g_return_val_if_fail (GST_IS_RTSP_STREAM (stream), NULL);
priv = stream->priv;
if (family == G_SOCKET_FAMILY_IPV6) {
flags = GST_RTSP_ADDRESS_FLAG_IPV6;
addrp = &priv->addr_v4;
} else {
flags = GST_RTSP_ADDRESS_FLAG_IPV4;
addrp = &priv->addr_v6;
}
g_mutex_lock (&priv->lock);
if (priv->addr == NULL) {
if (*addrp == NULL) {
if (priv->pool == NULL)
goto no_pool;
priv->addr = gst_rtsp_address_pool_acquire_address (priv->pool,
GST_RTSP_ADDRESS_FLAG_EVEN_PORT | GST_RTSP_ADDRESS_FLAG_MULTICAST, 2);
if (priv->addr == NULL)
flags |= GST_RTSP_ADDRESS_FLAG_EVEN_PORT | GST_RTSP_ADDRESS_FLAG_MULTICAST;
*addrp = gst_rtsp_address_pool_acquire_address (priv->pool, flags, 2);
if (*addrp == NULL)
goto no_address;
}
result = gst_rtsp_address_copy (priv->addr);
result = gst_rtsp_address_copy (*addrp);
g_mutex_unlock (&priv->lock);
return result;
@ -467,6 +483,9 @@ gst_rtsp_stream_reserve_address (GstRTSPStream * stream,
{
GstRTSPStreamPrivate *priv;
GstRTSPAddress *result;
GInetAddress *addr;
GSocketFamily family;
GstRTSPAddress **addrp;
g_return_val_if_fail (GST_IS_RTSP_STREAM (stream), NULL);
g_return_val_if_fail (address != NULL, NULL);
@ -476,22 +495,36 @@ gst_rtsp_stream_reserve_address (GstRTSPStream * stream,
priv = stream->priv;
addr = g_inet_address_new_from_string (address);
if (!addr) {
GST_ERROR ("failed to get inet addr from %s", address);
family = G_SOCKET_FAMILY_IPV4;
} else {
family = g_inet_address_get_family (addr);
g_object_unref (addr);
}
if (family == G_SOCKET_FAMILY_IPV6)
addrp = &priv->addr_v4;
else
addrp = &priv->addr_v6;
g_mutex_lock (&priv->lock);
if (priv->addr == NULL) {
if (*addrp == NULL) {
if (priv->pool == NULL)
goto no_pool;
priv->addr = gst_rtsp_address_pool_reserve_address (priv->pool, address,
*addrp = gst_rtsp_address_pool_reserve_address (priv->pool, address,
port, n_ports, ttl);
if (priv->addr == NULL)
if (*addrp == NULL)
goto no_address;
} else {
if (strcmp (priv->addr->address, address) ||
priv->addr->port != port || priv->addr->n_ports != n_ports ||
priv->addr->ttl != ttl)
if (strcmp ((*addrp)->address, address) ||
(*addrp)->port != port || (*addrp)->n_ports != n_ports ||
(*addrp)->ttl != ttl)
goto different_address;
}
result = gst_rtsp_address_copy (priv->addr);
result = gst_rtsp_address_copy (*addrp);
g_mutex_unlock (&priv->lock);
return result;

5
gst/rtsp-server/rtsp-stream.h
View file

@ -77,8 +77,6 @@ void gst_rtsp_stream_set_address_pool (GstRTSPStream *stream, GstRT
GstRTSPAddressPool *
gst_rtsp_stream_get_address_pool (GstRTSPStream *stream);
GstRTSPAddress * gst_rtsp_stream_get_address (GstRTSPStream *stream);
GstRTSPAddress * gst_rtsp_stream_reserve_address (GstRTSPStream *stream,
const gchar * address,
guint port,
@ -94,6 +92,9 @@ gboolean gst_rtsp_stream_leave_bin (GstRTSPStream *stream,
void gst_rtsp_stream_get_server_port (GstRTSPStream *stream,
GstRTSPRange *server_port,
GSocketFamily family);
GstRTSPAddress * gst_rtsp_stream_get_multicast_address (GstRTSPStream *stream,
GSocketFamily family);
GObject * gst_rtsp_stream_get_rtpsession (GstRTSPStream *stream);