diff options
| author | Julien Moutte <julien@moutte.net> | 2008-05-22 11:19:03 +0000 |
|---|---|---|
| committer | Julien Moutte <julien@moutte.net> | 2008-05-22 11:19:03 +0000 |
| commit | a1a2879083b10e0e8c74d8a65e7b9a76f568526c (patch) | |
| tree | 95fd8b7fb7c22aaf01472cd1339ea4a9fe3741dc /gst/udp | |
| parent | 707191104d0c1377ac29061febe1fd1e9d1f9db9 (diff) | |
gst/smpte/gstsmptealpha.c: Fix debug statement arguments.
Original commit message from CVS:
2008-05-22 Julien Moutte <julien@fluendo.com>
* gst/smpte/gstsmptealpha.c: (gst_smpte_alpha_setcaps): Fix
debug statement arguments.
* gst/udp/gstmultiudpsink.c: (gst_multiudpsink_setup_qos_dscp):
* gst/udp/gstudpnetutils.c: (gst_udp_join_group),
(gst_udp_leave_group): Fix IP and IPV6 options to make it work
on more platforms.
Diffstat (limited to 'gst/udp')
| -rw-r--r-- | gst/udp/gstmultiudpsink.c | 5 | ||||
| -rw-r--r-- | gst/udp/gstudpnetutils.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c index 449bf714..c1c86df4 100644 --- a/gst/udp/gstmultiudpsink.c +++ b/gst/udp/gstmultiudpsink.c @@ -496,11 +496,12 @@ gst_multiudpsink_setup_qos_dscp (GstMultiUDPSink * sink) /* Extract and shift 6 bits of DSFIELD */ tos = (sink->qos_dscp & 0x3f) << 2; - if (setsockopt (sink->sock, SOL_IP, IP_TOS, &tos, sizeof (tos)) < 0) { + if (setsockopt (sink->sock, IPPROTO_IP, IP_TOS, &tos, sizeof (tos)) < 0) { GST_ERROR_OBJECT (sink, "could not set TOS: %s", g_strerror (errno)); } #ifdef IPV6_TCLASS - if (setsockopt (sink->sock, SOL_IPV6, IPV6_TCLASS, &tos, sizeof (tos)) < 0) { + if (setsockopt (sink->sock, IPPROTO_IPV6, IPV6_TCLASS, &tos, + sizeof (tos)) < 0) { GST_ERROR_OBJECT (sink, "could not set TCLASS: %s", g_strerror (errno)); } #endif diff --git a/gst/udp/gstudpnetutils.c b/gst/udp/gstudpnetutils.c index ff5e9387..5464ddac 100644 --- a/gst/udp/gstudpnetutils.c +++ b/gst/udp/gstudpnetutils.c @@ -164,7 +164,7 @@ gst_udp_join_group (int sockfd, struct sockaddr_storage *addr) mreq6.ipv6mr_interface = 0; if ((ret = - setsockopt (sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, + setsockopt (sockfd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (const void *) &mreq6, sizeof (mreq6))) < 0) return ret; @@ -207,7 +207,7 @@ gst_udp_leave_group (int sockfd, struct sockaddr_storage *addr) mreq6.ipv6mr_interface = 0; if ((ret = - setsockopt (sockfd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, + setsockopt (sockfd, IPPROTO_IPV6, IPV6_LEAVE_GROUP, (const void *) &mreq6, sizeof (mreq6))) < 0) return ret; } |