From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id D64384C755 for ; Tue, 5 Aug 2025 07:56:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 306EB68C25D; Tue, 5 Aug 2025 10:56:30 +0300 (EEST) Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazon11011009.outbound.protection.outlook.com [40.107.130.9]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 6354268BE1D for ; Tue, 5 Aug 2025 10:56:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZfrH5WHHSZyIl5sJAN4obHB4ILypwklSPtZhTeJMeYWCBRRa7Qd77zFApZmtujixYOuQLRCIGMKhA8sAbJoAFQO/F3DOD0PCoD/8HitUP/L78WND1pBIfC1I+/WWUrDaYbin5jolIKyceKg8WNRjDoTZbvO+BBIY7xeZa+T4xjhO6noYYhAJyMNt3059M/cG2s0TzHC6A7QRiMqzv53NRBsYEfNFekCg523rZGtoT2W6CDAzWs5BkdqGauyCqKeP7W2IUlshFQELuMoxl/VqMKngMnet/E3KoxpzyAM+ZQT6ktRWhG4fuGZu23fIlORiZV8BnJCEAlcVlrmOyeGp6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/Glj7Km7pWW79NsJbUu3iLV6Be+AJzmWdC7Y6THT74s=; b=mzblky9m66LHwS0XmQM4Qm5irIcHB/0thdA/4f7D8OFfoNcgI0fa9jfBv6P91+ufEYg/prLVNqd+ov+XdYAlCfRNnAmzMmSIhTNls5h7e4JGQuWcwFg3d24cR/jet/wTehJWE/1W9oKAwqhtOwdXHYEDUArgfL+wBltni8QvskgOiSlEkse7BG0X8paXOlDoijGv1WN6+ZZjGrSEQz2L6zBrppR4nbAO2BQvPjCw6KX5F7tEyyUIxhmFgcAtAFBS/yTF8fJ9h39MT4JuN5jExkbLx7Kf0kSGXqTZtmdiKLPx8/nq5jzG9UUYz0C3EChO2F6CdKxzc2K2AogfW3UizQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=ffmpeg.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/Glj7Km7pWW79NsJbUu3iLV6Be+AJzmWdC7Y6THT74s=; b=VVq7VbXKkpNn2CZVsszUMhPULLoBGHWvhlv1DDVybtjePkSmd3SmOQWNX8XmwxYIIvaDBr3OsZjwHsB7tQrIz6n3Ac1M/vWGsNz0JnG/eKvNV59KqrusDBVQfZwK9iJMOE8Aca38sSeFCnyMGFc2TVfH/czznIzSmWUawGd9gVg= Received: from AS8PR05CA0013.eurprd05.prod.outlook.com (2603:10a6:20b:311::18) by AS2PR02MB10438.eurprd02.prod.outlook.com (2603:10a6:20b:64b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.21; Tue, 5 Aug 2025 07:56:20 +0000 Received: from AMS0EPF000001A5.eurprd05.prod.outlook.com (2603:10a6:20b:311:cafe::2e) by AS8PR05CA0013.outlook.office365.com (2603:10a6:20b:311::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.21 via Frontend Transport; Tue, 5 Aug 2025 07:56:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by AMS0EPF000001A5.mail.protection.outlook.com (10.167.16.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9009.8 via Frontend Transport; Tue, 5 Aug 2025 07:56:20 +0000 Received: from se-mail01w.axis.com (10.20.40.7) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Tue, 5 Aug 2025 09:56:20 +0200 Received: from se-intmail01x.se.axis.com (10.4.0.28) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Tue, 5 Aug 2025 09:56:20 +0200 Received: from pc55631-2335.se.axis.com (pc55631-2335.se.axis.com [10.94.180.160]) by se-intmail01x.se.axis.com (Postfix) with ESMTP id 31B64149D; Tue, 5 Aug 2025 09:56:20 +0200 (CEST) Received: by pc55631-2335.se.axis.com (Postfix, from userid 18910) id 2E38843A3533; Tue, 5 Aug 2025 09:56:20 +0200 (CEST) From: Peter Enderborg To: Date: Tue, 5 Aug 2025 09:56:18 +0200 Message-ID: <20250805075618.1496509-1-peterend@axis.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF000001A5:EE_|AS2PR02MB10438:EE_ X-MS-Office365-Filtering-Correlation-Id: ad53cb72-321b-471d-7ed3-08ddd3f590c8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|4022899009|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?A7Ytkth24riSwb8Ui1QkXlLBALZPgiErQ4MB/eXX9Cr4cRPWy1OD8MZv0mH1?= =?us-ascii?Q?NTWVevCwg6+7RHUEk8kHNFaov8Z05msemQUpKTa8Ieaz7Y6oXrNv/l1h5qWp?= =?us-ascii?Q?lzo7pmzIxjol71HYN1YnTZuC6Blo4McraGdrjLNt7ZOddoBAJyeOF+mQFyq3?= =?us-ascii?Q?CscGvQrOsRWUmSFHnySgkSjgWqvKaB0aIT/49LOiep7jymEZTjVvIbz2kyWR?= =?us-ascii?Q?eQHY0ISpuuAws8pUKIDP3PpLG5LVf05rjXGelcSaoOR3R0G1045D1ZjqS2jQ?= =?us-ascii?Q?V7IbdSP4CXOjXmGJJHVc6yMtzHIcd5c6eD5BnOxRf4hTgO+Ps0njVa8o1lvz?= =?us-ascii?Q?32sCcLzhUmnvdXkVRp/bT0yFluuCFCVYQ4QvfyFX+wOoz81KZVYnlziZQuXw?= =?us-ascii?Q?ifA8xZa03vvpsbJzD14pVc03k3M1Iqds91Q2oeUPLcNn7dTQK6gefqJZOCpJ?= =?us-ascii?Q?4+z8ZuqhnedA6mKfqFXrsOeyBjVShJ5wUCgdcXxjM9HFBzv4gcYTnYPoD0mZ?= =?us-ascii?Q?vPYgcdfqbUD/st3XLZNrLqHyo0sHxCO9xrZmgtSoenWz1OidVVNHwB/g3+H+?= =?us-ascii?Q?E/WjQ4zNUi0KJk4G80+AUtDEPLnbaX2o7EDJ/y230qvCfulz1IYQnZlNsa56?= =?us-ascii?Q?MpCFZikmJp4jAwwt8569ogZh932OgN5BvUJtQgYltCIT1KkFfvqZfq0dEzTi?= =?us-ascii?Q?8uDbKd8J/ybpF1/KNIEoOgM4rJ3ad7/Ht4x2Wms4Iq0gXeD7mdEO3M2Q9XNn?= =?us-ascii?Q?JBcuVrrtB/nt2m/046hA54t1XR7cYuS9Y3b+RAUJD26y0ni02tcMfu0dy7+7?= =?us-ascii?Q?C4QwKYx86OC7WUC1tZac5CQ+T8uvkHqZoYWDbtI2QJGRszET0X37CDT3se4H?= =?us-ascii?Q?0OXYQGsCnBziALzR50I7BTDjoo/99WHtOFRN41HihCP7knxsQeLpTvXrkuIe?= =?us-ascii?Q?gOGHk9evGAaD6T+gw7KqeQP+fKjT0bcgSAm6FcDsUqr8MfZxFaY8Rv8hDBrQ?= =?us-ascii?Q?siVgF+zuKwzcCNHp2PPAuGl+yORNUCpZ1XFXWoZO3q7k/de/5hq01xUrHnhG?= =?us-ascii?Q?Oxs92Wjynj5ACU2G2IRdeMgrv0sgUnDfBDnnndiFQ0b4ugOFrPOxCMAUmbef?= =?us-ascii?Q?C8uabqsCWZ0EnLVgEDWb1Zf53EzSOCXlcs8UJvw13fayqwzVhM/1VY8wud6T?= =?us-ascii?Q?CLbI8J4XdUHz/l81cHcMFoGqdxbNOe+oyMu6xieCdamI5d6bTajO1BHeMBSq?= =?us-ascii?Q?7SDSBC4PhqK81e2unnLdrr5tTaIITArBmf3dBkunZ2A4cVahVehzPxGB4A7s?= =?us-ascii?Q?9VurdNKKZYvM88r/1KJmQV8O1njLNYPrx7AgUnndpB1AJ97HiLkGwlN2ut6W?= =?us-ascii?Q?xaB9upxEyy3K3SawNgHEaLcoJeX47i8kzwnMg0l3/LaKIPHwGMVnJcqU5Q4P?= =?us-ascii?Q?St/a5yMdj47DJE6BRe40jCk1uJ/iAdLcyXlhsysC7OOOCip8MIgxXfojppbn?= =?us-ascii?Q?fNeFDMFepWfN2kpUTvRLJQsH4LAICFqt2Iqm?= X-Forefront-Antispam-Report: CIP:195.60.68.100; CTRY:SE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.axis.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(1800799024)(376014)(82310400026)(4022899009)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2025 07:56:20.5575 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad53cb72-321b-471d-7ed3-08ddd3f590c8 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af; Ip=[195.60.68.100]; Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF000001A5.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR02MB10438 Subject: [FFmpeg-devel] [PATCH] avformat/udp: Select output interfaces for ipv6 multicast 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: Peter Enderborg 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: This fixes two old TODO's in ipv6 multicast handling. A helper function to iterate over all interfaces added to help join the multicast group on interface if approperite. The default value is IN6ADDR_ANY (::) and it then joins all interfaces that are up and have multicast support. Local address can be specified and then it join ALL interfaces that use that specific local address. Limitations (TODO's) Handling when network configuration is changed. if up/down etc. Signed-off-by: Peter Enderborg --- libavformat/udp.c | 108 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 90 insertions(+), 18 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 035db785c2..0a981447a5 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -68,6 +68,13 @@ #include "libavutil/thread.h" #endif +#if HAVE_STRUCT_IPV6_MREQ && defined(IPPROTO_IPV6) +#include +#include +#include +#include +#endif + #ifndef IPV6_ADD_MEMBERSHIP #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP @@ -205,6 +212,79 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, return 0; } +#if HAVE_STRUCT_IPV6_MREQ && defined(IPPROTO_IPV6) +static int udp_ipv6_multicast_iterate(int sockfd, struct sockaddr_in6 *addr, + struct sockaddr_in6 *local_addr, int mop, void *logctx) +{ + struct in6_addr anyipv6 = IN6ADDR_ANY_INIT; + struct ifaddrs *ifal=NULL,*ife=NULL; + int iindex_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_IP); + int membership_changed = 0; + + if (iindex_fd >= 0 && !getifaddrs(&ifal)) { + for(ife=ifal; ife!=NULL; ife=ife->ifa_next) { + if (ife->ifa_addr && + (ife->ifa_addr->sa_family == AF_INET6) && + (ife->ifa_flags & IFF_MULTICAST) && + (ife->ifa_flags & IFF_UP)) { + if ((!memcmp(&local_addr->sin6_addr, &anyipv6, sizeof(struct in6_addr))) || + (!memcmp(&local_addr->sin6_addr, &((struct sockaddr_in6 *)ife->ifa_addr)->sin6_addr, sizeof(struct in6_addr)))) { + struct ifreq if_req; + strncpy(if_req.ifr_name, ife->ifa_name, IFNAMSIZ); + if (ioctl(iindex_fd, SIOCGIFINDEX, &if_req) != -1) { + struct ipv6_mreq mreq6; + memcpy(&mreq6.ipv6mr_multiaddr, &addr->sin6_addr, sizeof(struct in6_addr)); + mreq6.ipv6mr_interface = if_req.ifr_ifindex; + switch (mop) { + case IPV6_JOIN_GROUP: + if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) == 0) { + membership_changed = 1; + } else { + /* Subscribe for all ipv6 addresses belong to a + interface.It can generate EADDRINUSE but + is accaptable. */ + if (errno != EADDRINUSE) { + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IPV6_ADD_MEMBERSHIP)"); + goto error; + } + } + break; + case IPV6_LEAVE_GROUP: + if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) == 0) { + membership_changed = 1; + } else { + /* Unsubscribe for all ipv6 addresses belong to a + interface. Ignore EADDRNOTAVAIL. */ + if (errno != EADDRNOTAVAIL) { + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IPV6_DROP_MEMBERSHIP)"); + goto error; + } + } + break; + default: + av_log(logctx, AV_LOG_ERROR, "unknown multicast operation\n"); + goto error; + } + } + } + } + } + } + freeifaddrs(ifal); + close(iindex_fd); + + if (!membership_changed) { + av_log(logctx, AV_LOG_ERROR, "no valid interfaces found\n"); + return AVERROR(EINVAL); + } + return 0; +error: + freeifaddrs(ifal); + close(iindex_fd); + av_log(logctx, AV_LOG_ERROR, "udp_ipv6_multicast_iterate failed\n"); + return AVERROR(EINVAL); +} +#endif static int udp_join_multicast_group(int sockfd, struct sockaddr *addr, struct sockaddr *local_addr, void *logctx) @@ -226,15 +306,11 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr, #endif #if HAVE_STRUCT_IPV6_MREQ && defined(IPPROTO_IPV6) if (addr->sa_family == AF_INET6) { - struct ipv6_mreq mreq6; - - memcpy(&mreq6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr)); - //TODO: Interface index should be looked up from local_addr - mreq6.ipv6mr_interface = 0; - if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { - ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IPV6_ADD_MEMBERSHIP)"); - return ff_neterrno(); - } + return udp_ipv6_multicast_iterate(sockfd, + (struct sockaddr_in6 *)addr, + (struct sockaddr_in6 *)local_addr, + IPV6_JOIN_GROUP, + logctx); } #endif return 0; @@ -260,15 +336,11 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr, #endif #if HAVE_STRUCT_IPV6_MREQ && defined(IPPROTO_IPV6) if (addr->sa_family == AF_INET6) { - struct ipv6_mreq mreq6; - - memcpy(&mreq6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr)); - //TODO: Interface index should be looked up from local_addr - mreq6.ipv6mr_interface = 0; - if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { - ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IPV6_DROP_MEMBERSHIP)"); - return -1; - } + return udp_ipv6_multicast_iterate(sockfd, + (struct sockaddr_in6 *)addr, + (struct sockaddr_in6 *)local_addr, + IPV6_LEAVE_GROUP, + logctx); } #endif return 0; -- 2.34.1 _______________________________________________ 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".