On Sat, Feb 05, 2022 at 10:58:08AM +0100, Marton Balint wrote:
>
>
> On Sat, 5 Feb 2022, [email protected] wrote:
>
> > From: Limin Wang <[email protected]>
> >
> > Signed-off-by: Limin Wang <[email protected]>
> > ---
> > libavformat/udp.c | 31 ++++++++++++++++++++-----------
> > 1 file changed, 20 insertions(+), 11 deletions(-)
> >
> > diff --git a/libavformat/udp.c b/libavformat/udp.c
> > index 83c042d..3dc79eb 100644
> > --- a/libavformat/udp.c
> > +++ b/libavformat/udp.c
> > @@ -162,22 +162,31 @@ 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)");
> > + case AF_INET6:
> > + protocol = IPPROTO_IPV6;
> > + cmd = IPV6_MULTICAST_HOPS;
> > + break;
> > +#endif
> > + default:
> > + errno = EAFNOSUPPORT;
>
> This is not portable, ff_neterrno is different for winsock. Maybe you should
> simply remove the default case, to make it work like the old code, and not
> mix behaviour changes with factorization.
OK, will remove the default case to same with old code.
>
> > return ff_neterrno();
> > - }
> > }
> > -#endif
> > +
> > + if (setsockopt(sockfd, protocol, cmd, &mcastTTL, sizeof(mcastTTL)) <
> > 0) {
> > + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt");
>
> "setsockopt(IPV4/IPV6 MULTICAST TTL)", so we know that the issue was with
> TTL setting?
Sure, it looks better. will update the patch.
>
> Thanks,
> Marton
> _______________________________________________
> ffmpeg-devel mailing list
> [email protected]
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> [email protected] with subject "unsubscribe".
--
Thanks,
Limin Wang
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
