From patchwork Wed Mar 20 09:28:30 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: 47265 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8ba5:b0:1a3:31a3:7958 with SMTP id m37csp253617pzh; Wed, 20 Mar 2024 02:28:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV7KrSMAMm8qzhWFeslSl9UP+Sb7VgsaooIzeg5tN2NO/3CXrGHdfgHVKWZHDCMHK32jukoX/VjFCmj95gzob3GzBiAQJxVfY4rRA== X-Google-Smtp-Source: AGHT+IFBwKaqHT/zQNRbFikk6R0rtNwt4zG750l7lACdxaVpMUcv43ajYaABLge8B377eM0RWGtg X-Received: by 2002:ac2:5bce:0:b0:513:e375:12c1 with SMTP id u14-20020ac25bce000000b00513e37512c1mr3500779lfn.41.1710926927183; Wed, 20 Mar 2024 02:28:47 -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 fj16-20020a0564022b9000b0056bb698acd0si151742edb.207.2024.03.20.02.28.46; Wed, 20 Mar 2024 02:28:47 -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 1F2FB68D424; Wed, 20 Mar 2024 11:28:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx0b-00172501.pphosted.com (mx0b-00172501.pphosted.com [67.231.156.187]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 825866801B4 for ; Wed, 20 Mar 2024 11:28:36 +0200 (EET) Received: from pps.filterd (m0215691.ppops.net [127.0.0.1]) by mx0a-00172501.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 42K9JUvN008733 for ; Wed, 20 Mar 2024 02:28:34 -0700 Received: from eur05-am6-obe.outbound.protection.outlook.com (mail-am6eur05lp2104.outbound.protection.outlook.com [104.47.18.104]) by mx0a-00172501.pphosted.com (PPS) with ESMTPS id 3wykde8tm9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 20 Mar 2024 02:28:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mY+0ML0JxN0s4TPNZfI+20YKIPVDENz4HgE5sXvWxI8z/Iq7JIwr3Mx1V7TZNEeXbuwaFvOM+2bB7+Dwy6GYKZdxJNogIC6ouspalB/G7YwMbcguUDguspUwEh70AiBvXYfAc1i7UGG+eUcf3rA1yp+1VDX0HLD+cdIuA8j1d8HEWTbDtxLBqQKG5tvCvfUch9Z6I4DqIxI5y4fITZPyxd8j64kiPT2b1ZSQ4lBUxU6Z8fJIpSV6N0GhGBtGj1imXE8lEdxTJI2O7ifTvVUtoWxEnxOZ+FYa2VQSVnyaeog4Yz68gVSmjrYb9kpZ2fvgQ0i0zqO34k2wcMDzlpUFjQ== 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=cb2u3Cbl1VcGTyGosyGd9OmlP3NzgyG8NlenrRFs+nQ=; b=W0dxSrdIk+GpAZRIWmSn5bwkOezUVuDtq6COcBmzzGutc0ZuzbkopUcQLAjfIjf9dbUz8jq9m3wVL33E47/Pd9XN8kVHPfd+PGiQQ2oGV6AqbiugrueQIlemaEZyJche+P7oBqGLeT6+/2QPIlSaL+RXMcfuAKKysE6179FT7juNLeB4sXAHjYbQPAFJz0OKnqSha/rWQJgsSwBl6d/mNVp3hfCEjHOZaCkyUhmYNddpcjrOkxU48KiptaK99o+Vb8BPYndeQ2F/55U8jIIqKLfBOjPT3sHjzuCL2borQrpTWIrBI6ORq6f64R1kaoudoLC3lnths90StaiILbzI9Q== 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 AM9P193MB1046.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:1f4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.30; Wed, 20 Mar 2024 09:28:30 +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.025; Wed, 20 Mar 2024 09:28:30 +0000 From: =?iso-8859-2?q?Ignjatovi=E6=2C_Lazar_=28RS=29?= To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v2] avformat: enable UDP IPv6 multicast interface selection Thread-Index: AQHaeqj4aryzhQ+5iEWJ96Mew8ypAw== Date: Wed, 20 Mar 2024 09:28:30 +0000 Message-ID: References: <20240319012356.GJ6420@pb2> In-Reply-To: <20240319012356.GJ6420@pb2> 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=b94513f9-520f-4878-ad5a-8a275ffe518a; 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-20T09:27:33Z; 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_|AM9P193MB1046:EE_ x-ms-office365-filtering-correlation-id: b73aa94b-0f96-41c0-f8b6-08dc48c01b1e x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 4DP5Fqs/4EeODJCoB0AlVJ9ihi/PAT3+yY5qapM9M6y7jFTc4qt0uSenn8yL3oHvkjBzo9MwILiFgdFr/tu3XT9xeXexArnjhTnguKaXr4hIu5KS88IUdHnuySoSsQfc7VhM+52o2yqA60QseqvyIloH/5IV82du5mlV1bB2C5+1Q4WqcM4wT1QR4+OB1t90up2IQ6paWBlN9W+zZvLcAegwcu7As+niBr0TweVHDkRlhKP9kQp0tWeMWGjL2KWsNJP2kPTYw3FW1pKUXdHJ4JFdlGwifMl+eEqVNKwwqnKcw98JOHE5wGEmIvSR4FbMeSY7oc+mRzWo0QS2LG1wHVO3ZkeuCm+Tf/AWE45KOqSB6IygVYuxe7XJxAAjQY2xfJImNfs9zXfruzQf723nxSXhUE5WRJp3k4ZtH6yX4YjhM1TeFja0xL1no4J7xH2E/daCOcesWqLOqfKYPEumuoHuD0z73+si9m9mJDbyUoxHxMBUR41INwfO2JES8SFIuCPYOPkI8/OebOZgMX+1TpQamA595pjxyL0l9kRTXb8Cn7K/6r0UiImIa/RUHu3OPuHHlLxvwhI9B+87RSYATgkBg4LN61tlkQduREnZa752G2rbeCos8gNUYVliiGUVS+bFIQDfIl/VtsMnNrgEiWQWgOuXAaT3UWOFdh4ckxXMXkdObW7hrsdH7pG+fqOzXPaTAajj8Le729MrdPyw0eykEf96sUPpV+6H7jV48hY= 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)(1800799015)(376005)(366007)(38070700009); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-2?q?CDZdldpwOHJuQTWuwRM5zHW?= =?iso-8859-2?q?6f/nydqWzKYr4fDkgIZbONq0DmPGI0YgLVRI8u6ofQ+nXDc4Qo0QEOSnaIJh?= =?iso-8859-2?q?VPFUv5bgSqSEZiZjyeybEXDpF8Uei9oJo/zLb8DwTuYaDWsOHOu8BCVDXTQO?= =?iso-8859-2?q?wHFSIrqhiqgV9R8q9CgX7pn0fcpGJ+HCindU4S7FHzzoPiQDVoFtmULgBm7A?= =?iso-8859-2?q?zlH4MSvuP3daPgsReQkwhOBTJ2P2jCrC6biQ4rWv7aHgeGMIvxsf0YiHxdZ0?= =?iso-8859-2?q?KOcxTm6a+gMllaQ7Q3hpChA91b7A+G+vPJt+9BIT8OkLSpNHQ0Tdzi8K9gO2?= =?iso-8859-2?q?JwzFQhGGEu6HjtBXyLNhQuwFUueE3sYE5xd0iulxbwq1N+oJZPQDrxKC5E94?= =?iso-8859-2?q?EcVaN7lWDvezUhvallj3oxZfasWovfOA9faSuLrC7wQ4bWdY0J1hA1ET3d0P?= =?iso-8859-2?q?lWsxqwFG3y2TQAftT9ped1U7Dd6K9nDchHo3hS87k3umvKhTrQFqJgK/PoSk?= =?iso-8859-2?q?k4EGLQAO/BZS7jd6EcEifq+4eCZjmQ1SXijOKUZ6ou97nGDrsj5mM2DLK7yk?= =?iso-8859-2?q?bh+oyY9kmUDPbBySBnD90HZPF3Gy0rhdtPo2d8prpByAmpZa1rbqlCEsu4qo?= =?iso-8859-2?q?lViIeBTDzEps0ZU4YTEBQxh7evfkEsXFFymCEZxoZMhII+CKd4tYhDdeAXsk?= =?iso-8859-2?q?Nw6dIPD7bMNqYmEyL/XX/1ibEyp3Gy/HZUgIZGEuwKqTNRTd+NG0EjPPz5QY?= =?iso-8859-2?q?6MCn9r33+JrB0u/R3PRxet1DZ4iJWP5MmDkkKezlyVONDsiWX7GG+LRfJLll?= =?iso-8859-2?q?DclpveNAIHscGiA2papghziyokckPLylKcDGQjI9PPoVZM7faqa8NAaQEt0Q?= =?iso-8859-2?q?M81iZW76u2QQ8P1OrxW2YTKxzUVg99Z4HW7ZAZlRke9g6lgEMUe4bU8MgpJO?= =?iso-8859-2?q?KrVs7GGlyZ20BwEvpR0NltAEOoDARQmlWQ4W3f9yHc1FlomzY0HcNb+p8aG8?= =?iso-8859-2?q?c737xtV2yZ9E/a3J0Vku3SL00Het0duDjR0WWdsYubDdXeWX9UYs+vy7jQpT?= =?iso-8859-2?q?+J0t17tY6AD4Af527WFaEFscHpUS1qNKt7YktUo2NJBr67+sc5Zid+D8cH0a?= =?iso-8859-2?q?8Kw03/xCA0ARJTDRMzO/mmpkl6Yu2n7yALPEBZyuR7p8s7g+VQxeCOrPlPbF?= =?iso-8859-2?q?tTziivDW2AcciStOU+aCNMwSeZHtu3BsE9Z3mtypnBdEE6zzMfuCjfMNZstM?= =?iso-8859-2?q?NKZ9x0aM1MziUpIQKafbDLrUFpLIZG3NBLLVprTn6mUImOc+x91CxsHsAylb?= =?iso-8859-2?q?Kao0ujrChdOzM9UpxSC0NQFgglPEcyQkbuoXIKrLbnf/6hc7saPPnbSiRiHu?= =?iso-8859-2?q?f7IK6R9So/8LIAwxDhhofhVIyfUcnmz7JrUepRvj4FvUJtxTeEYCitDXFc5p?= =?iso-8859-2?q?xQIYOFQqpHbyrGqkoOwKSciWCKAqZ5MDkkGWbi+WxAIniDmVEXiVuyXvo9Nq?= =?iso-8859-2?q?tOeXPKsheKS1XoLXLJIFM9dYm0mG7mi2a8ZDu0rHlgMrsdJZGetMC3t2P8y+?= =?iso-8859-2?q?lj6HNe+S5Jl7pe0+Yr/hkMxMB0z/Ay24fOFIG2so6c9B1Fh4iAvT4n5I=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: b73aa94b-0f96-41c0-f8b6-08dc48c01b1e X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Mar 2024 09:28:30.5259 (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: XWLeG6Fr5y3nn2fyBGSeZgiR0zvdcGXwOyzPrH3cRRljJT5tsZN3Jg/shZu1A3fg9jukKY0oQzRwQG/XwAkZrw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9P193MB1046 X-Proofpoint-ORIG-GUID: zrRU4zqYkEL0sgRMYUMlRC1WmaeJPW9e X-Proofpoint-GUID: zrRU4zqYkEL0sgRMYUMlRC1WmaeJPW9e 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-20_06,2024-03-18_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 suspectscore=0 adultscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2403140001 definitions=main-2403200075 Subject: [FFmpeg-devel] [PATCH v2] 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: CZcJCk3NcLSn 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). Adjusted binding for multicast 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. Utilization of sin6_scope_id field enables usage and adequate resolving of localaddr 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 Signed-off-by: Marton Balint Signed-off-by: Marton Balint --- V1 -> V2: SO_BINDTODEVICE -> sin6_scope_id, addressed comments configure | 3 ++ libavformat/ip.c | 49 ++++++++++++++++++++++++++ libavformat/ip.h | 6 ++++ libavformat/network.h | 6 ++++ libavformat/udp.c | 81 ++++++++++++++++++++++++++++++++++++++----- 5 files changed, 137 insertions(+), 8 deletions(-) -- 2.41.0.windows.2 This message has been marked as Public on 03/20/2024 09:28Z. 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..4b83e79298 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,49 @@ 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 && defined(IN6_IS_ADDR_LINKLOCAL) + /* Special case for link-local addresses, relevant interface is stored in sin6_scope_id */ + if (local_addr->ss_family == AF_INET6) { + iface = ((struct sockaddr_in6*)local_addr)->sin6_scope_id; + if (iface != 0) + return iface; + } +#endif /* HAVE_STRUCT_SOCKADDR_IN6 && defined(IN6_IS_ADDR_LINKLOCAL) */ + 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..c2420a7f0d 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,43 @@ 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; + + if (local_addr) + iface = ff_ip_resolve_interface_index((struct sockaddr_storage *)local_addr); + else + iface = ((struct sockaddr_in6*)local_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 +290,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 +317,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 +873,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 +914,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)