From patchwork Sat Feb 5 12:31:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 34135 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp4245691iov; Sat, 5 Feb 2022 04:32:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJxaUu/gxhb6CLMWtB01gGG3jqw2sAOjWC+RN3Y3+Tbnu/oQ57cvE2aOzDDnIDJqPxYBRw82 X-Received: by 2002:a17:907:6d02:: with SMTP id sa2mr3003352ejc.198.1644064325951; Sat, 05 Feb 2022 04:32:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644064325; cv=none; d=google.com; s=arc-20160816; b=h3+nf9jMrFSuWvxEMz7UtY1cmq9YkoBBT1dTXDpvKizblNUCVnrSLptHgDnhAw1tFd TnwjPxtHDZLH2cbUZYpOg+z60GGrvSkx5TgxNEJFFSHxX/oN6NVOcVBDj8nsGkLMMoWh Pf/Puiqm/2iCDUcRZySUYlbs8CWWVrU0cv5e294i7i+51/6M4nxvO/93BlkdhtQs2AOQ BF4QIDtJlhkvRRfSqA7PneJetrCM0zW27gc1kscRCbze6Qa/ZFEuohwdJge71vzYRYQj CM1YjGZ2wbHebSiMtDkQHpC0KAgmz8ByaXTThWr/xyJi/jnGfFyyugtsGT51w2Cisx4g 3oYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=tCF4NLOb/SVaFqSO1VIcJMFXk6mmJSnZzPFgBzcy2XE=; b=zJNxUfNIpvLsmSME/dhbA8Txc6lp2xyJgtWZ1wUgmF7oBqA/kfvSLGYB2IPcs27HRe H+4s9q3NwdmfjjDBGLnt9wkRiuG+WegJZdg0tAdQv+MDcestGPX912Iax8wxtzWgGVn/ a5d2KvNYGAm9sfb9ZMfKn8wl+OZ+xUHeQR+EzTb06MELgFXEP6lHMlwQ+9aA5C8Mcn24 QWkjJ+5yInBWdRajpyNQ2yd1605DhM2tTVjrFDuBrVb51yms47Dp500trc7+2vCqU9i+ mS/81L1VaBgn893h9qmNub5SVs36SITvb4zeI9lqjzhmYiy2tEK9Ijo6BquB6XFEn9Nx b7ZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TLrYHvAA; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dz16si3782463edb.102.2022.02.05.04.32.05; Sat, 05 Feb 2022 04:32:05 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TLrYHvAA; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BA7FA68B302; Sat, 5 Feb 2022 14:32:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7/ZQK8oPqXkL 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; }