| blob | c5e98a64a6a72f442a96a2dfffc67a5fd58c83cd |
1 --- gecko-dev-5f2c1701846a54c484d7dd46a291b796f5a67cac/third_party/rust/quinn-udp/.cargo-checksum.json.~1~ 2024-11-07 00:11:55.000000000 -0500
2 +++ gecko-dev-5f2c1701846a54c484d7dd46a291b796f5a67cac/third_party/rust/quinn-udp/.cargo-checksum.json 2024-11-07 18:46:10.309173135 -0500
3 @@ -1 +1 @@
4 -{"files":{"Cargo.toml":"865febc6bb7b0a6f4d0758779480f829f96fcd6a614b64db05b5ea53e902fd5c","LICENSE-APACHE":"c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4","LICENSE-MIT":"4b2d0aca6789fa39e03d6738e869ea0988cceba210ca34ebb59c15c463e93a04","benches/throughput.rs":"095137508f85b68174978ff968cade74587751484402ca09269ffc2631d97f34","build.rs":"8e81067cac9fbe675619c3314d5aa06d99cf54c332812a837a227eeab41c92e1","src/cmsg/mod.rs":"63d6ea7126341fededdaef14260a7eed715ad3f507d4da586dbab814f581a54d","src/cmsg/unix.rs":"7917bce2f3c8e844eca2e4cfea82669b2a31cf311321dc42532626db4ee42de8","src/cmsg/windows.rs":"6fb936ec4a283efc5796872e777441e3039c40589073865644a8ef7936af4f4b","src/fallback.rs":"6378c177db7ba0eb88115b63f1ec9e17b05f53b1daae2c1e215520f103145585","src/lib.rs":"9672bd2003d779c95d11a85d05a5dac5d421a9d5dcd9f1475de94aca93f23f73","src/unix.rs":"b8e595499055115d15bfb95259c0c585934adf55f61e365bcc9fc47ab8fa9cdd","src/windows.rs":"ab1928d18bed62162a0f2c96158d808d7a2962045ab47c9efa0ecf60e2a2c060","tests/tests.rs":"3ab6c02756098d3933542baff06fa1f2ad6bba11852466f6843b8a42a9cc97c0"},"package":"e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780"}
5 \ No newline at end of file
6 +{"files":{"Cargo.toml":"865febc6bb7b0a6f4d0758779480f829f96fcd6a614b64db05b5ea53e902fd5c","LICENSE-APACHE":"c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4","LICENSE-MIT":"4b2d0aca6789fa39e03d6738e869ea0988cceba210ca34ebb59c15c463e93a04","benches/throughput.rs":"095137508f85b68174978ff968cade74587751484402ca09269ffc2631d97f34","build.rs":"8e81067cac9fbe675619c3314d5aa06d99cf54c332812a837a227eeab41c92e1","src/cmsg/mod.rs":"63d6ea7126341fededdaef14260a7eed715ad3f507d4da586dbab814f581a54d","src/cmsg/unix.rs":"7917bce2f3c8e844eca2e4cfea82669b2a31cf311321dc42532626db4ee42de8","src/cmsg/windows.rs":"6fb936ec4a283efc5796872e777441e3039c40589073865644a8ef7936af4f4b","src/fallback.rs":"6378c177db7ba0eb88115b63f1ec9e17b05f53b1daae2c1e215520f103145585","src/lib.rs":"9672bd2003d779c95d11a85d05a5dac5d421a9d5dcd9f1475de94aca93f23f73","src/unix.rs":"6eb78083fddc5ff2f2389d939daf212f01292baf1bfb1007767a622afe88d3a3","src/windows.rs":"ab1928d18bed62162a0f2c96158d808d7a2962045ab47c9efa0ecf60e2a2c060","tests/tests.rs":"3ab6c02756098d3933542baff06fa1f2ad6bba11852466f6843b8a42a9cc97c0"},"package":"e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780"}
7 --- gecko-dev-5f2c1701846a54c484d7dd46a291b796f5a67cac/third_party/rust/quinn-udp/src/unix.rs.~1~ 2024-11-07 00:11:55.000000000 -0500
8 +++ gecko-dev-5f2c1701846a54c484d7dd46a291b796f5a67cac/third_party/rust/quinn-udp/src/unix.rs 2024-11-07 18:44:30.898973342 -0500
9 @@ -1,4 +1,4 @@
10 -#[cfg(not(any(apple, target_os = "openbsd", target_os = "solaris")))]
11 +#[cfg(not(any(apple, target_os = "openbsd", target_os = "solaris", target_os = "illumos")))]
12 use std::ptr;
13 use std::{
14 io::{self, IoSliceMut},
15 @@ -92,6 +92,7 @@
16 || cfg!(apple)
17 || cfg!(target_os = "android")
18 || cfg!(target_os = "solaris")
19 + || cfg!(target_os = "illumos")
20 {
21 cmsg_platform_space +=
22 unsafe { libc::CMSG_SPACE(mem::size_of::<libc::in6_pktinfo>() as _) as usize };
23 @@ -114,7 +115,7 @@
25 // mac and ios do not support IP_RECVTOS on dual-stack sockets :(
26 // older macos versions also don't have the flag and will error out if we don't ignore it
27 - #[cfg(not(any(target_os = "openbsd", target_os = "netbsd", target_os = "solaris")))]
28 + #[cfg(not(any(target_os = "openbsd", target_os = "netbsd", target_os = "solaris", target_os = "illumos")))]
29 if is_ipv4 || !io.only_v6()? {
30 if let Err(_err) =
31 set_socket_option(&*io, libc::IPPROTO_IP, libc::IP_RECVTOS, OPTION_ON)
32 @@ -163,7 +164,7 @@
33 )?;
34 }
35 }
36 - #[cfg(any(bsd, apple, target_os = "solaris"))]
37 + #[cfg(any(bsd, apple, target_os = "solaris", target_os = "illumos"))]
38 // IP_RECVDSTADDR == IP_SENDSRCADDR on FreeBSD
39 // macOS uses only IP_RECVDSTADDR, no IP_SENDSRCADDR on macOS (the same on Solaris)
40 // macOS also supports IP_PKTINFO
41 @@ -445,7 +446,7 @@
42 Ok(())
43 }
45 -#[cfg(not(any(apple, target_os = "openbsd", target_os = "solaris")))]
46 +#[cfg(not(any(apple, target_os = "openbsd", target_os = "solaris", target_os = "illumos")))]
47 fn recv(io: SockRef<'_>, bufs: &mut [IoSliceMut<'_>], meta: &mut [RecvMeta]) -> io::Result<usize> {
48 let mut names = [MaybeUninit::<libc::sockaddr_storage>::uninit(); BATCH_SIZE];
49 let mut ctrls = [cmsg::Aligned(MaybeUninit::<[u8; CMSG_LEN]>::uninit()); BATCH_SIZE];
50 @@ -512,7 +513,7 @@
51 Ok(msg_count as usize)
52 }
54 -#[cfg(any(target_os = "openbsd", target_os = "netbsd", apple_slow))]
55 +#[cfg(any(target_os = "openbsd", target_os = "netbsd", apple_slow, target_os = "illumos"))]
56 fn recv(io: SockRef<'_>, bufs: &mut [IoSliceMut<'_>], meta: &mut [RecvMeta]) -> io::Result<usize> {
57 let mut name = MaybeUninit::<libc::sockaddr_storage>::uninit();
58 let mut ctrl = cmsg::Aligned(MaybeUninit::<[u8; CMSG_LEN]>::uninit());
59 @@ -600,7 +601,7 @@
60 };
61 encoder.push(libc::IPPROTO_IP, libc::IP_PKTINFO, pktinfo);
62 }
63 - #[cfg(any(bsd, apple, target_os = "solaris"))]
64 + #[cfg(any(bsd, apple, target_os = "solaris", target_os = "illumos"))]
65 {
66 if encode_src_ip {
67 let addr = libc::in_addr {
68 @@ -677,7 +678,7 @@
69 ecn_bits = cmsg::decode::<u8, libc::cmsghdr>(cmsg);
70 },
71 // FreeBSD uses IP_RECVTOS here, and we can be liberal because cmsgs are opt-in.
72 - #[cfg(not(any(target_os = "openbsd", target_os = "netbsd", target_os = "solaris")))]
73 + #[cfg(not(any(target_os = "openbsd", target_os = "netbsd", target_os = "solaris", target_os = "illumos")))]
74 (libc::IPPROTO_IP, libc::IP_RECVTOS) => unsafe {
75 ecn_bits = cmsg::decode::<u8, libc::cmsghdr>(cmsg);
76 },