From patchwork Tue Mar 26 12:34:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SWduamF0b3ZpxIcsIExhemFyIChSUyk=?= X-Patchwork-Id: 47489 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp95652pzb; Tue, 26 Mar 2024 05:34:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVwGbbaGHn6hvTZCpLVP3y8nrWMvkNw6EFTVjYvevneleR6aFgkYolNj1miJINyDAtNOQlxRCzi4NvO+6ZqSh82lXes3Htuzwrc3w== X-Google-Smtp-Source: AGHT+IEJDPGDYuaYm8HdndP6VmwkcIdTu8wg6rPqeKovJVVrMDlXFIp5uW8is+H64ZwA4cqff4TL X-Received: by 2002:a17:906:c311:b0:a47:3a99:87c with SMTP id s17-20020a170906c31100b00a473a99087cmr1251644ejz.18.1711456472720; Tue, 26 Mar 2024 05:34:32 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bx4-20020a170906a1c400b00a44438f8f24si3517979ejb.192.2024.03.26.05.34.31; Tue, 26 Mar 2024 05:34:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=cubic.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A674A68D53B; Tue, 26 Mar 2024 14:34:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx0a-00172501.pphosted.com (mx0b-00172501.pphosted.com [67.231.156.187]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E94268D281 for ; Tue, 26 Mar 2024 14:34:26 +0200 (EET) Received: from pps.filterd (m0043387.ppops.net [127.0.0.1]) by mx0b-00172501.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 42QCJeNC029020 for ; Tue, 26 Mar 2024 05:34:25 -0700 Received: from eur01-db5-obe.outbound.protection.outlook.com (mail-db5eur01lp2051.outbound.protection.outlook.com [104.47.2.51]) by mx0b-00172501.pphosted.com (PPS) with ESMTPS id 3x36cutdmq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 26 Mar 2024 05:34:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GGJvdyTF0DdtBJaKMXBfvLxvOGzbLzllxuPMbKe0Q1D8qPFmdXU5fikAN1icGkh9tslpgksj07mkltl8EsizSaTU2Af+YubtQmO+xPBOasAxt9LDpa/kFsxl0wH70NF0O2Qrn/vEgaEXvWiOCnklBAIO814IISl6M17qzH7/HYGkCzWcHgdPkCjy5R/iWsJSxDWKxiGgu99FP1Iwh4qpFvrlv7dqNqb3fWTfU5ijmU26t0TpV64dCRBEtvceqm9pwHi/K+Ofucot02gqrf1caWeXKaOdaWrv6XofuZUbGMqEKi3mvi5C20ffZebasItDiknA5uxEXv+O6/wA34LDYg== 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=3vwOaj0Cvi+/moKZBYtPz5ryPCMLAjwTU5VOyNqRrHM=; b=mcW3b3GW73WOR9Vsc8roRj+c9WvMNnpuA557h/NaMLlBZDAVPDJeUmVW9MpATkJ07Z0ch2e+qX4dIT5F+LDzaxgf5D+kj9H3k4CwJzVhONX8cUB9ZeBmfJqjldxrgefIIKP+Umrbt9d4R5BuIyR7X5nqq+2yMIFKT5k1j6HSWitiW89UGB76zuRMQoGBNjKy6pGfJeT52v+G88+0L760iF5gkI8kom7JQTOXktr5F1rERY31O0fLHpBWhLOUzP1VejrjoS8SLk0+lf6hwVmTzf9sqSPZaYU/iGls05h1cvYMiWK9DDD3Uod5x47FIyUMMlMR7sInARZuFfz8imtsdw== 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:21 +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:20 +0000 From: =?iso-8859-2?q?Ignjatovi=E6=2C_Lazar_=28RS=29?= To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v3] avformat: enable UDP IPv6 multicast interface selection using localaddr Thread-Index: AQHaf3ntZsUV35hLPUGR8+aEXN7/Zw== Date: Tue, 26 Mar 2024 12:34:20 +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=464e9535-cc63-4730-8f40-6a475caaee3d; 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:06Z; 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: hkYUKe4MZ1hHDOa8Xe51Rh3mVJesBGBPVzdg4/UHH7f8uBXHv0xTLpREA5O3ePfALQtVWYzDt+4GuDjhnev31/9m4I9BXAuuNQZnfdmhOXQQX89c//5Scn8xbrZ+tJw89lMWx25usTLbr6McoHtzg2aGM3KhYA9x0qQgs8Hk8n++Z2M0pgVN8jL9128Pi7mToTM/I/bDpLoPOLrXrOoOQGN9Ef2l9Qz73nPZERb7LcYlb8f5hMuP1eYb4Vk8o4uJ/1En6gfM6GWF/05ucg4fAxIMJRoPJe0bv+AOC6RDkpHSptqfFFwqPDIreQBbweTa9TH3Q9HCgXnac3ZxPJqseKbHtSGNQb+o6Z54XdsuZb2UlNoTYy3EqievgjJsc8ZWuKrQcrsHvXXds+yjBP84zctq92CgOYmq87mCuw5Mou4FuahXDOC1+g3fxElDye86wDegG4Q5zhIoa2Bk2TGO3titXOtVOb6YGuAErdOx7B3UsuR2DJGo7gnhIssj2sSCpwRqVxMNu72dmGvfEsjsrr+wrqu+Z8/GOAP0hyAkah6+JWGAOpDp+RUiWAZYlPoDNmvPmswdZ1xwtAiINXOXP5J5dApY2a/xZtSLp1Ich4CLPs7iSIE4RBwLScU+m2MH4YnMOAq5L6dT1eDWVqFRLbSLhZRN1qoHC3oFLKKCpiM= 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?jJSgaQHDIBC/s9ZkQN3AFXV?= =?iso-8859-2?q?OikOgfU6qA5X+MeDcjBRErHCAw3pCvERs/JTy4OWS9wFotvnJ+r9roYTTQKs?= =?iso-8859-2?q?k8K/j1Mkm69Vx8aBHL1W2e6AmRFv95tTzz4Iz7VjIoPscPnQlkTc6Bn9tk7p?= =?iso-8859-2?q?0rSYKD76DWPQv0Uot6SWVISc8JYHfoPoCH6xkRqFPTU1zsyr8W/iWdlKwFCL?= =?iso-8859-2?q?YIOfWT5RZH2I9rQkKOXDOzpn5cWbliChwIVPwGC1rQ2/dlh/B3vQinQLr95w?= =?iso-8859-2?q?4La6JXq/iowHKeERSirhSycFdLbqsEww/Bnh4bfiUfDp0wZKOzfWSCRYgyQ6?= =?iso-8859-2?q?ieo6phQ/FlBPWpy0jrQK5Na/DRRJuHaBVCdFRDFC+Wyrkf5WcW7WQ4Ph68ow?= =?iso-8859-2?q?MjPE+eseBePJgYu2b7kaRhAgcZbDVafnZHqjwnelj1IdbsdvtPpmL6mAAddj?= =?iso-8859-2?q?eOCTDXpQY56jA5tixWrBqxBY037kodA/5IULsY3eYYOBFd1NM/7Ic17yt0sM?= =?iso-8859-2?q?C8DVJtdSHrXwNFdvXcrWagDL5rV0JELfgr/OWqjarGuBAIJrW2kTlhKO2v9G?= =?iso-8859-2?q?ACwGd8lZKymhuLp8EfdPR/+uulFSqRTPL+qIoMMSVSDeXpvPR8dEwkwHwIeD?= =?iso-8859-2?q?XGqpOFfBgCJjIx3vQ3QeKLkARdg7UBt2W4iWlB2Hg76/pM9ghR6jfFH2FmJy?= =?iso-8859-2?q?9Aw44162k3R5tf/ttSOskdtcIDmMhsHOSKXtCctHLDp5DFVf7855ESMuceTd?= =?iso-8859-2?q?1gNU2lXJXoatvkhT9hf+wzbKvjDFQPYsvnkiqy15VK3LbRQqgqbQh9p0zmFT?= =?iso-8859-2?q?jYvI0xTt06ueia7jRuQdySMd42kaULdfGKENh+1KFPzlHHwXu0q1mRZRdktj?= =?iso-8859-2?q?k+Sevc/ZWTQZtRtKg/IMowXO9dTMrR/GtaLOmrgij8xtxk5sLQiBS3RwuPRs?= =?iso-8859-2?q?/mCLIXVOWdY0Wj880EM7N9F4y25CYmZAdcVifTPUV0v3g0DZ+UI5PjB95pV7?= =?iso-8859-2?q?VqHdpuDTHcEQIqH8AzH1+QlRD8xu/xWQY74UtuzFx/4q1ZALGRo9Lb3kIyDA?= =?iso-8859-2?q?soAZkF+t+8pe5J9a1f+SGELZkZivKD72YR2nRBppt0xxAY0ivFRnquQ6Bpul?= =?iso-8859-2?q?8so3OjcDHG0C8EZlGY2x+fZCxEX+2WKUbn3zMPWCZLPeqlCVol3O0w0dYL0+?= =?iso-8859-2?q?DnP1KPkye2RQxHVbub/KyStzwCKUYFKfr4GK1GJ/IApLSleB7QpmGeHfdBCA?= =?iso-8859-2?q?frwOiF5wl8Np0ppdLrqWyXJHWH5FYR1/EQakqJMdFDzLQ0kxdwbnbYmGMtzX?= =?iso-8859-2?q?Ya8Pb9xK6vu/qToiFheS1e2d1769kSTrkGEwbmo7J0k0zPmFb6pZDa2SCqCb?= =?iso-8859-2?q?8nFO8Exdg8xjYh/8QFpQ+j+Hl50qaU4AUzZ1kuSJyA5v4WCdrpFXaGQAXPJo?= =?iso-8859-2?q?UpmT9TiV+UGswh4Z7uZ2nN9EWhO/f8oFs5oV4Xsxoe+Cx2FXyn3wgWB8K2tY?= =?iso-8859-2?q?tr6FzdJyc+qeEgiXqQitr0hHWsDtqElyg4ZF/NfVPwiX7J1cLB51seEfeCQW?= =?iso-8859-2?q?afpnBePQvNnm+nqUARPYsMTUUIT1v269HwRvS/+gz3Uhexq37CtYFth4=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: fab946da-2d96-403e-1e9b-08dc4d910fb4 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Mar 2024 12:34:20.8635 (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: U5/DKTCCwWwakRxbKwRvufns0SbEkpmi6nZYFRSj3miQoglBqMI4vek5Mx3brkO5EiNMs0/ymXpUMbOvr72MtQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP193MB2218 X-Proofpoint-ORIG-GUID: Y1hxm8xmSOweDjgDwo_vs4W3g2uM6GTw X-Proofpoint-GUID: Y1hxm8xmSOweDjgDwo_vs4W3g2uM6GTw 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 adultscore=1 malwarescore=0 bulkscore=0 spamscore=0 phishscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 clxscore=1015 impostorscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2403210001 definitions=main-2403260087 Subject: [FFmpeg-devel] [PATCH v3] avformat: enable UDP IPv6 multicast interface selection using localaddr 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qOh6NDEGG8wb avformat: enable UDP IPv6 multicast interface selection using localaddr 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). Adjusted binding for multicast sockets that are used for reading from the network. Need for this arises from the fact that link-local multicast 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. Utilization of sin6_scope_id field enables usage and adequate resolving of IPv6 addresses that utilize zone index (e.g. fe80::1%eth2) Closes: #368 Signed-off-by: Lazar Ignjatovic --- V1 -> V2: SO_BINDTODEVICE -> sin6_scope_id, addressed comments V2 -> V3: mcast check sin6_scope_id for iface specification NOTE: Due to comments, this patch is proposed as one of two alternatives The other alternative uses exclusively %scope format for defining interfaces. This patch can handle scoped IPv6 link-local addresses configure | 3 ++ libavformat/ip.c | 48 ++++++++++++++++++++++++ libavformat/ip.h | 6 +++ libavformat/network.h | 6 +++ libavformat/udp.c | 85 +++++++++++++++++++++++++++++++++++++++---- 5 files changed, 140 insertions(+), 8 deletions(-) -- 2.41.0.windows.2 This message has been marked as Public on 03/26/2024 12:34Z. diff --git a/configure b/configure index e019d1b996..08f35bbd25 100755 --- a/configure +++ b/configure @@ -2258,6 +2258,7 @@ HEADERS_LIST=" valgrind_valgrind_h windows_h winsock2_h + iphlpapi_h " INTRINSICS_LIST=" @@ -6406,6 +6407,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/libavformat/ip.c b/libavformat/ip.c index b2c7ef07e5..821595edc5 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 */ +} 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..69ef93bfed 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -220,8 +220,10 @@ 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 (!mreq6.ipv6mr_interface) + 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 +233,41 @@ 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 = ff_ip_resolve_interface_index((struct sockaddr_storage *)local_addr); + if (!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 +291,10 @@ 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 (!mreq6.ipv6mr_interface) + 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 +321,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 +877,35 @@ 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 HAVE_STRUCT_SOCKADDR_IN6 && !HAVE_WINSOCK2_H + if (s->dest_addr.ss_family == AF_INET6) { + unsigned int iface; + struct sockaddr_in6 *addr; + addr = (struct sockaddr_in6 *)&s->dest_addr; + iface = ff_ip_resolve_interface_index(&s->local_addr_storage); + if (iface) + addr->sin6_scope_id = iface; + } +#endif 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)