FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

(dyn|multi)udpsink: Bind socket before using it

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=700878
This commit is contained in:
Sebastian Dröge 2013-05-23 18:05:07 +02:00
parent 1ed7f7a6a8
commit 5b79b8ff3c
2 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gst/udp/gstdynudpsink.c
View File

@ -373,17 +373,35 @@ gst_dynudpsink_start (GstBaseSink * bsink)
} }
if (!udpsink->used_socket && !udpsink->used_socket_v6) { if (!udpsink->used_socket && !udpsink->used_socket_v6) {
/* create sender sockets if none available */ GSocketAddress *bind_addr;
GInetAddress *bind_iaddr;
/* create sender sockets if none available */
if ((udpsink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4, if ((udpsink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4,
G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL)
goto no_socket; goto no_socket;
bind_iaddr = g_inet_address_new_any (G_SOCKET_FAMILY_IPV4);
bind_addr = g_inet_socket_address_new (bind_iaddr, 0);
g_socket_bind (udpsink->used_socket, bind_addr, TRUE, &err);
g_object_unref (bind_addr);
g_object_unref (bind_iaddr);
if (err != NULL)
goto bind_error;
if ((udpsink->used_socket_v6 = g_socket_new (G_SOCKET_FAMILY_IPV6, if ((udpsink->used_socket_v6 = g_socket_new (G_SOCKET_FAMILY_IPV6,
G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) { G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) {
GST_INFO_OBJECT (udpsink, "Failed to create IPv6 socket: %s", GST_INFO_OBJECT (udpsink, "Failed to create IPv6 socket: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
} else {
bind_iaddr = g_inet_address_new_any (G_SOCKET_FAMILY_IPV6);
bind_addr = g_inet_socket_address_new (bind_iaddr, 0);
g_socket_bind (udpsink->used_socket_v6, bind_addr, TRUE, &err);
g_object_unref (bind_addr);
g_object_unref (bind_iaddr);
if (err != NULL)
goto bind_error;
} }
} }
@ -402,6 +420,13 @@ no_socket:
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
} }
bind_error:
{
GST_ELEMENT_ERROR (udpsink, RESOURCE, FAILED, (NULL),
("Failed to bind socket: %s", err->message));
g_clear_error (&err);
return FALSE;
}
} }
static GstStructure * static GstStructure *

27
gst/udp/gstmultiudpsink.c
View File

@ -970,16 +970,34 @@ gst_multiudpsink_start (GstBaseSink * bsink)
} }
if (!sink->used_socket && !sink->used_socket_v6) { if (!sink->used_socket && !sink->used_socket_v6) {
/* create sender sockets if none available */ GSocketAddress *bind_addr;
GInetAddress *bind_iaddr;
/* create sender sockets if none available */
if ((sink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4, if ((sink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4,
G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL)
goto no_socket; goto no_socket;
bind_iaddr = g_inet_address_new_any (G_SOCKET_FAMILY_IPV4);
bind_addr = g_inet_socket_address_new (bind_iaddr, 0);
g_socket_bind (sink->used_socket, bind_addr, TRUE, &err);
g_object_unref (bind_addr);
g_object_unref (bind_iaddr);
if (err != NULL)
goto bind_error;
if ((sink->used_socket_v6 = g_socket_new (G_SOCKET_FAMILY_IPV6, if ((sink->used_socket_v6 = g_socket_new (G_SOCKET_FAMILY_IPV6,
G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) { G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) {
GST_INFO_OBJECT (sink, "Failed to create IPv6 socket: %s", err->message); GST_INFO_OBJECT (sink, "Failed to create IPv6 socket: %s", err->message);
g_clear_error (&err); g_clear_error (&err);
} else {
bind_iaddr = g_inet_address_new_any (G_SOCKET_FAMILY_IPV6);
bind_addr = g_inet_socket_address_new (bind_iaddr, 0);
g_socket_bind (sink->used_socket_v6, bind_addr, TRUE, &err);
g_object_unref (bind_addr);
g_object_unref (bind_iaddr);
if (err != NULL)
goto bind_error;
} }
} }
#ifdef SO_SNDBUF #ifdef SO_SNDBUF
@ -1073,6 +1091,13 @@ no_socket:
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
} }
bind_error:
{
GST_ELEMENT_ERROR (sink, RESOURCE, FAILED, (NULL),
("Failed to bind socket: %s", err->message));
g_clear_error (&err);
return FALSE;
}
} }
static gboolean static gboolean