1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
--- net/socket/udp_socket_posix.cc.orig 2018-12-03 21:17:07.000000000 +0100
+++ net/socket/udp_socket_posix.cc 2018-12-14 00:43:45.072257000 +0100
@@ -68,7 +68,7 @@
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
@@ -97,7 +97,7 @@
return OK;
}
-#endif // OS_MACOSX
+#endif // OS_MACOSX || OS_BSD
#if defined(OS_MACOSX) && !defined(OS_IOS)
@@ -632,13 +632,13 @@
}
void UDPSocketPosix::SetMsgConfirm(bool confirm) {
-#if !defined(OS_MACOSX) && !defined(OS_IOS)
+#if !defined(OS_MACOSX) && !defined(OS_IOS) && !defined(OS_BSD)
if (confirm) {
sendto_flags_ |= MSG_CONFIRM;
} else {
sendto_flags_ &= ~MSG_CONFIRM;
}
-#endif // !defined(OS_MACOSX) && !defined(OS_IOS)
+#endif // !defined(OS_MACOSX) && !defined(OS_IOS) && !defined(OS_BSD)
}
int UDPSocketPosix::AllowAddressReuse() {
@@ -653,17 +653,20 @@
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);
-#endif // defined(OS_MACOSX)
+#endif // defined(OS_MACOSX) || defined(OS_BSD)
rv = setsockopt(socket_, SOL_SOCKET, SO_BROADCAST, &value, sizeof(value));
return rv == 0 ? OK : MapSystemError(errno);
@@ -901,19 +904,24 @@
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);
if (error != OK)
return error;
-#else // defined(OS_MACOSX)
+#else // defined(OS_MACOSX) || defined(OS_BSD)
ip_mreqn mreq = {};
mreq.imr_ifindex = multicast_interface_;
mreq.imr_address.s_addr = htonl(INADDR_ANY);
-#endif // !defined(OS_MACOSX)
+#endif // !defined(OS_MACOSX) || defined(OS_BSD)
int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF,
+#ifdef 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;
@@ -975,7 +983,7 @@
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);
|
