har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/udp: Fix IP_MULTICAST_TTL for BSD compatibility

Browse Source 
Suggested by zhilizhao, vlc project has solved the compatibility by
the same way, so I borrowed the comments from vlc project.

Fixes ticket #9449

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
This commit is contained in:
Limin Wang 2022-02-07 08:08:18 +08:00
parent c0817ee92e
commit 268d00bb87
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/udp.c
View File

@ -164,6 +164,10 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL,
{ {
int protocol, cmd; int protocol, cmd;
/* There is some confusion in the world whether IP_MULTICAST_TTL
* takes a byte or an int as an argument.
* BSD seems to indicate byte so we are going with that and use
* int and fall back to byte to be safe */
switch (addr->sa_family) { switch (addr->sa_family) {
#ifdef IP_MULTICAST_TTL #ifdef IP_MULTICAST_TTL
case AF_INET: case AF_INET:
@ -182,8 +186,14 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL,
} }
if (setsockopt(sockfd, protocol, cmd, &mcastTTL, sizeof(mcastTTL)) < 0) { if (setsockopt(sockfd, protocol, cmd, &mcastTTL, sizeof(mcastTTL)) < 0) {
ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IPV4/IPV6 MULTICAST TTL)"); /* BSD compatibility */
return ff_neterrno(); unsigned char ttl = (unsigned char) mcastTTL;
ff_log_net_error(logctx, AV_LOG_DEBUG, "setsockopt(IPV4/IPV6 MULTICAST TTL)");
if (setsockopt(sockfd, protocol, cmd, &ttl, sizeof(ttl)) < 0) {
ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IPV4/IPV6 MULTICAST TTL)");
return ff_neterrno();
}
} }
return 0; return 0;