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 ABE534713B for ; Tue, 26 Mar 2024 12:34:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8513A68D3B8; Tue, 26 Mar 2024 14:34:49 +0200 (EET) Received: from mx0a-00172501.pphosted.com (mx0a-00172501.pphosted.com [67.231.148.188]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68AB168D2DF for ; Tue, 26 Mar 2024 14:34:47 +0200 (EET) Received: from pps.filterd (m0091758.ppops.net [127.0.0.1]) by mx0b-00172501.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 42QCICBG015173 for ; Tue, 26 Mar 2024 05:34:46 -0700 Received: from eur01-db5-obe.outbound.protection.outlook.com (mail-db5eur01lp2050.outbound.protection.outlook.com [104.47.2.50]) by mx0b-00172501.pphosted.com (PPS) with ESMTPS id 3x3kmes593-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 26 Mar 2024 05:34:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WwNP2M0CDsK1PqFFcwxAjwGsvgzq+soPgHEOtGGaAQ555VpTs084GgqnSL9Pyoyp+2HZxeuoN0+JmeimwEbIan2GW9q5CZMMK1TfIzS9VC+SaGWRYnUnZqGdnpdsjxco0qCwV6GXBejYeGJzdPqTAPBdvFETIR3U5Ja0VDIBkEmzgE0CR7ffMICps2zvJmYjXT8/wUwyaOIx69s+aZFnK/XczksqBuqdQfjG0i+vWD1ckzHLsLFkx4qcEkJeDxcvLBWtyjHmI+zfd/0MXZq31K+y6f/gPRiMEiF6FMSNO+QEOXtaNOwKUQhuOIt60yyj2Yb+84DhP/EQfLT7spUubw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=vNubyveuPdheppkaJkNQXGD1GAq84HnQZA//G1yLTvM=; b=HOUA7iLFdC4X//ikmUyuYFDpEX0sLUtaPmAs9wi1qSohkpf9j1+rN5+MUaZs0LhOFlguXGSt7q9P25cCwku6clrIIKZ+WpV2sawRojD/kV05PmPebzpb8uNGMVLALAEHKgtDKbAi5iNQRWIYW3SJkC0LIBc6ODv8zz4gFnoGaoUciUvyhN6pdab5DyD9QjjKOdSoMtp2qo3lzwBuTfziTFyasBJ3nVVHFKKfJ1rpeBqb3KPoR5VDDq3VdkjAFoSTLge/L8ieC/nXcWDoEdIYCTkiep3wLES0th6NZD1NOGr9biF49g5Qo162MKkB6EoFy/owBBVcGAStZ36yf2+kFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cubic.com; dmarc=pass action=none header.from=cubic.com; dkim=pass header.d=cubic.com; arc=none Received: from AS8P193MB1997.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:40d::10) by PAXP193MB2218.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:232::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Tue, 26 Mar 2024 12:34:43 +0000 Received: from AS8P193MB1997.EURP193.PROD.OUTLOOK.COM ([fe80::7a08:e115:4e52:5521]) by AS8P193MB1997.EURP193.PROD.OUTLOOK.COM ([fe80::7a08:e115:4e52:5521%3]) with mapi id 15.20.7409.031; Tue, 26 Mar 2024 12:34:43 +0000 From: =?iso-8859-2?Q?Ignjatovi=E6=2C_Lazar_=28RS=29?= To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] avformat: enable UDP IPv6 multicast interface selection using zone index Thread-Index: AQHaf3n6c9XBwHuWGkSxVwwgmZb7ZQ== Date: Tue, 26 Mar 2024 12:34:43 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_878f443b-b434-4a74-8e06-267f84c31196_ActionId=bbed8292-aec6-485b-a233-fa5cc0fbac97; MSIP_Label_878f443b-b434-4a74-8e06-267f84c31196_ContentBits=0; MSIP_Label_878f443b-b434-4a74-8e06-267f84c31196_Enabled=true; MSIP_Label_878f443b-b434-4a74-8e06-267f84c31196_Method=Privileged; MSIP_Label_878f443b-b434-4a74-8e06-267f84c31196_Name=Public; MSIP_Label_878f443b-b434-4a74-8e06-267f84c31196_SetDate=2024-03-26T12:35:28Z; MSIP_Label_878f443b-b434-4a74-8e06-267f84c31196_SiteId=10d6de58-a709-4821-a02c-4c46747e0059; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: AS8P193MB1997:EE_|PAXP193MB2218:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: QOebO2YpP9fokAmYUGYa0mJs4oMGfBGWiFA2ibr24guFBspyJli58WANgYcLTbKVYj9r4t6BZqUs3+lHgRkWUX6t0XjtLNgj3eENX66XVKkRD3+UjLLBbYiyBr1SaHEwsHTcHhEImqVCA2BTjwKO1VuzsTa0CVKlzBZ0yZfiytNAaYWkk9GOEXYcTvV4G3DZ4I+VVGtJDQMiJFMZhL9YqBPmqTd6PvPFQdwRbde/EN6nAqIqRDYJGRCqcLscPpyS44Zp69GzOSpOx+Toj/xatp2fWAC/SjETrK2cBlV3DJlhB7+P8jVy7G0ZWogQi1b8zOfMCjlDNJ2hnr+KfxfLV+mmYi+/o3ZGI/DXLEkEJBbpKnT/PdKYDgnWjTL60Oe7JyVmsm2GjyT44L7QAIg+sSBd51jdUYYiIGzNdl0JAyOQWtB1Nki5tB14T3czOPYgc0N+WEFSIlTYZDGy6ooO/H7kaiE/pqsV/bmW02FSdF+ShzXp1OtDGSU4j9/4z9KGmikvJUDfCvXww4+mXNa+cYGTBrnpzx0Z8n5/+H5V6BFCOBRK/mIGXz6++PaOui09cOk5a4787olj0BZyhR3OK5GwPxaSh/ajF8TKj7atzBv10fhKqXAKwMHPAHz4x1KrtkqHXcv88xYbB8Uw2He8FNPxJ2Ik4Ysg/EWofHj+P8w= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8P193MB1997.EURP193.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(376005)(1800799015)(366007); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-2?Q?oSeW/vMD5eb6fES5nTzil3JudK+wUILVkLv6kjVIR7FoK4YKqO0blRk71y?= =?iso-8859-2?Q?9r0qBZOdGgKYapBI6rkHEbLLjLBlr+Wu7hKYkKGAq1D8rL+6ET110j3BvI?= =?iso-8859-2?Q?PfwYucS0aeAbYatR9pxGp/E4ixFfQQJmrFE/lV2DixDs6etVDEss8kNmuW?= =?iso-8859-2?Q?zANN6MMG6UslhumCRKAdiNhXRSTJNhC8LYh/W1mbAvGCvAnbkwBT5QOzSU?= =?iso-8859-2?Q?XHMsrHwni4FI1o0p/VQywJQkSPdydbtCfTngbjdenSYqI7tbC7GuIfVCVt?= =?iso-8859-2?Q?CkIWTmjYojKEAAeiQxTLRI4SCdbGZ9ZJK+RM+qReRk2YtLBsE2hzPsvdQi?= =?iso-8859-2?Q?r7f4SgdChZXWfAp6DLfEh3/rUQTGXhy5GGDBCYD0+GJjU2vg6CWqaSDbiX?= =?iso-8859-2?Q?yJY5exEVA7ReGSfS5KEWMVYu3IZUGYAJw42VNT/YahvguZ6VmbsDCR9EQE?= =?iso-8859-2?Q?f4CCwcAT7+u/QWPN57rqzEBvPIcYB1LJ37Cz1i8QRBNUgBe4alCh1Nv7Vk?= =?iso-8859-2?Q?dj57MiF3UqC0CmLxYkIII7hjCkcDvmsZW5oOfdxWd1hkrMGn8d3TlSTsz7?= =?iso-8859-2?Q?6s2roR+DeT8oRNtWWUqpRFIWRfXxWNnhYwOrRlnJeBEGUMnnHdgQ2QoQ9y?= =?iso-8859-2?Q?eE86PJ9K1olG5a9wrnQ2OutIKA7HZ5fbWMVIpA/6afwNgCrW+MMx0eTOzc?= =?iso-8859-2?Q?pJ+t5D/6ZjlghP8uRggwI6AgEn9B2k6GDFlRZQ9Hcpos+IB//dmmaA9cFa?= =?iso-8859-2?Q?0ECKm4CkgCxpkx3XNqBxOmGWHXNjv3w5gu+WMV7ElonyjbQjiym1wjRqda?= =?iso-8859-2?Q?crgN9JaDhawX8f0z/9w2ydLVSDPPMWn+lAJHKUFCeEv70hbLjeY50mrwW5?= =?iso-8859-2?Q?+159TM4kLzzjX4qvqncByYyH7T8yVNqyWfCkq6g70g2U2eBdbNDC7WXc5D?= =?iso-8859-2?Q?fMCT5+ZvjEqPoWcuTM2azHcKtH4+UAspoB2a2nOrzQ4+G82JCG7HrCRE2K?= =?iso-8859-2?Q?90okcbmzvy9w4ZxPWHCNlpQKmQrAo1OBnIrJYbxuw/ONGbYLle1/YAa12f?= =?iso-8859-2?Q?qhHlCVx6FqYfMoWoI2YdXKU4Qctt582UKCej6hDI/RptXJGD5wAq2z25ie?= =?iso-8859-2?Q?+X8f119xXv2WiKFac89BSo9xDP0/uT/ltZUDBYBlyXtOE/OHfhLkBGPES/?= =?iso-8859-2?Q?wUBJmaVSUPbsnAHRQBolDNwSWHRID1kXMcsJCTlO/pLP/A8PLEESr7fz9l?= =?iso-8859-2?Q?GToKTSZH9ss9RJ3OhlO6kah4veXEAP8rgq3CqnOm3l5wYSnCP8e0ugewkh?= =?iso-8859-2?Q?zsdN2XBY6z/NlDkF1sMlMrNHRb6/AFvmsJVmuu/b9NGpi2o8C0QCLfo5Mm?= =?iso-8859-2?Q?akvX2/m0IMNP7JkV26UhLrLDf4vgQBGPjlSCYVkbOYxwK/KkUPzsv5ojCa?= =?iso-8859-2?Q?9chf2U6AmgvU360dSSId0KX0Gvwy1XD4+S8v6BN27rOEc1uiXWKQvnHFfF?= =?iso-8859-2?Q?Ywpx5AQEb/C0qdlMdRkNNm73fedj5a/wUwJRwyUz6nO6IHRNZVzq+kf5+y?= =?iso-8859-2?Q?EL15nTHrMY1qvMC78+sPWxQ/reuDpKtLLtJgxb6bYDdMtKaaXUGdtzSfM7?= =?iso-8859-2?Q?HD3xDUfn66XHM=3D?= MIME-Version: 1.0 X-OriginatorOrg: cubic.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AS8P193MB1997.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 1f821476-930e-41c7-35d0-08dc4d911cee X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Mar 2024 12:34:43.0500 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 10d6de58-a709-4821-a02c-4c46747e0059 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: uyHcKJnWhFF7gYO3WU4hPHvmaiWTQ9j5zbH6PTooIQN0oA3plzCg85ugdz72gUY5zbas+VEcfN/cICoYnghN8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP193MB2218 X-Proofpoint-ORIG-GUID: z2wKf7iVmZ0UqcOLxpVGoQQ4pQ6jMsWO X-Proofpoint-GUID: z2wKf7iVmZ0UqcOLxpVGoQQ4pQ6jMsWO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-03-26_06,2024-03-21_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=999 suspectscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 impostorscore=0 spamscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2403210001 definitions=main-2403260087 Subject: [FFmpeg-devel] [PATCH] avformat: enable UDP IPv6 multicast interface selection using zone index 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: avformat: enable UDP IPv6 multicast interface selection using zone index Enabled IPv6 interface selection using zone index. Properly resolved interface index in places where default 0 interface index is used (marked with TODO: within udp.c). Adjusted binding for multicast sockets that are used for reading from the network. For mcast addresses, bind to mcast address is attempted as before. In case that this fails, which will happen on Windows, socket is bound to INADDR_ANY/IN6ADDR_ANY_INIT depending on address family. Actual interface selection is performed using udp_set_multicast_interface to point to the desired interface for sending. IPv6 interfaces are resolved based on sin6_scope_id field, while IPv4 interface resolution is performed based on address. Closes: #368 Signed-off-by: Lazar Ignjatovic --- NOTE: Due to comments, this patch is proposed as one of two alternatives The other alternative uses `localaddr` for defining interfaces. configure | 3 ++ doc/protocols.texi | 2 +- libavformat/ip.c | 48 ++++++++++++++++++++++++ libavformat/ip.h | 6 +++ libavformat/network.h | 6 +++ libavformat/udp.c | 87 ++++++++++++++++++++++++++++++++++++++----- 6 files changed, 142 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 2a1d22310b..35d6a0b78c 100755 --- a/configure +++ b/configure @@ -2307,6 +2307,7 @@ HEADERS_LIST=" valgrind_valgrind_h windows_h winsock2_h + iphlpapi_h " INTRINSICS_LIST=" @@ -6475,6 +6476,8 @@ if ! disabled network; then check_struct winsock2.h "struct sockaddr" sa_len check_type ws2tcpip.h "struct sockaddr_in6" check_type ws2tcpip.h "struct sockaddr_storage" + check_headers iphlpapi.h -liphlpapi && network_extralibs="$network_extralibs -liphlpapi" || disable iphlpapi_h + check_func_headers iphlpapi.h GetBestInterfaceEx $network_extralibs else disable network fi diff --git a/doc/protocols.texi b/doc/protocols.texi index f54600b846..a8892845d3 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -2027,7 +2027,7 @@ packet bursts. Override the local UDP port to bind with. @item localaddr=@var{addr} -Local IP address of a network interface used for sending packets or joining +Local IPv4 address of a network interface used for sending packets or joining multicast groups. @item pkt_size=@var{size} diff --git a/libavformat/ip.c b/libavformat/ip.c index b2c7ef07e5..dc488b12c2 100644 --- a/libavformat/ip.c +++ b/libavformat/ip.c @@ -18,6 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#define _DEFAULT_SOURCE +#define _SVID_SOURCE + #include #include "ip.h" #include "libavutil/avstring.h" @@ -159,3 +162,48 @@ void ff_ip_reset_filters(IPSourceFilters *filters) filters->nb_include_addrs = 0; filters->nb_exclude_addrs = 0; } + +unsigned int ff_ip_resolve_interface_index(struct sockaddr_storage *local_addr) +{ +#if HAVE_WINSOCK2_H +#if HAVE_IPHLPAPI_H + DWORD retval; + unsigned long iface; + + if (local_addr == NULL) + return 0; + + retval = GetBestInterfaceEx((struct sockaddr*)local_addr, &iface); + if (retval == NO_ERROR) + return iface; +#endif /* HAVE_IPHLPAPI_H */ + return 0; +#else /* HAVE_WINSOCK2_H */ + struct ifaddrs *ifaddr, *ifa; + unsigned int iface; + + if (local_addr == NULL) + return 0; + +#if HAVE_STRUCT_SOCKADDR_IN6 + if (local_addr->ss_family == AF_INET6) { + iface = ((struct sockaddr_in6*)local_addr)->sin6_scope_id; + if (iface) + return iface; + } +#endif /* HAVE_STRUCT_SOCKADDR_IN6 */ + if (getifaddrs(&ifaddr) == -1) + return 0; + + iface = 0; + for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { + if (ifa->ifa_addr != NULL && compare_addr((struct sockaddr_storage*)ifa->ifa_addr, local_addr) == 0) { + iface = if_nametoindex(ifa->ifa_name); + break; + } + } + + freeifaddrs(ifaddr); + return iface; +#endif /* HAVE_WINSOCK2_H */ +} \ No newline at end of file diff --git a/libavformat/ip.h b/libavformat/ip.h index b76cdab91c..4085e96f08 100644 --- a/libavformat/ip.h +++ b/libavformat/ip.h @@ -69,4 +69,10 @@ int ff_ip_parse_blocks(void *log_ctx, const char *buf, IPSourceFilters *filters) */ void ff_ip_reset_filters(IPSourceFilters *filters); +/** + * Resolves IP address to an associated interface index + * @return interface index, 0 as default interface value on error + */ +unsigned int ff_ip_resolve_interface_index(struct sockaddr_storage *local_addr); + #endif /* AVFORMAT_IP_H */ diff --git a/libavformat/network.h b/libavformat/network.h index ca214087fc..2461b651d4 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -38,6 +38,10 @@ #include #include +#if HAVE_IPHLPAPI_H +#include +#endif + #ifndef EPROTONOSUPPORT #define EPROTONOSUPPORT WSAEPROTONOSUPPORT #endif @@ -64,6 +68,8 @@ int ff_neterrno(void); #include #include #include +#include +#include #define ff_neterrno() AVERROR(errno) #endif /* HAVE_WINSOCK2_H */ diff --git a/libavformat/udp.c b/libavformat/udp.c index d9514f5026..415377e032 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -35,6 +35,7 @@ #include "libavutil/opt.h" #include "libavutil/log.h" #include "libavutil/time.h" +#include "libavutil/avstring.h" #include "internal.h" #include "network.h" #include "os_support.h" @@ -220,8 +221,7 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr, 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; + mreq6.ipv6mr_interface = ((struct sockaddr_in6 *)addr)->sin6_scope_id; 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(); @@ -231,6 +231,39 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr, return 0; } +static int udp_set_multicast_interface(int sockfd, struct sockaddr *addr, + struct sockaddr *local_addr, void *logctx) +{ +#ifdef IP_MULTICAST_IF + if (addr->sa_family == AF_INET) { + struct ip_mreq mreq; + + mreq.imr_multiaddr.s_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr; + if (local_addr) + mreq.imr_interface = ((struct sockaddr_in *)local_addr)->sin_addr; + else + mreq.imr_interface.s_addr = INADDR_ANY; + + if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_IF, (const void *)&mreq, sizeof(mreq)) < 0) { + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IP_MULTICAST_IF)"); + return ff_neterrno(); + } + } +#endif +#if defined(IPV6_MULTICAST_IF) && defined(IPPROTO_IPV6) + if (addr->sa_family == AF_INET6) { + unsigned int iface; + iface = ((struct sockaddr_in6 *)addr)->sin6_scope_id; + + if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_IF, &iface, sizeof(unsigned int)) < 0) { + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IPV6_MULTICAST_IF)"); + return ff_neterrno(); + } + } +#endif + return 0; +} + static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr, struct sockaddr *local_addr, void *logctx) { @@ -254,8 +287,7 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr, 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; + mreq6.ipv6mr_interface = ((struct sockaddr_in6 *)addr)->sin6_scope_id; 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; @@ -282,8 +314,11 @@ static int udp_set_multicast_sources(URLContext *h, struct group_source_req mreqs; int level = addr->sa_family == AF_INET ? IPPROTO_IP : IPPROTO_IPV6; - //TODO: Interface index should be looked up from local_addr - mreqs.gsr_interface = 0; + if (level == IPPROTO_IPV6) + mreqs.gsr_interface = ((struct sockaddr_in6 *)addr)->sin6_scope_id; + else + mreqs.gsr_interface = ff_ip_resolve_interface_index(local_addr); + memcpy(&mreqs.gsr_group, addr, addr_len); memcpy(&mreqs.gsr_source, &sources[i], sizeof(*sources)); @@ -340,9 +375,22 @@ static int udp_set_url(URLContext *h, { struct addrinfo *res0; int addr_len; + const char *host, *sc; + char address[1024], scope[1024]; - res0 = ff_ip_resolve_host(h, hostname, port, SOCK_DGRAM, AF_UNSPEC, 0); + if (sc = strchr(hostname, '%')) { + av_strlcpy(address, hostname, FFMIN(1024, sc - hostname + 1)); + av_strlcpy(scope, sc + 1, FFMIN(1024, strlen(hostname) - (sc - hostname))); + host = address; + } else { + host = hostname; + } + + res0 = ff_ip_resolve_host(h, host, port, SOCK_DGRAM, AF_UNSPEC, 0); if (!res0) return AVERROR(EIO); + if (res0->ai_family== AF_INET6 && strlen(scope) > 0) { + ((struct sockaddr_in6*)res0->ai_addr)->sin6_scope_id = if_nametoindex(scope); + } memcpy(addr, res0->ai_addr, res0->ai_addrlen); addr_len = res0->ai_addrlen; freeaddrinfo(res0); @@ -841,8 +889,23 @@ static int udp_open(URLContext *h, const char *uri, int flags) if (s->is_multicast && (h->flags & AVIO_FLAG_READ)) { bind_ret = bind(udp_fd,(struct sockaddr *)&s->dest_addr, len); } - /* bind to the local address if not multicast or if the multicast - * bind failed */ + + /* bind to ADDR_ANY if the multicast bind failed */ + if (s->is_multicast && bind_ret < 0) { + struct addrinfo *res; + + if (s->dest_addr.ss_family == AF_INET) + res = ff_ip_resolve_host(h, "0.0.0.0", 0, SOCK_DGRAM, AF_UNSPEC, 0); + else if (s->dest_addr.ss_family == AF_INET6) + res = ff_ip_resolve_host(h, "::", 0, SOCK_DGRAM, AF_UNSPEC, 0); + + if (res && res->ai_addr) { + bind_ret = bind(udp_fd, res->ai_addr, res->ai_addrlen); + } + + freeaddrinfo(res); + } + /* the bind is needed to give a port to the socket now */ if (bind_ret < 0 && bind(udp_fd,(struct sockaddr *)&my_addr, len) < 0) { ff_log_net_error(h, AV_LOG_ERROR, "bind failed"); @@ -855,6 +918,12 @@ static int udp_open(URLContext *h, const char *uri, int flags) s->local_port = udp_port(&my_addr, len); if (s->is_multicast) { + if ((ret = udp_set_multicast_interface(udp_fd, + (struct sockaddr *)&s->dest_addr, + (struct sockaddr *)&s->local_addr_storage, + h)) < 0) + goto fail; + if (h->flags & AVIO_FLAG_WRITE) { /* output */ if ((ret = udp_set_multicast_ttl(udp_fd, s->ttl, (struct sockaddr *)&s->dest_addr, h)) < 0) -- 2.41.0.windows.2 This message has been marked as Public on 03/26/2024 12:34Z. _______________________________________________ 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".