diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2021-03-21 13:57:10 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2021-03-21 13:57:10 +0300 |
| commit | b919d226b1b8e2ae64dbecd79a8f95b2f2e959d0 (patch) | |
| tree | 88ac1f519ffb34979e6ea4707e4995328408a139 /generic | |
| parent | d9e727050cb4e3086c8c9d3e54fd6761ac5341fc (diff) | |
threadshare: Update to socket2 0.4
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/threadshare/Cargo.toml | 5 | ||||
| -rw-r--r-- | generic/threadshare/src/udpsink/imp.rs | 12 | ||||
| -rw-r--r-- | generic/threadshare/src/udpsrc/imp.rs | 12 |
3 files changed, 13 insertions, 16 deletions
diff --git a/generic/threadshare/Cargo.toml b/generic/threadshare/Cargo.toml index 79201e0f3..2fa344589 100644 --- a/generic/threadshare/Cargo.toml +++ b/generic/threadshare/Cargo.toml @@ -19,14 +19,11 @@ once_cell = "1" tokio = { git = "https://github.com/fengalin/tokio", tag = "tokio-0.2.13-throttling", features = ["io-util", "macros", "rt-core", "sync", "stream", "time", "tcp", "udp", "rt-util"] } futures = { version = "0.3", features = ["thread-pool"] } rand = "0.8" -socket2 = "0.3" +socket2 = {features = ["all"], version = "0.4"} [target.'cfg(windows)'.dependencies] winapi = { version = "0.3", features = ["winsock2", "processthreadsapi"] } -[target.'cfg(unix)'.dependencies] -socket2 = { version = "0.3", features = ["reuseport"] } - [dev-dependencies] gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } gst-app = { package = "gstreamer-app", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } diff --git a/generic/threadshare/src/udpsink/imp.rs b/generic/threadshare/src/udpsink/imp.rs index 12caf91ea..c9a1e519a 100644 --- a/generic/threadshare/src/udpsink/imp.rs +++ b/generic/threadshare/src/udpsink/imp.rs @@ -778,14 +778,14 @@ impl UdpSink { let socket = match family { SocketFamily::Ipv4 => socket2::Socket::new( - socket2::Domain::ipv4(), - socket2::Type::dgram(), - Some(socket2::Protocol::udp()), + socket2::Domain::IPV4, + socket2::Type::DGRAM, + Some(socket2::Protocol::UDP), ), SocketFamily::Ipv6 => socket2::Socket::new( - socket2::Domain::ipv6(), - socket2::Type::dgram(), - Some(socket2::Protocol::udp()), + socket2::Domain::IPV6, + socket2::Type::DGRAM, + Some(socket2::Protocol::UDP), ), }; diff --git a/generic/threadshare/src/udpsrc/imp.rs b/generic/threadshare/src/udpsrc/imp.rs index 442a00fcb..8e0e63f93 100644 --- a/generic/threadshare/src/udpsrc/imp.rs +++ b/generic/threadshare/src/udpsrc/imp.rs @@ -511,15 +511,15 @@ impl UdpSrc { let socket = if addr.is_ipv4() { socket2::Socket::new( - socket2::Domain::ipv4(), - socket2::Type::dgram(), - Some(socket2::Protocol::udp()), + socket2::Domain::IPV4, + socket2::Type::DGRAM, + Some(socket2::Protocol::UDP), ) } else { socket2::Socket::new( - socket2::Domain::ipv6(), - socket2::Type::dgram(), - Some(socket2::Protocol::udp()), + socket2::Domain::IPV6, + socket2::Type::DGRAM, + Some(socket2::Protocol::UDP), ) } .map_err(|err| { |