cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"now that we have struct ip_mreqn, start using that to avoid multiple"

Browse Source 
multicast errors, form www/chromium robert@
This commit is contained in:
rsadowski 2021-01-28 11:51:25 +00:00
parent 7ec89947a7
commit 3f51413281
2 changed files with 3 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/qt5/qtwebengine/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2021/01/19 06:16:32 rsadowski Exp $
# $OpenBSD: Makefile,v 1.13 2021/01/28 11:51:25 rsadowski Exp $
USE_WXNEEDED = Yes
@ -15,6 +15,7 @@ COMMENT = Chromium-based web engine for Qt5
# Many parts are copied from www/chromium port, so keep in sync
QT5NAME = QtWebEngine
REVISION = 0
CATEGORIES = www

78
x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_net_socket_udp_socket_posix_cc
View File

@ -1,17 +1,8 @@
$OpenBSD: patch-src_3rdparty_chromium_net_socket_udp_socket_posix_cc,v 1.2 2021/01/19 06:16:34 rsadowski Exp $
$OpenBSD: patch-src_3rdparty_chromium_net_socket_udp_socket_posix_cc,v 1.3 2021/01/28 11:51:25 rsadowski Exp $
Index: src/3rdparty/chromium/net/socket/udp_socket_posix.cc
--- src/3rdparty/chromium/net/socket/udp_socket_posix.cc.orig
+++ src/3rdparty/chromium/net/socket/udp_socket_posix.cc
@@ -70,7 +70,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE
const base::TimeDelta kActivityMonitorMsThreshold =
base::TimeDelta::FromMilliseconds(100);
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_BSD)
// When enabling multicast using setsockopt(IP_MULTICAST_IF) MacOS
// requires passing IPv4 address instead of interface index. This function
// resolves IPv4 address by interface index. The |address| is returned in
@@ -653,7 +653,7 @@ int UDPSocketPosix::SetDoNotFragment() {
}
@ -21,70 +12,3 @@ Index: src/3rdparty/chromium/net/socket/udp_socket_posix.cc
if (confirm) {
sendto_flags_ |= MSG_CONFIRM;
} else {
@@ -674,13 +674,16 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
int value = broadcast ? 1 : 0;
int rv;
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_BSD)
// SO_REUSEPORT on OSX permits multiple processes to each receive
// UDP multicast or broadcast datagrams destined for the bound
// port.
// This is only being set on OSX because its behavior is platform dependent
// and we are playing it safe by only setting it on platforms where things
// break.
+ rv = setsockopt(socket_, SOL_SOCKET, SO_REUSEADDR, &value, sizeof(value));
+ if (rv != 0)
+ return MapSystemError(errno);
rv = setsockopt(socket_, SOL_SOCKET, SO_REUSEPORT, &value, sizeof(value));
if (rv != 0)
return MapSystemError(errno);
@@ -944,7 +947,7 @@ int UDPSocketPosix::SetMulticastOptions() {
if (multicast_interface_ != 0) {
switch (addr_family_) {
case AF_INET: {
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_BSD)
ip_mreq mreq = {};
int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
&mreq.imr_interface.s_addr);
@@ -956,7 +959,12 @@ int UDPSocketPosix::SetMulticastOptions() {
mreq.imr_address.s_addr = htonl(INADDR_ANY);
#endif // !defined(OS_MACOSX)
int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF,
+#if defined(OS_BSD)
+ reinterpret_cast<const char*>(&mreq.imr_interface.s_addr),
+ sizeof(mreq.imr_interface.s_addr));
+#else
reinterpret_cast<const char*>(&mreq), sizeof(mreq));
+#endif
if (rv)
return MapSystemError(errno);
break;
@@ -1018,7 +1026,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a
if (addr_family_ != AF_INET)
return ERR_ADDRESS_INVALID;
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_BSD)
ip_mreq mreq = {};
int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
&mreq.imr_interface.s_addr);
@@ -1066,9 +1074,17 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_
case IPAddress::kIPv4AddressSize: {
if (addr_family_ != AF_INET)
return ERR_ADDRESS_INVALID;
+#if defined(OS_BSD)
+ ip_mreq mreq = {};
+ int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
+ &mreq.imr_interface.s_addr);
+ if (error != OK)
+ return error;
+#else
ip_mreqn mreq = {};
mreq.imr_ifindex = multicast_interface_;
mreq.imr_address.s_addr = INADDR_ANY;
+#endif
memcpy(&mreq.imr_multiaddr, group_address.bytes().data(),
IPAddress::kIPv4AddressSize);
int rv = setsockopt(socket_, IPPROTO_IP, IP_DROP_MEMBERSHIP,