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 26CB349EFC for ; Thu, 14 Mar 2024 12:05:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8AD5668D194; Thu, 14 Mar 2024 14:05:03 +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 AF8E968CF92 for ; Thu, 14 Mar 2024 14:04:57 +0200 (EET) Received: from pps.filterd (m0215692.ppops.net [127.0.0.1]) by mx0a-00172501.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 42DKkHf3021711 for ; Thu, 14 Mar 2024 05:04:55 -0700 Received: from eur02-vi1-obe.outbound.protection.outlook.com (mail-vi1eur02lp2041.outbound.protection.outlook.com [104.47.11.41]) by mx0a-00172501.pphosted.com (PPS) with ESMTPS id 3wukf71cft-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Mar 2024 05:04:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PU2DhtJYGahxtgncQkk9qE8Mg5gxxjdXRKcT7qPW7nDU+NAW/K7slKRMxZwnFq6ctsz5psw886mbBXX3Th+tnjYOQKo1WARPbPSNw0Eo3uXJKi6IsfzZuRctOM2kOMh6Elu3oQciKLacY0utXgfOlcUd7WGkWV38c+1ilahBC1mry/Qb1Ib5WlszQw6/UWHqTV+cx9Rg4VMWtwgagpgNvWkjTYf0os/nqLavQCMsr22AwZIi3obW0b0drmkPqgLzs21/GhWJa6jOnh9siceNxCNbg27xvwCmSgAH/eNN1kHXgdx6mvcXr4d0kqlWodkfzDwtBiKAzyUYGNVcJIQ4eQ== 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=+EZImXZkVPYRXSHS6tlNfQWuqpCePo3ayl3UPjBIlf0=; b=Ug1VnecbfXpa7YWoR0vwi9YYZ9DfSfqyKXNMd+FoOxrg7kOun4t+tHOZ5Ya/pfMxTvr9RB6nB7NYKcJuXT9GBzpArVpBfActYj+1GbTYlhB/jdTnwkNA4Xq5T2Z/qSB2AcMc6/qs3HgXBVcjuvZAEOdpCTLkPAqjyRBH2PxyqqVF91Xv4xW+kKqFsdbSOfxT1SujCl/PBLszPYSx6M2+PXIe1UxNy9jm0q6nGSGchhD0C+Rw8oPWuXCo+CUelogOPpSbYz/rNeTBt373q2QS54NbJ2NrQlqq6tJykc/+AwQuGlT2I0hD1SaGNRhNJJoTRMsb25L+kA09bdZReebPxg== 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 DB8P193MB0519.EURP193.PROD.OUTLOOK.COM (2603:10a6:10:15a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.19; Thu, 14 Mar 2024 12:04:50 +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.7386.020; Thu, 14 Mar 2024 12:04:47 +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 Thread-Index: Adp2BkYrgn9SXyQXThi3K27W95oEEA== Date: Thu, 14 Mar 2024 12:04:47 +0000 Message-ID: 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=b4adb00f-1fbd-4c08-9b7c-cf372bb55275; 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-14T12:03:59Z; 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_|DB8P193MB0519:EE_ x-ms-office365-filtering-correlation-id: a3beaa0b-d386-48b6-0ab4-08dc441ef1f0 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5gs1au9MUeCJFdf0CWJxsKOF0GFMY8VhAynh8Ey9k5pADPUm5SXJxBGaGBw9LM5KObSpNCjaKtmUZEIHihFnGKc2MkaKel8AFVAYXpomUjq49Ur/ceEF8vP4yuovhc+wpKIzZNgBjWjzsCwdzqpV5csPYISCetAnM0chUgjKRD6Q8NaaU2yspoIcwL3v6198ToILDXCoCgdeC6EKjGV8jHVz6KppBU2OmLPdW/BYanU/RbCle2QJclJsgyYMs4xvZaWYLBI/XxR4KRc2opHF0zg1eD2yxHDiETjvC6yOM0SfIT0FUf/Oy4q6bgZ0p8QxNoBUGYZ0SzDezJFSIst6yV+X9QtOMF1tkBEcJQZ6Xz4v7o7CmaSH2aa9lXwj3+aNYmjEWDjK9Hs5C4r4suznWuzmsx7NUOflAhfSu4Ve8RII7JBOtZ2nE6F4cY2ptynvbGtPwfGknP8nTcajvyrQcmMoTyhieEdYtYRZ+Ib+d8inuLzi54VGnHDF9Yv2MtyW18Uiw7gEsF6ial3ZRA/B9JY4V/NG/Wxq1AJgoetNC0eIMjzbOtm1vsuHoe877/USqL887rA88+RgY2GPhRMxorKj7aO/b0PySUJ5TuIf6kRwo7r+yREcDjwo6EQ+7dQIE9bVsSbLriwS3MlxmOWv5nzEWLdssTLCdfj35c2/z8UsQbWMoMABp27AJANVK6cqCyBGvlBzMQKOM0N5rjvfWCimFAqdJtKz5GlaGUqOqhA= 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)(38070700009); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-2?Q?Q/S7n+PWGOPMTLIipwmw4gbepZSIubt2Yt28jmpXn5JfEDchvGTk5Genxx?= =?iso-8859-2?Q?/uRA9F6gsh4DSxGbvUUdIv8D0UfC5IXv/QaTaECqqUh2msZjjFuTGJNoFu?= =?iso-8859-2?Q?tbG1kZqFqjhtiQZK+mnrxbXxvNgxVhK91Ua0X+ih9d147D8Da3tNwyfHq/?= =?iso-8859-2?Q?Qp0iGOevi53M2wZ9/sNJikF1fzg+48QHAhVAsskZIbu8Rpt/XbrAdMyITI?= =?iso-8859-2?Q?EinMvTeCSYr4AYQmAAQ4iCs+fLmwCUenNAoioaSq1O84lw7tWK9hVVzt9B?= =?iso-8859-2?Q?S8B1U6oqLij6SDAcpIjq7Wo6Pe1CuPZ6jMFWhWjoXK1iIT4HezGb58CKc+?= =?iso-8859-2?Q?pzDLNufBebW3FflmxXnp146tTnHu1jeB1cCHMggQamtOLQ+cPTdQGVUs4s?= =?iso-8859-2?Q?utB1j3yzndWer3WWa+L+pzp7TFaJDE0Ke3S3VBs9b+ljDna/jW+umqO5wy?= =?iso-8859-2?Q?dIyx6Sbj0De9z2iMbP+T5oaNHArfKStKnBJObhk55DLFhlPpb8yGulHF58?= =?iso-8859-2?Q?d2mW4V++TF4Bi10aXCDGUsJJTUgyVj6Owz1eXt31p2HkrUYWpO0a13TLWC?= =?iso-8859-2?Q?1OSK3UkZbVy3Rtc6aWSdr/Ae2pY3QtYqcwu4OBnK8bt1px/lvGAnwIgRVr?= =?iso-8859-2?Q?wEGcSMOLkfgBCqEDRlwre/3xoJmnn8O0gSGytH7KvH1ueGD1Boif71A0k4?= =?iso-8859-2?Q?tbavwkQGmQRPFnRBzeB3fPOrg7gfAkHjL4mzGwixCkNoj4Q/aV5QCS4qfB?= =?iso-8859-2?Q?cQfUlZVdZVJZ/Gozc8xPQK35x1WBhrsjkEbJm227igKHPyAxYKT0LN3IrA?= =?iso-8859-2?Q?mokwVx/QBwusc8XtcEiPapSPANslDAvLJYOAMhym0PDzcoYOvO25N2Ppr6?= =?iso-8859-2?Q?92yI+dHVsW4KM0OKELulnB5RI749cgDtOtr/59TX3+niXhaWcW5DF7UP0d?= =?iso-8859-2?Q?drR41fbS4rpzW2ik0TRYVrH6xoUljlLdQWqz0yG57kl/sNKjq5epfbfWHi?= =?iso-8859-2?Q?PAQ/AOHNvzHCuJOd5uNMz0zkSKfuo7oc75jugMOWMC+1O7Y7wZlKZqSZhq?= =?iso-8859-2?Q?NSUDqHYGHvEvF4ezBrp++UqHWTtKXE5KbDx+zPjsEesp3H5D7YkrrJPe1s?= =?iso-8859-2?Q?C42wnmhDbbQhcfTuXBr/fq+MXkQi52PSy2dFZxzPN5lYGHpIdgdfHfnIsf?= =?iso-8859-2?Q?TnlB6D7TGxggJ0klR7U+J4MsDiErxACwL+BE4NcKEAQqO8sbYsUlQrvgV7?= =?iso-8859-2?Q?438znfKtRSVg7GbgR+WHFdW4tUrQI4AOvCyvByVjA1y2fB2rCsS2sMANiw?= =?iso-8859-2?Q?yzzcx9HRdBPIppb2CsS803QHcyttB4qBa9NNVoUzFYgat+dZYDcmYvhod9?= =?iso-8859-2?Q?MMMGOazHMMPRodfh3DFnnJJVwOf7wXVfVzDSMVO/LIiqch4VZ5HmNzotAO?= =?iso-8859-2?Q?Ae/5pZ0H3Y+wEOFC9UaJ6ybNORlnatmf9VbOzdfTVEULiPmiwT4QEST6ia?= =?iso-8859-2?Q?qiWoE61UCWxOUT87/BOQeGxnRXDYNU38UXWIfr5OBwFkiEWn0hHdhT1wJy?= =?iso-8859-2?Q?Ox4W/BIS8WH8KCpmmB9F+ahW2It1L7MyUvurF2avJ62I5oohcjqUUrjsMr?= =?iso-8859-2?Q?t3pRVdCgxw9Tg=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: a3beaa0b-d386-48b6-0ab4-08dc441ef1f0 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Mar 2024 12:04:47.8270 (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: P07WGSIDOb5A+Xaw4IzIga4Pbe6qwFcGe7hY3ZPpM7t+ycMzrhU0zVULiSJUnGx8hCw9cT6XPnj26uux8ct19A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8P193MB0519 X-Proofpoint-ORIG-GUID: ap3_43PmHyVlKTnAyxY0Ws-p4YJ5yO8X X-Proofpoint-GUID: ap3_43PmHyVlKTnAyxY0Ws-p4YJ5yO8X 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-14_10,2024-03-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 phishscore=0 priorityscore=1501 mlxscore=0 clxscore=1015 bulkscore=0 impostorscore=0 lowpriorityscore=0 adultscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2402120000 definitions=main-2403140087 Subject: [FFmpeg-devel] [PATCH] avformat: enable UDP IPv6 multicast interface selection 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: localaddr option now properly works with IPv6 addresses. Properly resolved interface index in places where default 0 interface index is used (marked with TODO: within udp.c). Added SO_BINDTODEVICE for mcast sockets that are used for reading from the network. Need for this arises from the fact that [ffx1::*] and [ffx2::*] mcast addresses need to have a defined interface for binding to avoid ambiguity between multiple link-local networks on the same host. Failing to set this option causes errors on Linux systems for interface and link-local scopes. 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/listening. Utilization of sin6_scope_id field enables usage and adequate resolving of IPv6 addresses that utilize zone index (e.g. fe80::1ff:fe23:4567:890a%eth2) This is not fully supported on Windows, thus relying on this field is not done on Windows systems. Closes: #368 Signed-off-by: Lazar Ignjatovic --- configure | 3 ++ libavformat/ip.c | 45 ++++++++++++++++++++++++ libavformat/ip.h | 6 ++++ libavformat/network.h | 6 ++++ libavformat/udp.c | 80 ++++++++++++++++++++++++++++++++++++++----- 5 files changed, 132 insertions(+), 8 deletions(-) diff --git a/configure b/configure index c34bdd13f5..77f03948ce 100755 --- a/configure +++ b/configure @@ -2256,6 +2256,7 @@ HEADERS_LIST=" valgrind_valgrind_h windows_h winsock2_h + iphlpapi_h " INTRINSICS_LIST=" @@ -6408,6 +6409,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 && network_extralibs+=" -liphlpapi" || disable iphlpapi_h + check_func_headers iphlpapi.h GetBestInterfaceEx else disable network fi diff --git a/libavformat/ip.c b/libavformat/ip.c index b2c7ef07e5..4f2d998c34 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,45 @@ 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 && 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; + + return 0; +#elif !HAVE_WINSOCK2_H + struct ifaddrs *ifaddr, *ifa; + + if (local_addr == NULL) + return 0; + + /* Special case for link-local addresses, relevant interface is stored in sin6_scope_id */ +#if HAVE_STRUCT_SOCKADDR_IN6 && defined(IN6_IS_ADDR_LINKLOCAL) + if (local_addr->ss_family == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&((struct sockaddr_in6*)local_addr)->sin6_addr)) { + unsigned int interface; + interface = ((struct sockaddr_in6*)local_addr)->sin6_scope_id; + + if (interface != 0) + return interface; + } +#endif + if (getifaddrs(&ifaddr) == -1) + return 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) + return if_nametoindex(ifa->ifa_name); + } + + return 0; +#endif +} 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..a603a9961e 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -220,8 +220,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 = ff_ip_resolve_interface_index((struct sockaddr_storage *)local_addr); 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 +230,38 @@ 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 = ff_ip_resolve_interface_index((struct sockaddr_storage *)local_addr); + + 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 +285,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 = ff_ip_resolve_interface_index((struct sockaddr_storage *)local_addr); 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 +312,7 @@ 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; + 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)); @@ -839,10 +868,39 @@ static int udp_open(URLContext *h, const char *uri, int flags) * port. This fails on windows. This makes sending to the same address * using sendto() fail, so only do it if we're opened in read-only mode. */ if (s->is_multicast && (h->flags & AVIO_FLAG_READ)) { +#if defined(SO_BINDTODEVICE) && !HAVE_WINSOCK2_H + { + struct ifreq ifr; + unsigned int iface; + iface = ff_ip_resolve_interface_index((struct sockaddr_storage *)&s->local_addr_storage); + memset(&ifr, 0, sizeof(ifr)); + + if (if_indextoname(iface, ifr.ifr_name)) { + if (setsockopt(udp_fd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr)) < 0) { + ff_log_net_error(h, AV_LOG_ERROR, "setsockopt(SO_BINDTODEVICE)"); + } + } + } +#endif // defined(SO_BINDTODEVICE) && !HAVE_WINSOCK2_H 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 +913,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/14/2024 12:04Z. _______________________________________________ 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".