diff options
| author | Peter Kjellerstedt <pkj@axis.com> | 2009-02-25 11:32:28 +0100 |
|---|---|---|
| committer | Peter Kjellerstedt <pkj@axis.com> | 2009-02-25 12:52:37 +0100 |
| commit | 6e5e9edabfc34f0486f7befcae9d5860fe76427b (patch) | |
| tree | 0e6881e6381aaaab4bc0654d9d78854af5dfe212 | |
| parent | ba052466d86c71a7a54055fa4989fe6c09bbe6a6 (diff) | |
udpsrc: Unify the use of union gst_sockaddr.
| -rw-r--r-- | gst/udp/gstudpsrc.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c index 690bc068..586f7c57 100644 --- a/gst/udp/gstudpsrc.c +++ b/gst/udp/gstudpsrc.c @@ -393,12 +393,12 @@ gst_udpsrc_create (GstPushSrc * psrc, GstBuffer ** buf) GstNetBuffer *outbuf; union gst_sockaddr { - struct sockaddr_storage sa_stor; struct sockaddr sa; struct sockaddr_in sa_in; struct sockaddr_in6 sa_in6; + struct sockaddr_storage sa_stor; } sa; - socklen_t len; + socklen_t slen; guint8 *pktdata; gint pktsize; #ifdef G_OS_UNIX @@ -481,13 +481,12 @@ no_select: pktsize = readsize; while (TRUE) { - len = sizeof (struct sockaddr); + slen = sizeof (struct sockaddr); #ifdef G_OS_WIN32 - ret = recvfrom (udpsrc->sock.fd, (char *) pktdata, pktsize, - 0, &sa.sa, &len); + ret = recvfrom (udpsrc->sock.fd, (char *) pktdata, pktsize, 0, &sa.sa, + &slen); #else - ret = recvfrom (udpsrc->sock.fd, pktdata, pktsize, - 0, &sa.sa, &len); + ret = recvfrom (udpsrc->sock.fd, pktdata, pktsize, 0, &sa.sa, &slen); #endif if (G_UNLIKELY (ret < 0)) { #ifdef G_OS_WIN32 @@ -524,7 +523,7 @@ no_select: GST_BUFFER_DATA (outbuf) = pktdata; GST_BUFFER_SIZE (outbuf) = ret; - switch (sa.sa_stor.ss_family) { + switch (sa.sa.sa_family) { case AF_INET: { gst_netaddress_set_ip4_address (&outbuf->from, sa.sa_in.sin_addr.s_addr, |