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 6AC0C40C18 for ; Sat, 5 Feb 2022 12:32:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D54068B36F; Sat, 5 Feb 2022 14:32:01 +0200 (EET) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E550868B225 for ; Sat, 5 Feb 2022 14:31:54 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id x11so7442308plg.6 for ; Sat, 05 Feb 2022 04:31:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Dmn8SaqzIQl5gygXtIn12FKZvBUvQ8bAzibRawfjCuE=; b=TLrYHvAAHjjDvjb9wB5hs3X65wDG71p/MUdT4qtxlCzdjpl3HQp5ZssBMuJCrvZJ5m wCjG2IGbbDH8bt9iVLn2olPAOYauiiNsldFqKbvBQjJ3hAMBcu2cyMN/2YdwonHgjQHg fHUR/gfw9ou6ZdTU6+MiP873c9NWJVUCZ6h+LbBFG1zcM2yn1Ni2CGP+5DDehGceBvE+ hXiYvVBBr0akpgAeNmNkF4NiE6RnpWyfvtGYU26UQyrmg2mIVzr5GseyvbOq/BFet8vB VtIUrNeGQGGxIfkbuWvFXBLVi4Itn0oI4T0vW+z80g42kH8VifMN1K7RH4VLPmEKi0PB GSHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Dmn8SaqzIQl5gygXtIn12FKZvBUvQ8bAzibRawfjCuE=; b=fxR9uNzEHd8t0pmruo3XeoAiMMzCuSAwGs/nydgqiqSSKLXOCGMwI7jGRhJc4SJegX TIsPlw2UZrEK1vcNRm8uWRBeh/1TmC4y0HtPs6ZaoGUIIhzdjIAwyf65Uth3nqEZHVFR /u+AW1fTNPwCISmBQ3MfUZW83lP8FbC7SSqllFMF7GHCxtvRsRmBOXpL2sgc79dA+LOo 9seki04UufE6ZjtoQeLASdd0fVlQOaOJeK09uzpA5ynU149yUNlLi05GseXdvpR8rsW9 2I6yZWhDDDoTIawQvRBr+gbOnap6ZMjlrMmWz0SmJcQCJEmmCWpGR0vxG4OAS15HczkO C/aA== X-Gm-Message-State: AOAM531aGWkYZr5zmArztLHiOo5x8Wl0ugm/R3/wG5Swy6lc9Vccd48n mWnoJTxDbobkjrERWx0wlv0MZAka6Cc= X-Google-Smtp-Source: ABdhPJwJogJJ0MIq7K+M+O+4Du8v47vhOjrkiil5FzuH1ZOr1IkQ+XjDefIt+iYwmxeWW9MSCAF9QQ== X-Received: by 2002:a17:90b:4f85:: with SMTP id qe5mr8534334pjb.142.1644064312842; Sat, 05 Feb 2022 04:31:52 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id y27sm3986736pga.22.2022.02.05.04.31.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Feb 2022 04:31:52 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Feb 2022 20:31:46 +0800 Message-Id: <1644064308-21729-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1643260580-25792-1-git-send-email-lance.lmwang@gmail.com> References: <1643260580-25792-1-git-send-email-lance.lmwang@gmail.com> Subject: [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 Cc: Limin Wang MIME-Version: 1.0 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: 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 _______________________________________________ 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".