From patchwork Thu Mar 14 09:22:40 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: 47056 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp310344pzb; Thu, 14 Mar 2024 02:23:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWVvnKaXLErWiy/Un9jKAQ2XcRfB0wLAdkDJJdtDapZx+Cc1Yjb3R58ZT8Nqev/sfdWOm6fp1dl2XUOjziM/Me6hNdLal4Iyqt7iA== X-Google-Smtp-Source: AGHT+IGxGIk2UsKVzeGKF3poZeC1+rYwmKkVXx82oc8jlterhLvsEPjdrx5pDYTkQ9qT5bhQpSAu X-Received: by 2002:a17:907:7b06:b0:a46:5f0b:6538 with SMTP id mn6-20020a1709077b0600b00a465f0b6538mr725708ejc.27.1710408180420; Thu, 14 Mar 2024 02:23:00 -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 n23-20020a170906119700b00a4622d605d2si548443eja.97.2024.03.14.02.22.59; Thu, 14 Mar 2024 02:23:00 -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 156F768D1A6; Thu, 14 Mar 2024 11:22:56 +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 D2C2268C6CE for ; Thu, 14 Mar 2024 11:22:48 +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 42E1dRQH022424 for ; Thu, 14 Mar 2024 02:22:47 -0700 Received: from eur05-vi1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2169.outbound.protection.outlook.com [104.47.17.169]) by mx0b-00172501.pphosted.com (PPS) with ESMTPS id 3wupdsrrn8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Mar 2024 02:22:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fgLdNNKvnlrY4dFsvx3/MYYWgnTL0j5ejhQoIN66WoAKnXIc/M+uyx4O7wtRfLzCkgONBNxbd0+EeOh+DWuqidjVW9u4OEqB94pc5RLNfLnctxPS886W2MadmMS5+PKrdwJeHKuiPOimtlo1h1jQLXoox/1mNzLT1EHHDiAe3FGeCgeltYQOG9iuck20mgtGIxAFoxpKg1Ff8c2NLnXBO2DTl2ql07l70AviU+4S3Guzd2cDhmJPZKPfQVmUxhYzP4rmxxRRsD+3kSvG6VrcrLBe6coD4Qhde2q0qr7K3kYpxgeTy5yY5m6gLwdPsDy/ZlZlw8CQ9GUy9eIsUpGH7w== 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=4A4F5u7FXZwrA2TykppbLGm7k4ATqqdW+iMZyQMuvG8=; b=mRaWdRS6yS9I7FN2/cuYOI8DgOUUGD5S/wInnscuGxlaF2QrUApRXcCo1/iH31XwMYUHUmT5nTDr8nWKI7M93HeduIcl9RVMMTc0gp3vPmujZERh7NJh+sZI2bVMRAPFjq/D9bD8UjxfsZe9bBimGl0+7eSdzPabcQrIfconxfEyOwXHylS+BLdxa4af7zRCk6Zua7PLsmoDG63ZjCoC0I6QOpQh0GhcYSppdQZvzCUiavErkHV5sQsWuriVSfKpUIPgWVdcDBqIVPSSY+ppTCZxw4mpmpxF5Unrd/9oE5zvHOIcJ6DUN9M/B0NL3nRA/g0lT9a1teRqn85Fz0l+iQ== 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 PR3P193MB0815.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:ad::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Thu, 14 Mar 2024 09:22:42 +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 09:22:40 +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: Adp17sIZuokNWFhQSFia3hhrX/oyKQ== Date: Thu, 14 Mar 2024 09:22:40 +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=6f7c6825-1c73-4684-8bda-9ee236ddf910; 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-14T09:21:51Z; 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_|PR3P193MB0815:EE_ x-ms-office365-filtering-correlation-id: fe252d37-aec4-4007-23dc-08dc44084c00 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wUl/iHz/GpQq1dD9fYW+poyd4AljoA8ZpzSq/rqQbi4jB9UkmSqU4ohN3KXBdef40kPpI9Z8QqYe0OZtaktJm5nolYaDoCYQhrNo9ycYoCkWvcOjhdn+JlicrBzSlRWJ/vvJDqqWqBXAoWDTSa+dw5US94zadXH7D6gZh23Vv83TPsLrCutsd/mDfUiBfT9BUhxKnZI7yW+3uhvVDTnRMfSYPVlges3vRVwMor7WlwHaef37ox/hp/U/PzkL26DCS9Me7jYRHGzG6yTTAKjX2B2ubhZ63uOXetR2oQJOxMJ2CZiqPtBObObG49Zh1P3XvvQzkZhtySW93cp+ghr1D4dC125PoPJgqb4nUeKFOwe+6vjtdOuQ9d+LIwMudJR43rLSo+u1D7pNJhem6XMSkqMe2NLQX6FdXMjJa7WB+0Bzgtq+FFqYqjefF+J3GX+66rtpzHReUnh/1yobNOvNjU/IZ4PHp6+BsliAFdK/3wvp3FrXScO5cSDredl+V/rlz8BBnqpk4uKV4KqXjKehafQ5v8KU5mzTzEK+5Z2YtCd7UXqgqc4Yub/CQo1VqpYgX2ViziYUrm7gLN332FHXHXyMAWG5jSwSS6vVxy4YQZmr1irc6rNFUc83iFIVppfeqxd4sB8LXheL34+mXTn2s8nvcw2qjKM7FswuPnRI6rx6WFE6SF+IM6KdCLydl566vBSn7T/2BqsL6T5TPa8FW31Y5NZj9fcut0W8c+TLDy8= 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?D2oRpsRGQ6e07CAQgLdNZdJ?= =?iso-8859-2?q?JoaEDr8I/yP/Y38eF32rjggewr0Yz490RtScwN9l0VfqzO0hOJTxhJ7HimEv?= =?iso-8859-2?q?qQ7yfi0z8MnsAf/72I2U8VWQoirKefawG0Lt6WjMsU806He1/t41eAQo36eH?= =?iso-8859-2?q?6EaVxt8GdnrrVcqhxHKhrWbuGkhAqeZqboB+Pt/ec9ylEPwNmpFEa9NuZI9m?= =?iso-8859-2?q?yu8dKTv4yAbxqBDoA/oHQC7PnEJCBYZpAeyE5L2LNtGKAtoKB5O50ZZP5Abu?= =?iso-8859-2?q?h5Sbj9Fbpv6WStoUB0/n85GoJ83ZqurbnlrO7qKfMcHMe6Wd9PIBWK4Xox0O?= =?iso-8859-2?q?RFUQeoT/K1jrD4/umLc0gPI5QxXPtXleVvam6lQUgI9Q9yvTIwzKoHcsSQcZ?= =?iso-8859-2?q?djQg+ZzO8bzVgfUbnprSyyLoQdyXpjK5h9diSZXAtUmNFBw/OIlgIzhLDWuf?= =?iso-8859-2?q?uKtjGcXXsTHVGmxzEAhMkDJOTzbhrx4BNpHeiNq25w/1QCy//oWxd2Kvjkva?= =?iso-8859-2?q?W/G1VgHojx+EOYGqbD65QkgdFXWWnMFKDm2RlzNrtglKHn7ohoS1kh2GbbXy?= =?iso-8859-2?q?jklToU9nOmaTIPsJQuoyBgzBSIFhvrESMQQHX4gw5BnUUdtc2R16LEC+rrQq?= =?iso-8859-2?q?BCxe1A2+WKj83aexPwkvOMNAuQrj735ob2H4VUzrfXHSQ009yFNVMlhHooZt?= =?iso-8859-2?q?T3dWjvD3Yt3SpQgW1t7z6fc6RXoMl/hMcpHO3pkbhp58PgJdUnDDhxut8xKI?= =?iso-8859-2?q?RNusMq3t+pNU7P6cF1vYHDKfkbv3ty1s9P7u4layKvZ2OZRQLtXlYrS3HSPd?= =?iso-8859-2?q?fnK9VwZYyYP0Ggr41P/Z9JzSyXTNxSIUJF5QEeMQ6OT/lRYcHZRjLKd3HzfV?= =?iso-8859-2?q?9fz1/vayd6ylF0HEKETKtCdht6tvRb2fUow438IP7V5eIqYNqEeJpDPxUV6N?= =?iso-8859-2?q?V543L834EcPIfNRz4R5HQ7ItgIDy3KhM2CVkKSIHoFNHXStgCUf2TdnKwlv1?= =?iso-8859-2?q?qPc0Nv+MX1Pa4Pt3wR333EMblZKKeYIOHx/pXbVfutXfJ5Lt/RSlkwTuket/?= =?iso-8859-2?q?SUtTS4N2r/fOxm4O3LtmfDOOgFERXMybJ+njDxwtgiYEXujSdR1Fk7Nvlnh2?= =?iso-8859-2?q?WaTcJnp8hnI2fISYZMWdunAO9CIaRtF7wJW637Loa6fG3xzicajquKETS9SS?= =?iso-8859-2?q?iNPiUhU+zV+Pzw48VfIT2kYhkeB53NbjU0UuzzvIiCdqaT5W3ZGfaaaXuL1F?= =?iso-8859-2?q?a4VEJKl08VbGo703XkijWKSBkJSvGsr1RdtqXbbZUlUhIAn2J/TMQJ7Yzg5j?= =?iso-8859-2?q?ESiRASwdZO5hUWC1uXRrZ8jTm0GKNGqnY/4uUhtFVUlij8dkLh+xslTRwcRD?= =?iso-8859-2?q?I4i8TRtPwDCgVdlHYUexbL6YxsCivXlMH0WvHnqb4uj1+9GxIQQMinwEKtp3?= =?iso-8859-2?q?e4qL/eWicjhuaJB0ZjAE4ykpGTiFa/n1dbev2toaQbTXhUTWvUOwQ9aUbicr?= =?iso-8859-2?q?WmnP7KKd1Daax0qIHEvLa7mkxdmohe8o5lIYo7Epp5uXhxeoK1kcDw+3RdQv?= =?iso-8859-2?q?Ec2BMFHztQr9oDv3WmO0nl3zpgjc7TIwnFlNtSFD1kmCbQwDnTWDeJVE=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: fe252d37-aec4-4007-23dc-08dc44084c00 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Mar 2024 09:22:40.4358 (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: eV0YeoDdcV9nnL0ijYFo2OZ6IVak3q8Tq2rE5l1+WCIZCIivy0AQSziPvTRjv5Mj107wbML/ECodpEn3UmNSVQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P193MB0815 X-Proofpoint-GUID: M15zKeYRVbf2zqUkC-18se7LIy4daCJa X-Proofpoint-ORIG-GUID: M15zKeYRVbf2zqUkC-18se7LIy4daCJa 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_07,2024-03-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 phishscore=0 adultscore=0 lowpriorityscore=0 mlxlogscore=999 priorityscore=1501 impostorscore=0 spamscore=0 bulkscore=0 suspectscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2402120000 definitions=main-2403140065 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: c97EHfNGR5dT avformat: enable UDP IPv6 multicast interface selection 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(-) -- 2.41.0.windows.2 This message has been marked as Public on 03/14/2024 09:22Z. 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..9b8ca74282 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) { + perror("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)