From patchwork Sat Feb 5 05:28:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 34130 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp4014876iov; Fri, 4 Feb 2022 21:30:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJxkl2RNIHKBOWpMaiOaEapRHho/VKFXLktEdvlPl3yt7wkem2VwTEv44aBlGT1DUiMKKQzp X-Received: by 2002:a17:907:2da5:: with SMTP id gt37mr1883943ejc.529.1644039004603; Fri, 04 Feb 2022 21:30:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644039004; cv=none; d=google.com; s=arc-20160816; b=pFVkr3KKKvcW7/imSMI9K42wPaynzvcAwcCW3ww5SdgIRPTK58sS2EDE1wyxRJBdQl YZ49KN9NYZ3QlKVhQ1rCi+aZKRN/efG0NWlI/h8a7YF+NmElIx+nUJ6NcUYZvmJ4hk2W ov0Nx7Ya3+EkYtg6EaKhmhUA/TsY5vlE1WheC3opKofPcXqaJ9eM7jLhIcFyuoHKYozV IivXWEOzygYU9IBWGez6yCrCmFdRvhE6NwNTPKicIwfgzIdBEsOpC9SBM9tng7eSZWNw Xrnwy0QibpdbZIOmg67fuMmkRiS5NWgP85i8gng8R3VmetHzsttOYziZbCH/d2blE2Hy HZjA== 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=A3fXbs5EARDIQRcLjtsq8ENbisaPQGI8e0PfqZ3kW04=; b=cFVizHRX4y8wsVvh2pDMiUMeHoYErLOsON7YZq7e5TrozKWrogzfGuJ4AwfprqUIO/ EwX5JYj1KENy9Odd8x4+f1Y9RLiRe0jc7SjH0FplTA5sstmsyAId1888g50BlzHBcwXY cFK4j2oz4nUJFMb6KMiBhvLgWKj+euds/btH+A9RdbvOq1AnRS/0QNOmcnW4C5TfdvSJ GE7XPJVMXXKuForfnteCu4Ce0oc1MqaSruZnmxxATCwx2FDDlDazop2eGkuZGu7blvEs e+Y84frN1/ilEVz9VFxjBSl6REMfFEqxyLjxaFO4wjuY9pO/FlMKEs8F9zJ2H2HLx607 spJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=jtiAAveE; 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 b14si3038759edz.63.2022.02.04.21.30.03; Fri, 04 Feb 2022 21:30:04 -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=jtiAAveE; 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 B244068B31B; Sat, 5 Feb 2022 07:29:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA2F268B037 for ; Sat, 5 Feb 2022 07:29:53 +0200 (EET) Received: by mail-pg1-f178.google.com with SMTP id j10so6758967pgc.6 for ; Fri, 04 Feb 2022 21:29:53 -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=fyYeTqhIrBKzdCkOwNb6gRo4CrotTa9sdaTxTaV4aNE=; b=jtiAAveEC2h4/MfplrXokjj9yy3BJ2hU2jPKjVp1Aqz28M/NnGL8H9pwK2vnnIKZ0q NUSTzyz6oGEMfDsrXMOoluoGEPpMvqfrmQzpFsbGKFYa56pUhRokAcCbpBvoKzeymfyl +v+xPsKOZQdkmTXR8pqaBQ7ZChnLsKDuOAEUtOcFUuJb7AGHkeLwBLxkLraPDRP8EKbt Sw/yk6Fvdy1FxkROUmLYyiRPKzGIj8qlWj5clWHL1tq6WTBCdTxdJJKmwGgWTuXP2iiU tsNjfe6RxBSNDTVDQvgvNddVgCIXk0qiuWHZ4qdIUCt+uvtNtFj5BHEDV1KpJhO2ukK4 6AJQ== 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=fyYeTqhIrBKzdCkOwNb6gRo4CrotTa9sdaTxTaV4aNE=; b=LgsSK9tqxA3rG5/vydgSvkDjmJ17EmR9+spQsGX2KdalvWrEM9hkAkYxBFAVkvZOPl E6WNNQQGCLGXQsE65ljq5JGdV4dEdiOrtjYhk7G4MDnXOUcV8XrH+qKplEZGmTe+lWml rZmHiLf9fJZMo+Fq3UebNYGKtikMdb5/n6uLfRpoztTzV2CzP983e6j8CsSADp8HtEPJ O3CS4iSzJFnNOq2peCmAxJP6Clksby8H/FPPlahzqzygDoRlcuDcmQyfqYkA3ZBU2Cw4 2U90nri/41+lju4ifbZTGiOkJ7Z7OO0AG2JwpXpToJForyZcTnJ3ujSyB+EKQjUN+y0I THaw== X-Gm-Message-State: AOAM531a9aNdnwosA6YIIGO0Ae6YGz59PynSX8FndNlR8Y81DH2IAO/4 twA2fOAqUUyoU309jNxQ6FAzsTtQjJM= X-Received: by 2002:a63:f942:: with SMTP id q2mr1868338pgk.573.1644038991603; Fri, 04 Feb 2022 21:29:51 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id s14sm4523433pfk.174.2022.02.04.21.29.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Feb 2022 21:29:51 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Feb 2022 13:28:17 +0800 Message-Id: <1644038899-15433-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 v2 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: IP7fbtr6CN15 From: Limin Wang Signed-off-by: Limin Wang --- 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; return ff_neterrno(); - } } -#endif + + if (setsockopt(sockfd, protocol, cmd, &mcastTTL, sizeof(mcastTTL)) < 0) { + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt"); + return ff_neterrno(); + } + return 0; } From patchwork Sat Feb 5 05:28:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 34131 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp4014954iov; Fri, 4 Feb 2022 21:30:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZ8o1e9Nb77RgUrb9hpwH80yG/T4IAQ0ns1MgwM+Vytuz1KPE2yrzYSqRAZ5aNhs9HiYS4 X-Received: by 2002:aa7:d416:: with SMTP id z22mr1772360edq.454.1644039014384; Fri, 04 Feb 2022 21:30:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644039014; cv=none; d=google.com; s=arc-20160816; b=tYETYA7Fzi4Kt6HfrE3B1t9ooAGVqCpQx199SPLVO23ach08ZaTF7RmZTRGh4oGYGe VZdlHBPi0n3QggQ+K85tZxdaAvM3YUTbrfvFUwmiREsog46j0ifh6Q3PSeYvPHwexZYe m+F5odVVe9ZmuNpidXAz0z0EdWNSdou+CTtMhO6fogXiHSGSza7aZ5gi+6f9peM4Xn+r efOmpfEtDHq8cEHoctxQ/6EbUIVlFNqRarTZe0Pqx7k9Cj2ufa1fT/YMHQxDRDHuz73Y KnNQ1gy2yTUEVTNAclmZFpJz2xQ0NB7lb1F3NoM4h8oMG/c78+a241X6eY/wEMcMrUM0 +qeg== 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=ern3yc51dlnxzmMxbTIYeWzCeYuVrCys5ZmPCPmr7J4=; b=f+kBZ3Nh6Hx91ZQEzqDUv/8Enf5gBClmn8diD3YgNj1ZsTsuwzUDTzB7mra7Y0uG6C oqV7nDL+IbHEr0PPFoc63GnFWGD67ZEWaV6OsV14mEcgXRbR6zQYB2kU9ZKaJI6gEbob NRRZIgLq/7qUF6ZYGLdHksk9x69Sx7UIcXPdvUS+i77uvh+e7uFJ3aJO4JvO8eT5fNxq MYOc4R8zpV5Al20HuLUfmtTLERr+xNUG/v4LqqyTDH4KYMQ6dd83NVH1VC863ORWznMa 8laDuNgbFvRivd/O9yjEdnbOOQlpRqFCWxeBYNDrW+NHBMvmtKsfD3X4d82N7O/c3O5G egHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VCuZ++Va; 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 qk41si2934522ejc.103.2022.02.04.21.30.13; Fri, 04 Feb 2022 21:30:14 -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=VCuZ++Va; 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 B102068B323; Sat, 5 Feb 2022 07:30:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AEFB268B319 for ; Sat, 5 Feb 2022 07:29:54 +0200 (EET) Received: by mail-pf1-f181.google.com with SMTP id a8so6882384pfa.6 for ; Fri, 04 Feb 2022 21:29: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=Jbg/YgUXn6Q51GtgDtqO1IfqWOHhYt/po/dgXLU6MUc=; b=VCuZ++Va/2JmwvAj0DlKUSrF7niIfUl/Xk+LRZKPPpbUeuEl/YoqjfmZH3pb8/CA1O G6PCgi1F0NW9hY42EqsIvZZ1AqfOEh6iIa2boHXhT/zKbNHXHck/JkCgRZqYOpBBluDE cgtOFdy2BLAYZhrtRTvFyuoOlXq0o1FapYEMDXlqevyKBgX2itda9HbgLot3mdBEg00O 1NMdJuZGPj5zwpNxVPrqcMZw+cbCSj8HT5loUlpUQ7+gS2Y18c/UUKkSpQE8qlm/C/Wb KzWpC7VITW8llpXc4GWOtey1Qk3Bmg66LhBwhnkRxBNTNnojjsMm3bHs6OSIlXCUhjOe FStQ== 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=Jbg/YgUXn6Q51GtgDtqO1IfqWOHhYt/po/dgXLU6MUc=; b=QeBoMCF1jj8UzakQUV0P3KD6wWoYc7IJsXcrmXvfUOpDUEc6bx3A+qgKmsOvixOr8H 8w203dmeSIwyakyevTkjr9Cp549RW/BSmLH1WO38MSP1uirY401ZOnvWpCAIOuGKGByX 3xkX+hBYPUkpj/PwMU9xNu0Fjh1aMyRhs74ElHPwUv7IP1w6wbL04vr3hHZ5Zwc1DlaA 7ROk8nd/N/HnraIaOUwcJwgs5Qb5HBKCwM2ZVJjP3fWt+hTmUGzhMAyfB+HIqG/1cdkG QNkwEo+viLYBxwUt3/Se3b0wJuExd5aMIkxps2aWeKFanLuv0pLkwHCDWS60N2bbUXE8 K0ug== X-Gm-Message-State: AOAM533hPOP98z403CujXDXCdxOib5iHHisE6kwm7/+IcZGLmVYCSQSR k/RHJ6xw7e8bDfd9ZyeNiPvMvVPMq94= X-Received: by 2002:a63:10:: with SMTP id 16mr1869112pga.87.1644038992812; Fri, 04 Feb 2022 21:29:52 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id s14sm4523433pfk.174.2022.02.04.21.29.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Feb 2022 21:29:52 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Feb 2022 13:28:18 +0800 Message-Id: <1644038899-15433-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1644038899-15433-1-git-send-email-lance.lmwang@gmail.com> References: <1643260580-25792-1-git-send-email-lance.lmwang@gmail.com> <1644038899-15433-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/3] avformat/udp: Fix IP_MULTICAST_TTL for BSD compatibility 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: y3JpmzZnQ9I9 From: Limin Wang Suggested by zhilizhao, vlc project has solved the compatibility by the same way, so I borrowed the comments from vlc project. Fix #ticket9449 Signed-off-by: Limin Wang --- libavformat/udp.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 3dc79eb..34488d6 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -164,6 +164,10 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, { 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 as a fallback to be safe */ switch (addr->sa_family) { #ifdef IP_MULTICAST_TTL case AF_INET: @@ -183,8 +187,15 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, } if (setsockopt(sockfd, protocol, cmd, &mcastTTL, sizeof(mcastTTL)) < 0) { - ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt"); - return ff_neterrno(); + /* BSD compatibility */ + unsigned char ttl; + + ff_log_net_error(logctx, AV_LOG_DEBUG, "setsockopt"); + ttl = (unsigned char)(( mcastTTL > 255 ) ? 255 : mcastTTL); + if (setsockopt(sockfd, protocol, cmd, &ttl, sizeof(ttl)) < 0) { + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt"); + return ff_neterrno(); + } } return 0; From patchwork Sat Feb 5 05:28:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 34132 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp4015014iov; Fri, 4 Feb 2022 21:30:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxOF1uTGqLRfEz1ve01R76ie0u0Jm0I8fpzrXwdldrAycKn3/SdHWEff4e+WRmHl3LsPkCQ X-Received: by 2002:a17:907:60cb:: with SMTP id hv11mr1883655ejc.122.1644039022281; Fri, 04 Feb 2022 21:30:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644039022; cv=none; d=google.com; s=arc-20160816; b=i2reiLiM67pOBe9lnkMgZaxR5W/veepov5++N7qUrmDpxsx5gQaQptLroi2jjI1tug 6EorrmRHEQLdhejkBnarxWTj3AYE45KIL4yDHH/5o23/1c3w2kki3osrp66duoOR7QjZ Y8ERSjxJiMeOtNEOMnK66fvL1THNL1Nl9tFga0RimyTEyEMxdAgwkX7FrrhqaYTTRVrr zw/YlMZq2jp3QAknmmi11FU3HHieSUDcjtP3cfdQbBIIO0pY9kVzBE8u29NTL6z4adOb oKD+ewlyvd476r0lYVcV0V8u0LKe1w2U0absUDL10q9TyI83nFDq1kYLTgisOSX4jJ75 ndBQ== 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=VtJFp6WJI0cxuXk28RPxsGjrVNDCe4yc2vo1bKI7zgE=; b=t5UGB7hFGK5ODyyu0vdw+oK/9ZC55YR7YwFm7zTn8NozeUQy2pUtCS5NZfBX1BwuQG 6z30YiqtKeth4Z+R7ZwYyRztKVQwoi881xB+rx4A1a8MxFUydHRnVmEDhZd/mc7qaUGQ Dl1N97CCB2cijWhsiydcdOBw7V9M+icpptGoe/BTc2ElXz9xZNt3Ywn6DEzhpF/QVMiF tSDiAuxnPrhl+oEZiRSBet5aMSXF6R5gDPB1UCBXIqBVKERibhumJCUKbsBd78dH+DVM Upbg8m36ruCLOgdoHEyWFZtReawnr2/eqd+qmEUgYEMi2s+iyECduq0TQ0D57UkLZTj7 9HYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=g1CWb8et; 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 22si2620339eja.767.2022.02.04.21.30.21; Fri, 04 Feb 2022 21:30:22 -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=g1CWb8et; 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 C747368B32B; Sat, 5 Feb 2022 07:30:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0FF868B322 for ; Sat, 5 Feb 2022 07:29:55 +0200 (EET) Received: by mail-pf1-f171.google.com with SMTP id i17so6854050pfq.13 for ; Fri, 04 Feb 2022 21:29:55 -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=3IF2ixBDulNRVDhM6xMme8hs0LVQUlMr6TOpdIhhaLo=; b=g1CWb8et+aQ/5uA7REpBTMyJPM+j6aEZpMNw7JHFlYp+ZJmzkE0Pb2eFVN530KVxSE 7mE9M5VyLj7/HmpR8YzYNTtWw6vSg+vUpCK/ET2Y5q+gBeZ4oK0Utu5mwVd9G+c1zw2T jRsT9JGIwPsualAcXEBDt1iN3nMKCJOBqxnvAxu/qbw6LWW+vDehJJ6ADee5ZEybqEjs 5V2qQy0M1zEygNEc+ri9W6XIZHj20SDVsOMIiXhVtzvowu9iZrFUDgzLT0V7Qc/0GWZc 8nCxHSB/D7B00EL/ulHsFJm+xQwF5qXTxA/Fp2w7nS9QZ3vEnD4Fw2d2QVp8XaMIoiRJ f/Tw== 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=3IF2ixBDulNRVDhM6xMme8hs0LVQUlMr6TOpdIhhaLo=; b=oHhJ4v+zelCxS8Rkm2OSzlsZ4ApIxBhjgWhFTp0jAGJECWjneVe+TMc1LGdawILEBS T+b5EzNz6qeJ0QB9O8AgAODJy0eJFqSMlmPbRrXa4IfujVZwTT5paQ4H7JbmtDkl3uvG NCDisdZTYxh+da8lzBsfFnyAXrbPBYHJ4oW4QIHycm6PMhkSa4W0RyykyRQ/qFWBGZkc BcTAX3LD80znzywm8g3ZKzpcsYoRvtE743F9vfBxWpKDTLMb2WC261cQo+aomut3iEis G2ZTbvhWW6taTJMyc3OhQrlqAsLeGD+XaTEUWDtQzNRQsIB7u4MZrTCpboxmAjZUY2vc 4uwQ== X-Gm-Message-State: AOAM5318SOspMBQ3ZUZLxpH1agYwYErofNCmTLR0AYTUfWPNqw2ZIwr2 HhrBuB4n8ULMOw/SjygKhGCezJGJ0b0= X-Received: by 2002:a63:5460:: with SMTP id e32mr1888831pgm.330.1644038993946; Fri, 04 Feb 2022 21:29:53 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id s14sm4523433pfk.174.2022.02.04.21.29.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Feb 2022 21:29:53 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Feb 2022 13:28:19 +0800 Message-Id: <1644038899-15433-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1644038899-15433-1-git-send-email-lance.lmwang@gmail.com> References: <1643260580-25792-1-git-send-email-lance.lmwang@gmail.com> <1644038899-15433-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/3] avformat/udp: remove IPPROTO_IPV6 macro 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: 3fHpf980Zbwj From: Limin Wang Signed-off-by: Limin Wang --- libavformat/udp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 34488d6..0b078d4 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -175,7 +175,7 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, cmd = IP_MULTICAST_TTL; break; #endif -#if defined(IPPROTO_IPV6) && defined(IPV6_MULTICAST_HOPS) +#ifdef IPV6_MULTICAST_HOPS case AF_INET6: protocol = IPPROTO_IPV6; cmd = IPV6_MULTICAST_HOPS;