ffmpeg | branch: master | Limin Wang <lance.lmw...@gmail.com> | Sat Feb 5 20:13:20 2022 +0800| [c0817ee92e34887b5fd85e15f836b40e99d36aa6] | committer: Limin Wang
avformat/udp: use one setsockopt for ipv4/ipv6 Reviewed-by: Marton Balint <c...@passwd.hu> Signed-off-by: Limin Wang <lance.lmw...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0817ee92e34887b5fd85e15f836b40e99d36aa6 --- libavformat/udp.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 401d9b6275..a2c01b3ec9 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -162,22 +162,30 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, struct sockaddr *addr, void *logctx) { + int protocol, cmd; + + switch (addr->sa_family) { #ifdef IP_MULTICAST_TTL - if (addr->sa_family == AF_INET) { - if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &mcastTTL, sizeof(mcastTTL)) < 0) { - ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IP_MULTICAST_TTL)"); - return ff_neterrno(); - } - } + case AF_INET: + protocol = IPPROTO_IP; + cmd = IP_MULTICAST_TTL; + break; #endif #if defined(IPPROTO_IPV6) && defined(IPV6_MULTICAST_HOPS) - if (addr->sa_family == AF_INET6) { - if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &mcastTTL, sizeof(mcastTTL)) < 0) { - ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IPV6_MULTICAST_HOPS)"); - return ff_neterrno(); - } - } + case AF_INET6: + protocol = IPPROTO_IPV6; + cmd = IPV6_MULTICAST_HOPS; + break; #endif + default: + return 0; + } + + if (setsockopt(sockfd, protocol, cmd, &mcastTTL, sizeof(mcastTTL)) < 0) { + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IPV4/IPV6 MULTICAST TTL)"); + return ff_neterrno(); + } + return 0; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
