From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5CE8740538 for ; Tue, 25 Jan 2022 07:25:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C3B268B0DD; Tue, 25 Jan 2022 09:25:26 +0200 (EET) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8CF468ADF8 for ; Tue, 25 Jan 2022 09:25:20 +0200 (EET) Received: by mail-pj1-f51.google.com with SMTP id r59so1238378pjg.4 for ; Mon, 24 Jan 2022 23:25:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=OWYLwy07gfY9It5NjghzCbcR5qVTLZqlFK7S/HbGlJ8=; b=P/2bLbxwl6l1jWEQP1qIsQhlTNcF8GvfKY+XhbIQRe8YEkDq3XeKoTd8khAji79YEV fRqim1UnNwyj5DaPpdrl2ZQdlofRqAuTba/3hS1pH0z/H8pqwgckqe7HNu0kJL46vBvp lFpGz1dA3BM3DIYpWndyHGn/emGIbl4Qe6/oymSyGBc9FLRC/HHwc6AA6JNAX+ZatLLQ qY5zla8NmF96QAQJ7K9GFDxVGBUeZCx+Fuj1O2RScd1IyDGauDWRWLChjfZx7w5udCzw 7rR1u5efIISmYQRiquC7hwwsB13lRa8K/BxsjhG73b7TMj4lDhV3gKOiu2AYowFVPfDF sVZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to; bh=OWYLwy07gfY9It5NjghzCbcR5qVTLZqlFK7S/HbGlJ8=; b=NN1z2J9VKu+oBk6g+sfShIqyZKut2teTER8UvfGBlqwLUhfmko/gy7sKSP7GDPLVd1 YNBXA0kHwGfDkSGOtvaWYYkpvdbMdQAsh3me9k1STFdAGrsPPBAmla4ldvDu7RJDYuY+ pSZy5Hxb8kCDAkcFd6vppHx8xw9V/13v/XG/mCSNfwY4ScFeS54r/N53TkoHXnExAN1I 0syctJ8clbopSO2c1/8/9w5iOYVlzKNMeghkO76kgzrjC4lw0EkGaNWEJ5D5eESo/Fsr o2sI+5nqaB7ZZi36K0EbQ5Wck7ij7pHyiYlqTdAdY8JSEPCE9w67FHPxIjWDJdkD6ubO bWAg== X-Gm-Message-State: AOAM532fLX7eiSi62aK1zEJF/8TCW5zjFskkCh92uGD4v5182FDXnyuU WropDsXCl+oB9bHiRGcSMDOAHgh8eI0= X-Google-Smtp-Source: ABdhPJxeM4Sh7Dcb+0TjjtfRATgI1HyAdTmcGr8C3q62yEOZKevUf5OANopDfGYI5VVmy0K9o0ABDQ== X-Received: by 2002:a17:903:183:b0:14b:fa7:e574 with SMTP id z3-20020a170903018300b0014b0fa7e574mr18041965plg.114.1643095518412; Mon, 24 Jan 2022 23:25:18 -0800 (PST) Received: from gmail.com ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id c4sm1467849pjr.47.2022.01.24.23.25.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Jan 2022 23:25:17 -0800 (PST) Date: Tue, 25 Jan 2022 15:25:14 +0800 From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Message-ID: <20220125072514.GA19401@gmail.com> Mail-Followup-To: ffmpeg-devel@ffmpeg.org References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH] Fix setsockopt IP_MULTICAST_TTL on OpenBSD 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Wed, Jan 12, 2022 at 12:13:13AM -0500, Brad Smith wrote: > Fix setsockopt() usage on OpenBSD with IP_MULTICAST_TTL. The field > type should be an unsigned char on anything but Linux. > > > diff --git a/libavformat/udp.c b/libavformat/udp.c > index 180d96a988..29aa865fff 100644 > --- a/libavformat/udp.c > +++ b/libavformat/udp.c > @@ -163,7 +163,13 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, > { > #ifdef IP_MULTICAST_TTL > if (addr->sa_family == AF_INET) { > - if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &mcastTTL, sizeof(mcastTTL)) < 0) { > +#ifdef __linux__ > + int ttl = mcastTTL; > +#else > + unsigned char ttl = mcastTTL; > +#endif I don't have BSD system for test, but I prefer to use socklen_t, please try with my proposal patch: --- libavformat/udp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 83c042d079..b9baa0a803 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -164,7 +164,9 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, { #ifdef IP_MULTICAST_TTL if (addr->sa_family == AF_INET) { - if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &mcastTTL, sizeof(mcastTTL)) < 0) { + socklen_t ttl = mcastTTL; + + if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) < 0) { ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IP_MULTICAST_TTL)"); return ff_neterrno(); > + > + if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) < 0) { > ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_MULTICAST_TTL)"); > return ff_neterrno(); > } > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". -- Thanks, Limin Wang _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".