mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 20:59:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/udp/gstudpsrc.c: Switch on the socket family to get the addrlen size right.

Browse source 
Original commit message from CVS:
* gst/udp/gstudpsrc.c: (gst_udpsrc_class_init),
(gst_udpsrc_set_uri), (gst_udpsrc_start):
Switch on the socket family to get the addrlen size right.
This commit is contained in:
Wim Taymans 2008-09-25 11:30:35 +00:00
parent edd6239979
commit 712cd620af
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-09-25 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/udp/gstudpsrc.c: (gst_udpsrc_class_init),
(gst_udpsrc_set_uri), (gst_udpsrc_start):
Switch on the socket family to get the addrlen size right.
2008-09-25 Wim Taymans <wim.taymans@collabora.co.uk> 2008-09-25 Wim Taymans <wim.taymans@collabora.co.uk>
Patch by: Daniel Franke <df at dfranke dot us> Patch by: Daniel Franke <df at dfranke dot us>

26
gst/udp/gstudpsrc.c
View file

@ -247,9 +247,7 @@ static void
gst_udpsrc_class_init (GstUDPSrcClass * klass) gst_udpsrc_class_init (GstUDPSrcClass * klass)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class;
GstBaseSrcClass *gstbasesrc_class; GstBaseSrcClass *gstbasesrc_class;
GstPushSrcClass *gstpushsrc_class; GstPushSrcClass *gstpushsrc_class;
gobject_class = (GObjectClass *) klass; gobject_class = (GObjectClass *) klass;
@ -582,9 +580,7 @@ static gboolean
gst_udpsrc_set_uri (GstUDPSrc * src, const gchar * uri) gst_udpsrc_set_uri (GstUDPSrc * src, const gchar * uri)
{ {
gchar *protocol; gchar *protocol;
gchar *location; gchar *location;
gchar *colptr; gchar *colptr;
protocol = gst_uri_get_protocol (uri); protocol = gst_uri_get_protocol (uri);
@ -743,17 +739,11 @@ static gboolean
gst_udpsrc_start (GstBaseSrc * bsrc) gst_udpsrc_start (GstBaseSrc * bsrc)
{ {
guint bc_val; guint bc_val;
gint reuse; gint reuse;
int port; int port;
GstUDPSrc *src; GstUDPSrc *src;
gint ret; gint ret;
int rcvsize; int rcvsize;
guint len; guint len;
src = GST_UDPSRC (bsrc); src = GST_UDPSRC (bsrc);
@ -779,8 +769,20 @@ gst_udpsrc_start (GstBaseSrc * bsrc)
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->port);
/* Mac OS is picky about the size */
len = sizeof (struct sockaddr_in); /* Mac OS is picky about the size for the bind so we switch on the family */
switch (src->myaddr.ss_family) {
case AF_INET:
len = sizeof (struct sockaddr_in);
break;
case AF_INET6:
len = sizeof (struct sockaddr_in6);
break;
default:
/* don't know, Screw MacOS and use the full length */
len = sizeof (src->myaddr);
break;
}
if ((ret = bind (src->sock.fd, (struct sockaddr *) &src->myaddr, len)) < 0) if ((ret = bind (src->sock.fd, (struct sockaddr *) &src->myaddr, len)) < 0)
goto bind_error; goto bind_error;