From b919d226b1b8e2ae64dbecd79a8f95b2f2e959d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Sun, 21 Mar 2021 12:57:10 +0200
Subject: [PATCH] threadshare: Update to socket2 0.4

---
 deny.toml                              |  7 +++++++
 generic/threadshare/Cargo.toml         |  5 +----
 generic/threadshare/src/udpsink/imp.rs | 12 ++++++------
 generic/threadshare/src/udpsrc/imp.rs  | 12 ++++++------
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/deny.toml b/deny.toml
index 84af2e1f..db76739b 100644
--- a/deny.toml
+++ b/deny.toml
@@ -124,6 +124,13 @@ version = "0.3"
 name = "ansi_term"
 version = "0.11"
 
+# ignore duplicated socket2 dependency because hyper and miow depend on an old version
+# https://github.com/yoshuawuyts/miow/pull/44
+# https://github.com/hyperium/hyper/pull/2472
+[[bans.skip]]
+name = "socket2"
+version = "0.3"
+
 [sources]
 unknown-registry = "deny"
 unknown-git = "deny"
diff --git a/generic/threadshare/Cargo.toml b/generic/threadshare/Cargo.toml
index 79201e0f..2fa34458 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 12caf91e..c9a1e519 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 442a00fc..8e0e63f9 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| {