From patchwork Thu Jan 27 05:16:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33882 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2144782iov; Wed, 26 Jan 2022 21:16:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJzYvWiI3Wqy1gyZej9PTqMlZViG1J1ykTxQPAnj7V0eCmRe38ovgYnHBB3xc4S6ZAcQk5to X-Received: by 2002:aa7:cc06:: with SMTP id q6mr2188571edt.44.1643260596787; Wed, 26 Jan 2022 21:16:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643260596; cv=none; d=google.com; s=arc-20160816; b=VbkvRin9PZ2uuVmSD4TEe7pQ1SFJCsjWXGpWF6wcJ7+MGhCq69z2GPLhNoZ0GtsihC dk+cpLu0Z89WYPgkkDOaLswVIww7ZCTKI8aOmE+Ez+A2uKCv48XKXyp8kT8i+esDszKJ Hn7ATnVOO1ZYgZcdCIbl9ZU0HKETROg2B14USrnzc3oLr0f9HCu+ZyMuynBU4oZ2BxiY mFb8EiyTOa8w13Gnc8z76QQMhxPASruA1wNTMvbjJA0DrDGMriPpe2n4CHSxLqZY1OrT OnAG9bqgwZwK5FKlvGDQ2aAthpmrKopv8i+xnM01laa1Qb/P3+NoZxPwBScSoF2iYtGE 31Hg== 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=du16Bgs8cuWbDhDoPaAITpZg1VdHG8GgxRHgQsHCBpM=; b=bAPSjKtjme3DfGeVF/FtJRIodgbh7SCujHqWoEQk+XczyAKgsqD8k/LE221WQMiR8d 6QyuL8cfZ3S2AFqlgPXNcTfXo+Yn7uZq5ysflCliXEARknZ3s4xbFbtohl2PSnD3+PZ5 /o3cY8rr1imVGX0otbCIWiNLTxbDncK4cO9XpbaiFiz8NeOagbspFaEiWB4WoFPiDaAW BcQzYTbYCXlmqVZ/9SKOUKszZ9yEcA5ttPtr6DG3fIO9GTcrdfQzWtiVo8vjHWp3mzJR mJozYqFT2Kli3r9b+etL9YhTg9jdm6VQin895ZyfDWvjH2eG5D3gvgz1RPtLj7q5OJ8p Ftfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Wq5OvUmn; 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 n11si766143ejl.357.2022.01.26.21.16.36; Wed, 26 Jan 2022 21:16:36 -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=Wq5OvUmn; 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 8AD4668B1DF; Thu, 27 Jan 2022 07:16:33 +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 15A2268ADF8 for ; Thu, 27 Jan 2022 07:16:27 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id b15so1547172plg.3 for ; Wed, 26 Jan 2022 21:16:26 -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=rzbo7EE8TRwk2vMGpb3ROLmoJbtu5IeEMAizWY6e9eY=; b=Wq5OvUmnZlJ3fmCgGsvQM+9qKTfGsBQVqHxExfCh3LOacX0Bf/9KeOiAi+cUKZ29QA FNNJLIcTPSNbG/4U0BN5WmxWQX+BNGE3yIYrlgWE65R+phuYjAUZVHPaBX+YfiuZMtsy 1ygoG2MXvdMzKTcQQRe1GNfHQyUyzTlUnm4zHPPFYhBWI9C4CL6xnZoqL/kU3VvmZsje +U46lGr0GNaKgKYCYugOMhj78diE1LJP3DfiCXgmOVgVCXrO3Cq61B6A85yt413bQeq7 ChgMEj2vFan8p2chSvEcpqq7Cx50WXEBts82mfQcEv2xdbPHVzWADfVCquUzu/E05iTT puIw== 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=rzbo7EE8TRwk2vMGpb3ROLmoJbtu5IeEMAizWY6e9eY=; b=3JAJ6J6ldJph2hSG/PGyVWjAfA4W/ZtyMIySa7KKkIatCdH9wrYULv3ikMj8brtefM vcd895FJP6jpUSWrc7mqqCvnjOVm1GXce+dB3LvCSuTvYhxHLp4YO14mtwbk4UCdQwzx YuqKhmAGrlZAGFtnnxk5IV9qhvurbKbBtvWXJK50GP20s1HnEvJ6y2HFJirNWegYWUJ6 ce6WXDcMKra7V1AwXbDHNQdhpXi/sK6QI96AQnBA4Ibl7TNqALmEkLa7dGBpryYGmQpn UkZyHhYSQ19J7AQR7u6uX7ycBfXKs3BovLYCzz4ApRva/YY5Zf0z0Aw02xQu/JAMPWjS bonQ== X-Gm-Message-State: AOAM533It4Ab5tAdsnHlplrODM59JF27flm/yAichmyYuYiMbXngZLvr 6FYxngAlHC9ZAtgTna0edGbi5bZhL5c= X-Received: by 2002:a17:90b:1c88:: with SMTP id oo8mr12223204pjb.218.1643260585217; Wed, 26 Jan 2022 21:16:25 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id f13sm3883333pfc.70.2022.01.26.21.16.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Jan 2022 21:16:24 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jan 2022 13:16:20 +0800 Message-Id: <1643260580-25792-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] 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: FVRP4MM4Bmwd From: Limin Wang Fix #ticket9449 Signed-off-by: Limin Wang --- Make it as real patch so that you can test it easily as I don't have BSD system for testing. libavformat/udp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 83c042d..a52a489 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -163,8 +163,15 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, void *logctx) { #ifdef IP_MULTICAST_TTL + int ret = 0; if (addr->sa_family == AF_INET) { - if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &mcastTTL, sizeof(mcastTTL)) < 0) { + ret = setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &mcastTTL, sizeof(mcastTTL)); + if (ret < 0 && errno == EINVAL) { + /* BSD compatibility */ + unsigned char ttl = (unsigned char) ((mcastTTL > 255) ? 255 : mcastTTL); + ret = setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)); + } + if (ret < 0) { ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IP_MULTICAST_TTL)"); return ff_neterrno(); }