mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-stream: Decide based on the sockets, not the addresses if we already allocated a socket

Browse source 
In the multicast case (as in test-multicast, not test-multicast2), the
address could be allocated/reserved (and thus set) already without
allocating the actual socket. We need to allocate the socket here still
instead of just claiming that it was already allocated.

See https://bugzilla.gnome.org/show_bug.cgi?id=791743#c2
This commit is contained in:
Sebastian Dröge 2017-12-19 11:14:48 +02:00
parent 64f1a3ab85
commit 4d86f99449
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1508,18 +1508,19 @@ gst_rtsp_stream_allocate_udp_sockets (GstRTSPStream * stream,
g_mutex_lock (&priv->lock); g_mutex_lock (&priv->lock);
if (transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) { if (transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) {
if (family == G_SOCKET_FAMILY_IPV4 && priv->mcast_addr_v4) if (family == G_SOCKET_FAMILY_IPV4 && priv->mcast_socket_v4[0])
allocated = TRUE; allocated = TRUE;
else if (family == G_SOCKET_FAMILY_IPV6 && priv->mcast_addr_v6) else if (family == G_SOCKET_FAMILY_IPV6 && priv->mcast_socket_v6[0])
allocated = TRUE; allocated = TRUE;
} else if (transport == GST_RTSP_LOWER_TRANS_UDP) { } else if (transport == GST_RTSP_LOWER_TRANS_UDP) {
if (family == G_SOCKET_FAMILY_IPV4 && priv->server_addr_v4) if (family == G_SOCKET_FAMILY_IPV4 && priv->socket_v4[0])
allocated = TRUE; allocated = TRUE;
else if (family == G_SOCKET_FAMILY_IPV6 && priv->server_addr_v6) else if (family == G_SOCKET_FAMILY_IPV6 && priv->socket_v6[0])
allocated = TRUE; allocated = TRUE;
} }
if (allocated) { if (allocated) {
GST_DEBUG_OBJECT (stream, "Allocated already");
g_mutex_unlock (&priv->lock); g_mutex_unlock (&priv->lock);
return TRUE; return TRUE;
} }