From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id 3AAB542B8C
	for <ffmpegdev@gitmailbox.com>; Wed, 12 Jan 2022 05:13:23 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A1C3368A990;
	Wed, 12 Jan 2022 07:13:21 +0200 (EET)
Received: from mail.comstyle.com (speedy.comstyle.com [206.51.28.2])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA2EF680BBE
 for <ffmpeg-devel@ffmpeg.org>; Wed, 12 Jan 2022 07:13:15 +0200 (EET)
Received: from mail.comstyle.com (localhost [127.0.0.1])
 by mail.comstyle.com (Postfix) with ESMTP id 4JYbLL4Lmfz8PbN
 for <ffmpeg-devel@ffmpeg.org>; Wed, 12 Jan 2022 00:13:14 -0500 (EST)
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=comstyle.com; h=date:from
 :to:subject:message-id:mime-version:content-type; s=default; bh=
 tCKqHszOz5EYL5kx7RGvf08t01Q=; b=bGqavImXieJkenYZ8YD++9kzDj3lkIso
 9XVJgGgP/PZ3J7mMFzKv3XlhlpYYLJXckZ4blPuQpWf2lbBN8mQf8D86W6G5n9ff
 QXXQ+6R6Dn2FuRJx6FRtIUSgtUb/02isHTA45tYsWyepg9A+HxKCVTTImVXkTXrx
 HhUkFJqpL88=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=comstyle.com; h=date:from:to
 :subject:message-id:mime-version:content-type; q=dns; s=default; b=
 mjTYNb3Bd3jBMaUJkXSzBKufhrQF0sp6M4qTbaxLXkl9BxA0XDi1RkQk+PIAxWFD
 r2THiD3Y6D/t0S8o+ZwFGBX2KmuwGFP4a26na5YQo/M8GzN6L+TjQvi2PmbRcq/g
 5p2lov8vBhrjUDWADwXOU+zrLlX7Uo2+T3LoQ2/3eto=
Received: from humpty.home.comstyle.com
 (bras-base-toroon2719w-grc-53-142-114-5-252.dsl.bell.ca [142.114.5.252])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested) (Authenticated sender: brad)
 by mail.comstyle.com (Postfix) with ESMTPSA id 4JYbLL3bCcz8PbK
 for <ffmpeg-devel@ffmpeg.org>; Wed, 12 Jan 2022 00:13:14 -0500 (EST)
Date: Wed, 12 Jan 2022 00:13:13 -0500
From: Brad Smith <brad-at-comstyle.com@ffmpeg.org>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Message-ID: <Yd5jaXBCd6GP7kBh@humpty.home.comstyle.com>
MIME-Version: 1.0
Content-Disposition: inline
Subject: [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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/Yd5jaXBCd6GP7kBh@humpty.home.comstyle.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>

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
+
+        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".