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; } From patchwork Sat Feb 5 12:31:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 34136 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp4245771iov; Sat, 5 Feb 2022 04:32:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxyDPZgYzTjOyilXdaM1459WwDK9kgssoMZ7SAZOMQ5DWsbb4YXW3EpX0CwzAD7T2dNCLHU X-Received: by 2002:a50:baa8:: with SMTP id x37mr4211122ede.450.1644064334464; Sat, 05 Feb 2022 04:32:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644064334; cv=none; d=google.com; s=arc-20160816; b=gueS7aDQcQfS1Q01ZF6rekD3e87bI3sLWW4sU8DTdAIcEiz/Ixo0934PG96d+9ggFH nTkEK4ENasS6RgGKhB56EAizOcT5ar3CUgtIVFzIMU9kNOY/kfuOFmqkZOeq1W65Qmpr /Bwk0g357FFG3tjZuF79Em8wt2Qzbn0mtOXApjzwihsop7k1AQcb4iUOKzC/qYh9L8rr vd1qZ8QS3ailVLx5OWYc3XsnaBYHYLgmp6luwlN6mGtPIX7966Cxuf8uwbM/OiMv6Mod J1wPKqZn8noi4m1vILpAoCIUPWcVRBfrvWpIKW9ETlgljdpr0bWVjhxsatvK3NNPPYiy 7N6Q== 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=0JCSOO1bMly8ezMrpj7Iiph3gleVyeETGx6KIyiyMmg=; b=MZi1keVH3nJZLgPO7nzW0cWME/0FCT6mDRnD57EeMGBh8AvkihUgfjnDTPuRfvO6/e 635zpsZgS7hPtF8UiWEpydr/OYr+iY4a7/bNSd9DNVIXBjoRLDDKvacRc2mOOUiqdKPL nYb3lg4oOWvQAPdi3XlNgsOnZs7PBp0Hh6wIYok29Y15VIn1TLGZ2hut8yrpJfCQU0lc yvII4PXW6W+fVH+WTVuCYdqMLnbl47YaUFDSaaS64/oNt3uWL/MVSBGAm6e/7ICNiJ/k Br/XYDfE9xkiwpQcWh4RQo3HnZR5OHb55rmGmYnebFPJKMlZsOnbl5E/3u1if/s6aiQb hl0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=d4p4PwrN; 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 x12si3674010edd.246.2022.02.05.04.32.14; Sat, 05 Feb 2022 04:32: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=d4p4PwrN; 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 C033668B379; Sat, 5 Feb 2022 14:32:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B550468B225 for ; Sat, 5 Feb 2022 14:31:55 +0200 (EET) Received: by mail-pj1-f43.google.com with SMTP id v13-20020a17090ac90d00b001b87bc106bdso1647892pjt.4 for ; Sat, 05 Feb 2022 04:31: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=L/3t8sgMzjOVSRsBT3/7gE8+AqQitUuTevkeMiEai7w=; b=d4p4PwrNlAvz78qmmlhJotXwGN2RNEicJwqzTCuxuIG1y4gH7TJiXn3YluC3PuibZZ /E8an6znqUvo385N9luNo5ov+wgyRxWNo8PvPa5qm/8wcBButCN9fFQzZCqy9s/IUfsX qvk7SfoJhg1T1J2483I4grfvmufd5OAMU4eRSOx6iBScC/OsnQ7hJO1Q2yGihrMzm2zH fIKUKzl9B4q/Av092k7PjyuC0eQwdZuCxkDPuaNpJ9MulCLqjXKoaBp7N8RSDXOJVpkm d7QkQzyreeA+w3JMX7FzrpMwlCwf3xwffdvEtD1wQvostoGLBcLBeiT88k4XZEgivoTZ +nMg== 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=L/3t8sgMzjOVSRsBT3/7gE8+AqQitUuTevkeMiEai7w=; b=glJqG8WbG6p82Gab6ZTodxg1tPHidgE2bc5JPo2hj3SirheGzguQ/u3Y8dOGpO0gTy /BR8wQksQgxFws1KMtdKscxGarfO8nC+ogTASM1iRawoiWZRnRJxvjp2IN+I4XNIGW3i iOAtKndTYuUYNRRrwnRRxyBEK4Reo8KbeI2XoQrRz8vm2r775lyfcxviCmXyh3Xyyd/8 GdNVsIIh7BNAcbWAQ5E2LP7I3KhjBW85DIhx8Jd+iGWAyTDzPXo/cvFw5ISkdFb8zmOp 7Sjwh53eDIwV1rEitigGC4ZPS6ahnHoso0wMk1fEKLwHmO5IjRm7v1eI6nZuNBAJyYH+ IlZw== X-Gm-Message-State: AOAM532Pq4bBZswugvcqK+ksNDRRdEJcnhzrJoD1gTrpG8K50d1GM65H 0ik6LhtwYpyn2pGHshFw9HPX6/8coLc= X-Received: by 2002:a17:902:7603:: with SMTP id k3mr8333444pll.160.1644064314042; Sat, 05 Feb 2022 04:31:54 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id y27sm3986736pga.22.2022.02.05.04.31.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Feb 2022 04:31:53 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Feb 2022 20:31:47 +0800 Message-Id: <1644064308-21729-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1644064308-21729-1-git-send-email-lance.lmwang@gmail.com> References: <1643260580-25792-1-git-send-email-lance.lmwang@gmail.com> <1644064308-21729-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 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: J8xYOgh60xUG 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 8178d0e..1871acf 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 and fall back to byte to be safe */ switch (addr->sa_family) { #ifdef IP_MULTICAST_TTL case AF_INET: @@ -182,8 +186,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(IPV4/IPV6 MULTICAST TTL)"); - return ff_neterrno(); + /* BSD compatibility */ + unsigned char ttl; + + ff_log_net_error(logctx, AV_LOG_DEBUG, "setsockopt(IPV4/IPV6 MULTICAST TTL)"); + 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(IPV4/IPV6 MULTICAST TTL)"); + return ff_neterrno(); + } } return 0; From patchwork Sat Feb 5 12:31:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 34137 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp4245868iov; Sat, 5 Feb 2022 04:32:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJwBg/3mmQTMgm8XtVYJspeqa+/V0eR1qBW8OkRdFWPDpUf13qxVPxA82sMrqqu1WPdP5+U5 X-Received: by 2002:a17:907:160d:: with SMTP id hb13mr2884527ejc.173.1644064343229; Sat, 05 Feb 2022 04:32:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644064343; cv=none; d=google.com; s=arc-20160816; b=mJ6da3g5qLpeLSngKhtlTy/iwI3C0gaVGaHhFl1XiMSGe25GVibouqmHVUpj8pUsPq BY/4tWzqqe3iJZ8/ek4j3e8KnOAQIWQRiXA+lnNNd9sgCXrEzCMwACKyELKSGDkebifZ 0mUIoRkQH3cIqSL9x1+Ub1sqz2tWLmBaUtPtm/8VnwL4QLitVVkv4te/sKNZMeJT1LNH VeBLf9eGcLurCfCak9JEVtaYvH055CfjCrUas0yQKupHI1wVT7YJs38HMFYqSzQw9uHr nht33uw8ULmpwUoZQnb+TWMWgl3z4365Wa69z6n30WNVwBsDCv1KVrUZbdLL7XuQRPd9 jRNw== 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=SgEJL9A1OJNkiqVSPOwulaiyFmlF+1X4MTbkGf2xyi8=; b=WwemormV14mGVhV5JToM3UHLXDMqQkPMhPvAaek9/yRJlCLvO+2jmn4HSl0mmlS0Sz ujGKrLW4QLaSTob8rHGiPCFuE56mTm8OSmRGJXxRMahC21AGZtMPq8zXXP5/toTjtzKU Ro49LDozrTYxjIzyVyIDLBpBHKu2eqgv8SNvSK7ft6nn7fh1hEx5xPhl2dv/FlXd4fqR hCWj+We21QFHIr1OEzoTN/xh2SI1FLk5m1S/fdEk8e8TzsK/h3HWU8P4IqM1QTxIsmAt 5Sv52FTCm8TCLyHNei2PC9CX6bR0up0UTkbwRVJAiQnxw1BUP8UZ7FK9ezh2wZXJjzO5 VcUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JJ5Xqq6j; 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 oz40si3373326ejc.742.2022.02.05.04.32.22; Sat, 05 Feb 2022 04:32:23 -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=JJ5Xqq6j; 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 C588A68B382; Sat, 5 Feb 2022 14:32:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2738468B373 for ; Sat, 5 Feb 2022 14:31:57 +0200 (EET) Received: by mail-pj1-f44.google.com with SMTP id z14-20020a17090ab10e00b001b6175d4040so15665362pjq.0 for ; Sat, 05 Feb 2022 04:31:57 -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=H18pvxNPo7x5NTlAqe87+ZH5ueIgk3NY0k9ws87iyg0=; b=JJ5Xqq6jc/gw/IW4gLbTXSQVbnZdvGvvRtjvox5jocg1EK8fiuQW/UK5PxP/KO4Qrh LyTycF2uaoywB+qHZfNm8xksNcAD19fJThH18IghH41E72dqTbl+2+cuOoqEclQqTThL AVIseMUr+T8YFIcv/gCaLms8WqJXXYiJV8Mpta3JUla8IQzeLPYuhBrx0Q3XDIR5ynKo 3JrRw99YFQXgQdZkK0aBhpm3FM15QJ+LPzbTGVP3qPjrGVL5/zY1IVpZkWn1kFHvgKzH 4oJMCMiJy8GTgFe2PcyS7DQCRCBhi6OuyVj9T4wMnmBmOpRDLz/cNjmRKxmZhduUEDST 4YzQ== 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=H18pvxNPo7x5NTlAqe87+ZH5ueIgk3NY0k9ws87iyg0=; b=8OeIWRpIDZQqorqB5m0dVgv7DKZ4iKPjXAWUB1FgcGdAYdTUDPDrSoa+Vyx0jD9V/U 4/K4ZAav3oV+g3D5x8J9m/2nnlYUm5vQe7LkCKtNm/DLZcPBInPBFBQJNve1OLFr1xrV EQ9jI95a50yVLXoUUT6KY8SCRnaeGY1VaEwWyMHleU3mHegZOd4QKNUckSb6Svj+Z93C YdNgsLFUNw6/xjJsL5EExGe8em0Y24r1Nl1Qv2ulOYq5lm26i7jWyMOMGDqxlkeA9IYu iVIWK4/4o9XDNRA5mixYW5Rt1cxe9JgzwsSd2cUSSfakZWFhp89bSnjuKC8XeX+SM/IJ p6Cg== X-Gm-Message-State: AOAM530ElUlSvXiJvLNLsows3KEkQCz38/CwkTChNp8u4Z3E/tCvhb4F GowUdzNpxJJu7YILTYYz0MTAD86mlNI= X-Received: by 2002:a17:903:188:: with SMTP id z8mr7958726plg.119.1644064315443; Sat, 05 Feb 2022 04:31:55 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id y27sm3986736pga.22.2022.02.05.04.31.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Feb 2022 04:31:54 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Feb 2022 20:31:48 +0800 Message-Id: <1644064308-21729-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1644064308-21729-1-git-send-email-lance.lmwang@gmail.com> References: <1643260580-25792-1-git-send-email-lance.lmwang@gmail.com> <1644064308-21729-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 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: K7rFEHe2vO4v 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 1871acf..9f6ab1b 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;