From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id CC9E240F15 for ; Thu, 10 Feb 2022 23:56:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D99D968B1D0; Fri, 11 Feb 2022 01:56:14 +0200 (EET) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B0C5E68AEC3 for ; Fri, 11 Feb 2022 01:56:08 +0200 (EET) Received: by mail-pf1-f169.google.com with SMTP id i21so11667266pfd.13 for ; Thu, 10 Feb 2022 15:56:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=r1UbMXOhfovN+YZtKrZ+IOR2J97XugmcEQXetbq12jI=; b=k2W0u70V3KryVID3rRKMiQy5aEpanjQtEFRrcD/PsW4dpccaIYkkXoidj98xghdTgm C+63GR7sDE5DmzliNs8W/tuvDukLi9RqC84HMV1H8sS7TQ6VhP/6eZ8vfZ07dAUw6rVT DRoTOGrpo+z3Sl7AA3V2NaUNUFJ+gGDg2Ol8nG4LkO5AmxFzHM6morHxZgvtog5A59rG qJ11OJLVh50AGN1fxP/BpHM6wMhXYy5QxuCY3rvcY2Pv0jz6s1xI8kPIFcnt1HlV4NeJ RIRtoeuZgR0kMYKNW+FdCkWuReKpoip8feP98b2sjPFk7G1L7zShapPZekwJOR3K9TLX 1fhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to; bh=r1UbMXOhfovN+YZtKrZ+IOR2J97XugmcEQXetbq12jI=; b=XvF8ecX6dmBLTCxg85F9wnLZoKhGE20MS23TdkmN0m+OS/qgvQPTnDybXedi2Ky67Y NMa2HJFyV1VwmhxLTRU7ZTz6IX6+FL75lgrhD1od5Z3ZfEBFK3rrLPnO0pK5/5osOU/t UEYk1NdqTyST6kq8PJQrI6EP5zkxMTBdZHBvqKVs1rC61eTUjsm1piKjZyA2sjALg/io YA73DkVhRTi/hsnrHaP3ZWXooJAZNmAdMZUuaaoDCVBIiI3yZiSF2wUThT3t69XaDotY adhDP/mMMwuaky6yvr8ue2eaZtSTQL8clHMv2Z3BTcSeCxsEwHakbHL4eh16MzUeON/U NLhg== X-Gm-Message-State: AOAM532gzBTvXsukRQh7+CoJagR7PmFnCYX0ftD3kXJIY3ZuqgDS/Qgm se0fxQwnaEhQAMcKBRnUXaalKwgB+oQ= X-Google-Smtp-Source: ABdhPJzT+chDsGHCoBgrd8yMzVbt94zKalL3BVINCfX1VxFBSIUKq3qRI9fQYAy+zXe+fl5sMAMwSg== X-Received: by 2002:a63:f156:: with SMTP id o22mr7869444pgk.387.1644537366234; Thu, 10 Feb 2022 15:56:06 -0800 (PST) Received: from gmail.com ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id u17sm15773815pfi.163.2022.02.10.15.56.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Feb 2022 15:56:05 -0800 (PST) Date: Fri, 11 Feb 2022 07:56:02 +0800 From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Message-ID: <20220210235602.GA11704@gmail.com> Mail-Followup-To: ffmpeg-devel@ffmpeg.org References: <1643260580-25792-1-git-send-email-lance.lmwang@gmail.com> <1644064308-21729-1-git-send-email-lance.lmwang@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1644064308-21729-1-git-send-email-lance.lmwang@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH v3 1/3] avformat/udp: use one setsockopt for ipv4/ipv6 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Sat, Feb 05, 2022 at 08:31:46PM +0800, lance.lmwang@gmail.com wrote: > From: Limin Wang > > Signed-off-by: Limin Wang > --- > libavformat/udp.c | 32 ++++++++++++++++++++------------ > 1 file changed, 20 insertions(+), 12 deletions(-) > > diff --git a/libavformat/udp.c b/libavformat/udp.c > index 83c042d..8178d0e 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; > } > > -- > 1.8.3.1 > will apply tomorrow with one pending ttl range check patch if no further comments. -- Thanks, Limin Wang _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".