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;