mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-19 22:05:58 +00:00
Code Issues 1 Projects Releases Wiki Activity

netclock: Add support for IPv6

Browse source
This commit is contained in:
Sebastian Dröge 2013-04-24 15:58:49 +02:00
parent 1905219235
commit d420686764
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libs/gst/net/gstnetclientclock.c
View file

@ -350,18 +350,34 @@ gst_net_client_clock_start (GstNetClientClock * self)
GInetAddress *inetaddr; GInetAddress *inetaddr;
GSocket *socket; GSocket *socket;
GError *error = NULL; GError *error = NULL;
GSocketFamily family;
g_return_val_if_fail (self->priv->address != NULL, FALSE); g_return_val_if_fail (self->priv->address != NULL, FALSE);
g_return_val_if_fail (self->priv->servaddr == NULL, FALSE); g_return_val_if_fail (self->priv->servaddr == NULL, FALSE);
socket = g_socket_new (G_SOCKET_FAMILY_IPV4, G_SOCKET_TYPE_DATAGRAM, /* create target address */
inetaddr = g_inet_address_new_from_string (self->priv->address);
if (inetaddr == NULL)
goto bad_address;
family = g_inet_address_get_family (inetaddr);
servaddr = g_inet_socket_address_new (inetaddr, self->priv->port);
g_object_unref (inetaddr);
g_assert (servaddr != NULL);
GST_DEBUG_OBJECT (self, "will communicate with %s:%d", self->priv->address,
self->priv->port);
socket = g_socket_new (family, G_SOCKET_TYPE_DATAGRAM,
G_SOCKET_PROTOCOL_UDP, &error); G_SOCKET_PROTOCOL_UDP, &error);
if (socket == NULL) if (socket == NULL)
goto no_socket; goto no_socket;
GST_DEBUG_OBJECT (self, "binding socket"); GST_DEBUG_OBJECT (self, "binding socket");
inetaddr = g_inet_address_new_any (G_SOCKET_FAMILY_IPV4); inetaddr = g_inet_address_new_any (family);
anyaddr = g_inet_socket_address_new (inetaddr, 0); anyaddr = g_inet_socket_address_new (inetaddr, 0);
g_socket_bind (socket, anyaddr, TRUE, &error); g_socket_bind (socket, anyaddr, TRUE, &error);
g_object_unref (anyaddr); g_object_unref (anyaddr);
@ -381,20 +397,6 @@ gst_net_client_clock_start (GstNetClientClock * self)
g_object_unref (myaddr); g_object_unref (myaddr);
/* create target address */
inetaddr = g_inet_address_new_from_string (self->priv->address);
if (inetaddr == NULL)
goto bad_address;
servaddr = g_inet_socket_address_new (inetaddr, self->priv->port);
g_object_unref (inetaddr);
g_assert (servaddr != NULL);
GST_DEBUG_OBJECT (self, "will communicate with %s:%d", self->priv->address,
self->priv->port);
self->priv->cancel = g_cancellable_new (); self->priv->cancel = g_cancellable_new ();
self->priv->socket = socket; self->priv->socket = socket;
self->priv->servaddr = G_SOCKET_ADDRESS (servaddr); self->priv->servaddr = G_SOCKET_ADDRESS (servaddr);
@ -432,7 +434,6 @@ bad_address:
{ {
GST_ERROR_OBJECT (self, "inet_address_new_from_string('%s') failed", GST_ERROR_OBJECT (self, "inet_address_new_from_string('%s') failed",
self->priv->address); self->priv->address);
g_object_unref (socket);
return FALSE; return FALSE;
} }
no_thread: no_thread:

2
libs/gst/net/gstnettimeprovider.c
View file

@ -394,7 +394,7 @@ gst_net_time_provider_stop (GstNetTimeProvider * self)
/** /**
* gst_net_time_provider_new: * gst_net_time_provider_new:
* @clock: a #GstClock to export over the network * @clock: a #GstClock to export over the network
* @address: an address to bind on as a dotted quad (xxx.xxx.xxx.xxx), or NULL * @address: an address to bind on as a dotted quad (xxx.xxx.xxx.xxx), IPv6 address, or NULL
* to bind to all addresses * to bind to all addresses
* @port: a port to bind on, or 0 to let the kernel choose * @port: a port to bind on, or 0 to let the kernel choose
* *