mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-05 02:02:26 +00:00
Code Issues 1 Projects Releases Wiki Activity

udp: use uri parsing code

Browse source 
Use the uri parsing helper functions to manage the host and port pairs. This
adds support for IPV6.
This commit is contained in:
Wim Taymans 2010-03-09 17:15:16 +01:00
parent 14ae2080d2
commit 455f53c896
4 changed files with 74 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
gst/udp/gstudpsink.c
View file

@ -156,72 +156,40 @@ gst_udpsink_class_init (GstUDPSink * klass)
static void static void
gst_udpsink_init (GstUDPSink * udpsink) gst_udpsink_init (GstUDPSink * udpsink)
{ {
udpsink->host = g_strdup (UDP_DEFAULT_HOST); gst_udp_uri_init (&udpsink->uri, UDP_DEFAULT_HOST, UDP_DEFAULT_PORT);
udpsink->port = UDP_DEFAULT_PORT;
gst_multiudpsink_add (GST_MULTIUDPSINK (udpsink), udpsink->host, gst_multiudpsink_add (GST_MULTIUDPSINK (udpsink), udpsink->uri.host,
udpsink->port); udpsink->uri.port);
} }
static void static void
gst_udpsink_finalize (GstUDPSink * udpsink) gst_udpsink_finalize (GstUDPSink * udpsink)
{ {
g_free (udpsink->host); gst_udp_uri_free (&udpsink->uri);
g_free (udpsink->uri); g_free (udpsink->uristr);
G_OBJECT_CLASS (parent_class)->finalize ((GObject *) udpsink); G_OBJECT_CLASS (parent_class)->finalize ((GObject *) udpsink);
} }
static void
gst_udpsink_update_uri (GstUDPSink * sink)
{
g_free (sink->uri);
sink->uri = g_strdup_printf ("udp://%s:%d", sink->host, sink->port);
GST_DEBUG_OBJECT (sink, "updated uri to %s", sink->uri);
}
static gboolean static gboolean
gst_udpsink_set_uri (GstUDPSink * sink, const gchar * uri) gst_udpsink_set_uri (GstUDPSink * sink, const gchar * uri)
{ {
gchar *protocol; gst_multiudpsink_remove (GST_MULTIUDPSINK (sink), sink->uri.host,
gchar *location; sink->uri.port);
gchar *colptr;
protocol = gst_uri_get_protocol (uri); if (gst_udp_parse_uri (uri, &sink->uri) < 0)
if (strcmp (protocol, "udp") != 0) goto wrong_uri;
goto wrong_protocol;
g_free (protocol);
location = gst_uri_get_location (uri); gst_multiudpsink_add (GST_MULTIUDPSINK (sink), sink->uri.host,
if (!location) sink->uri.port);
return FALSE;
colptr = strstr (location, ":");
gst_multiudpsink_remove (GST_MULTIUDPSINK (sink), sink->host, sink->port);
if (colptr != NULL) {
g_free (sink->host);
sink->host = g_strndup (location, colptr - location);
sink->port = atoi (colptr + 1);
} else {
g_free (sink->host);
sink->host = g_strdup (location);
sink->port = UDP_DEFAULT_PORT;
}
g_free (location);
gst_multiudpsink_add (GST_MULTIUDPSINK (sink), sink->host, sink->port);
gst_udpsink_update_uri (sink);
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */
wrong_protocol: wrong_uri:
{ {
GST_ELEMENT_ERROR (sink, RESOURCE, READ, (NULL), GST_ELEMENT_ERROR (sink, RESOURCE, READ, (NULL),
("error parsing uri %s: wrong protocol (%s != udp)", uri, protocol)); ("error parsing uri %s", uri));
g_free (protocol);
return FALSE; return FALSE;
} }
} }
@ -236,15 +204,23 @@ gst_udpsink_set_property (GObject * object, guint prop_id, const GValue * value,
/* remove old host */ /* remove old host */
gst_multiudpsink_remove (GST_MULTIUDPSINK (udpsink), gst_multiudpsink_remove (GST_MULTIUDPSINK (udpsink),
udpsink->host, udpsink->port); udpsink->uri.host, udpsink->uri.port);
switch (prop_id) { switch (prop_id) {
case PROP_HOST: case PROP_HOST:
g_free (udpsink->host); {
udpsink->host = g_value_dup_string (value); const gchar *host;
host = g_value_get_string (value);
if (host)
gst_udp_uri_update (&udpsink->uri, host, -1);
else
gst_udp_uri_update (&udpsink->uri, UDP_DEFAULT_HOST, -1);
break; break;
}
case PROP_PORT: case PROP_PORT:
udpsink->port = g_value_get_int (value); gst_udp_uri_update (&udpsink->uri, NULL, g_value_get_int (value));
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -252,7 +228,7 @@ gst_udpsink_set_property (GObject * object, guint prop_id, const GValue * value,
} }
/* add new host */ /* add new host */
gst_multiudpsink_add (GST_MULTIUDPSINK (udpsink), gst_multiudpsink_add (GST_MULTIUDPSINK (udpsink),
udpsink->host, udpsink->port); udpsink->uri.host, udpsink->uri.port);
} }
static void static void
@ -265,10 +241,10 @@ gst_udpsink_get_property (GObject * object, guint prop_id, GValue * value,
switch (prop_id) { switch (prop_id) {
case PROP_HOST: case PROP_HOST:
g_value_set_string (value, udpsink->host); g_value_set_string (value, udpsink->uri.host);
break; break;
case PROP_PORT: case PROP_PORT:
g_value_set_int (value, udpsink->port); g_value_set_int (value, udpsink->uri.port);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -297,7 +273,10 @@ gst_udpsink_uri_get_uri (GstURIHandler * handler)
{ {
GstUDPSink *sink = GST_UDPSINK (handler); GstUDPSink *sink = GST_UDPSINK (handler);
return g_strdup (sink->uri); g_free (sink->uristr);
sink->uristr = gst_udp_uri_string (&sink->uri);
return sink->uristr;
} }
static gboolean static gboolean

5
gst/udp/gstudpsink.h
View file

@ -41,9 +41,8 @@ typedef struct _GstUDPSinkClass GstUDPSinkClass;
struct _GstUDPSink { struct _GstUDPSink {
GstMultiUDPSink parent; GstMultiUDPSink parent;
gchar *uri; GstUDPUri uri;
gint port; gchar *uristr;
gchar *host;
}; };
struct _GstUDPSinkClass { struct _GstUDPSinkClass {

97
gst/udp/gstudpsrc.c
View file

@ -309,11 +309,11 @@ gst_udpsrc_init (GstUDPSrc * udpsrc, GstUDPSrcClass * g_class)
{ {
WSA_STARTUP (udpsrc); WSA_STARTUP (udpsrc);
udpsrc->port = UDP_DEFAULT_PORT; gst_udp_uri_init (&udpsrc->uri, UDP_DEFAULT_MULTICAST_GROUP,
UDP_DEFAULT_PORT);
udpsrc->sockfd = UDP_DEFAULT_SOCKFD; udpsrc->sockfd = UDP_DEFAULT_SOCKFD;
udpsrc->multi_group = g_strdup (UDP_DEFAULT_MULTICAST_GROUP);
udpsrc->multi_iface = g_strdup (UDP_DEFAULT_MULTICAST_IFACE); udpsrc->multi_iface = g_strdup (UDP_DEFAULT_MULTICAST_IFACE);
udpsrc->uri = g_strdup (UDP_DEFAULT_URI);
udpsrc->buffer_size = UDP_DEFAULT_BUFFER_SIZE; udpsrc->buffer_size = UDP_DEFAULT_BUFFER_SIZE;
udpsrc->timeout = UDP_DEFAULT_TIMEOUT; udpsrc->timeout = UDP_DEFAULT_TIMEOUT;
udpsrc->skip_first_bytes = UDP_DEFAULT_SKIP_FIRST_BYTES; udpsrc->skip_first_bytes = UDP_DEFAULT_SKIP_FIRST_BYTES;
@ -340,9 +340,11 @@ gst_udpsrc_finalize (GObject * object)
if (udpsrc->caps) if (udpsrc->caps)
gst_caps_unref (udpsrc->caps); gst_caps_unref (udpsrc->caps);
g_free (udpsrc->multi_group);
g_free (udpsrc->multi_iface); g_free (udpsrc->multi_iface);
g_free (udpsrc->uri);
gst_udp_uri_free (&udpsrc->uri);
g_free (udpsrc->uristr);
if (udpsrc->sockfd >= 0 && udpsrc->closefd) if (udpsrc->sockfd >= 0 && udpsrc->closefd)
CLOSE_SOCKET (udpsrc->sockfd); CLOSE_SOCKET (udpsrc->sockfd);
@ -600,54 +602,22 @@ skip_error:
} }
} }
/* Call this function when multicastgroup and/or port are updated */
static void
gst_udpsrc_update_uri (GstUDPSrc * src)
{
g_free (src->uri);
src->uri = g_strdup_printf ("udp://%s:%d", src->multi_group, src->port);
GST_DEBUG_OBJECT (src, "updated uri to %s", src->uri);
}
static gboolean static gboolean
gst_udpsrc_set_uri (GstUDPSrc * src, const gchar * uri) gst_udpsrc_set_uri (GstUDPSrc * src, const gchar * uri)
{ {
gchar *protocol; if (gst_udp_parse_uri (uri, &src->uri) < 0)
gchar *location; goto wrong_uri;
gchar *colptr;
protocol = gst_uri_get_protocol (uri); if (src->uri.port == -1)
if (strcmp (protocol, "udp") != 0) src->uri.port = UDP_DEFAULT_PORT;
goto wrong_protocol;
g_free (protocol);
location = gst_uri_get_location (uri);
if (!location)
return FALSE;
colptr = strrchr (location, ':');
if (colptr != NULL) {
g_free (src->multi_group);
src->multi_group = g_strndup (location, colptr - location);
src->port = atoi (colptr + 1);
} else {
g_free (src->multi_group);
src->multi_group = g_strdup (location);
src->port = UDP_DEFAULT_PORT;
}
g_free (location);
gst_udpsrc_update_uri (src);
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */
wrong_protocol: wrong_uri:
{ {
GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL), GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL),
("error parsing uri %s: wrong protocol (%s != udp)", uri, protocol)); ("error parsing uri %s", uri));
g_free (protocol);
return FALSE; return FALSE;
} }
} }
@ -663,18 +633,18 @@ gst_udpsrc_set_property (GObject * object, guint prop_id, const GValue * value,
udpsrc->buffer_size = g_value_get_int (value); udpsrc->buffer_size = g_value_get_int (value);
break; break;
case PROP_PORT: case PROP_PORT:
udpsrc->port = g_value_get_int (value); gst_udp_uri_update (&udpsrc->uri, NULL, g_value_get_int (value));
gst_udpsrc_update_uri (udpsrc);
break; break;
case PROP_MULTICAST_GROUP: case PROP_MULTICAST_GROUP:
g_free (udpsrc->multi_group); {
const gchar *group;
if (g_value_get_string (value) == NULL) if ((group = g_value_get_string (value)))
udpsrc->multi_group = g_strdup (UDP_DEFAULT_MULTICAST_GROUP); gst_udp_uri_update (&udpsrc->uri, group, -1);
else else
udpsrc->multi_group = g_value_dup_string (value); gst_udp_uri_update (&udpsrc->uri, UDP_DEFAULT_MULTICAST_GROUP, -1);
gst_udpsrc_update_uri (udpsrc);
break; break;
}
case PROP_MULTICAST_IFACE: case PROP_MULTICAST_IFACE:
g_free (udpsrc->multi_iface); g_free (udpsrc->multi_iface);
@ -742,16 +712,16 @@ gst_udpsrc_get_property (GObject * object, guint prop_id, GValue * value,
g_value_set_int (value, udpsrc->buffer_size); g_value_set_int (value, udpsrc->buffer_size);
break; break;
case PROP_PORT: case PROP_PORT:
g_value_set_int (value, udpsrc->port); g_value_set_int (value, udpsrc->uri.port);
break; break;
case PROP_MULTICAST_GROUP: case PROP_MULTICAST_GROUP:
g_value_set_string (value, udpsrc->multi_group); g_value_set_string (value, udpsrc->uri.host);
break; break;
case PROP_MULTICAST_IFACE: case PROP_MULTICAST_IFACE:
g_value_set_string (value, udpsrc->multi_iface); g_value_set_string (value, udpsrc->multi_iface);
break; break;
case PROP_URI: case PROP_URI:
g_value_set_string (value, udpsrc->uri); g_value_take_string (value, gst_udp_uri_string (&udpsrc->uri));
break; break;
case PROP_CAPS: case PROP_CAPS:
gst_value_set_caps (value, udpsrc->caps); gst_value_set_caps (value, udpsrc->caps);
@ -800,10 +770,10 @@ gst_udpsrc_start (GstBaseSrc * bsrc)
if (src->sockfd == -1) { if (src->sockfd == -1) {
/* need to allocate a socket */ /* need to allocate a socket */
GST_DEBUG_OBJECT (src, "allocating socket for %s:%d", src->multi_group, GST_DEBUG_OBJECT (src, "allocating socket for %s:%d", src->uri.host,
src->port); src->uri.port);
if ((ret = if ((ret =
gst_udp_get_addr (src->multi_group, src->port, &src->myaddr)) < 0) gst_udp_get_addr (src->uri.host, src->uri.port, &src->myaddr)) < 0)
goto getaddrinfo_error; goto getaddrinfo_error;
if ((ret = socket (src->myaddr.ss_family, SOCK_DGRAM, IPPROTO_UDP)) < 0) if ((ret = socket (src->myaddr.ss_family, SOCK_DGRAM, IPPROTO_UDP)) < 0)
@ -820,7 +790,7 @@ gst_udpsrc_start (GstBaseSrc * bsrc)
sizeof (reuse))) < 0) sizeof (reuse))) < 0)
goto setsockopt_error; goto setsockopt_error;
GST_DEBUG_OBJECT (src, "binding on port %d", src->port); GST_DEBUG_OBJECT (src, "binding on port %d", src->uri.port);
len = gst_udp_get_sockaddr_length (&src->myaddr); len = gst_udp_get_sockaddr_length (&src->myaddr);
if ((ret = bind (src->sock.fd, (struct sockaddr *) &src->myaddr, len)) < 0) if ((ret = bind (src->sock.fd, (struct sockaddr *) &src->myaddr, len)) < 0)
@ -891,7 +861,7 @@ gst_udpsrc_start (GstBaseSrc * bsrc)
#endif #endif
if (src->auto_multicast && gst_udp_is_multicast (&src->myaddr)) { if (src->auto_multicast && gst_udp_is_multicast (&src->myaddr)) {
GST_DEBUG_OBJECT (src, "joining multicast group %s", src->multi_group); GST_DEBUG_OBJECT (src, "joining multicast group %s", src->uri.host);
ret = gst_udp_join_group (src->sock.fd, &src->myaddr, src->multi_iface); ret = gst_udp_join_group (src->sock.fd, &src->myaddr, src->multi_iface);
if (ret < 0) if (ret < 0)
goto membership; goto membership;
@ -901,8 +871,8 @@ gst_udpsrc_start (GstBaseSrc * bsrc)
* follows ss_family on both */ * follows ss_family on both */
port = g_ntohs (((struct sockaddr_in *) &src->myaddr)->sin_port); port = g_ntohs (((struct sockaddr_in *) &src->myaddr)->sin_port);
GST_DEBUG_OBJECT (src, "bound, on port %d", port); GST_DEBUG_OBJECT (src, "bound, on port %d", port);
if (port != src->port) { if (port != src->uri.port) {
src->port = port; src->uri.port = port;
GST_DEBUG_OBJECT (src, "notifying port %d", port); GST_DEBUG_OBJECT (src, "notifying port %d", port);
g_object_notify (G_OBJECT (src), "port"); g_object_notify (G_OBJECT (src), "port");
} }
@ -1003,7 +973,7 @@ gst_udpsrc_stop (GstBaseSrc * bsrc)
if (src->sock.fd >= 0) { if (src->sock.fd >= 0) {
if (src->auto_multicast && gst_udp_is_multicast (&src->myaddr)) { if (src->auto_multicast && gst_udp_is_multicast (&src->myaddr)) {
GST_DEBUG_OBJECT (src, "leaving multicast group %s", src->multi_group); GST_DEBUG_OBJECT (src, "leaving multicast group %s", src->uri.host);
gst_udp_leave_group (src->sock.fd, &src->myaddr); gst_udp_leave_group (src->sock.fd, &src->myaddr);
} }
CLOSE_IF_REQUESTED (src); CLOSE_IF_REQUESTED (src);
@ -1038,7 +1008,10 @@ gst_udpsrc_uri_get_uri (GstURIHandler * handler)
{ {
GstUDPSrc *src = GST_UDPSRC (handler); GstUDPSrc *src = GST_UDPSRC (handler);
return src->uri; g_free (src->uristr);
src->uristr = gst_udp_uri_string (&src->uri);
return src->uristr;
} }
static gboolean static gboolean

7
gst/udp/gstudpsrc.h
View file

@ -53,9 +53,7 @@ struct _GstUDPSrc {
GstPushSrc parent; GstPushSrc parent;
/* properties */ /* properties */
gchar *uri; GstUDPUri uri;
int port;
gchar *multi_group;
gchar *multi_iface; gchar *multi_iface;
gint ttl; gint ttl;
GstCaps *caps; GstCaps *caps;
@ -70,8 +68,11 @@ struct _GstUDPSrc {
GstPollFD sock; GstPollFD sock;
GstPoll *fdset; GstPoll *fdset;
gboolean externalfd; gboolean externalfd;
gboolean is_ipv6;
struct sockaddr_storage myaddr; struct sockaddr_storage myaddr;
gchar *uristr;
}; };
struct _GstUDPSrcClass { struct _GstUDPSrcClass {