From 49475c22b2a07c19bf7e6d3247a23ba1e9eb30dc Mon Sep 17 00:00:00 2001
From: Thomas de Zeeuw <thomasdezeeuw@gmail.com>
Date: Fri, 19 Mar 2021 13:16:57 +0100
Subject: [PATCH] Update to socket2 v0.4

---
 perf/Cargo.toml  |  2 +-
 perf/src/lib.rs  | 11 ++---------
 quinn/Cargo.toml |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/perf/Cargo.toml b/perf/Cargo.toml
index 809538da7..494d49964 100644
--- a/perf/Cargo.toml
+++ b/perf/Cargo.toml
@@ -13,7 +13,7 @@ hdrhistogram = { version = "7.2", default-features = false }
 quinn = { path = "../quinn" }
 rcgen = "0.8"
 rustls = { version = "0.19", features = ["dangerous_configuration"] }
-socket2 = "0.3"
+socket2 = "0.4"
 webpki = "0.21"
 structopt = "0.3"
 tokio = { version = "1.0.1", features = ["rt", "macros", "signal", "net", "sync"] }
diff --git a/perf/src/lib.rs b/perf/src/lib.rs
index 466932298..6feba17c4 100644
--- a/perf/src/lib.rs
+++ b/perf/src/lib.rs
@@ -9,15 +9,8 @@ pub fn bind_socket(
     send_buffer_size: usize,
     recv_buffer_size: usize,
 ) -> Result<std::net::UdpSocket> {
-    let socket = Socket::new(
-        match addr.is_ipv4() {
-            true => Domain::ipv4(),
-            false => Domain::ipv6(),
-        },
-        Type::dgram(),
-        Some(Protocol::udp()),
-    )
-    .context("create socket")?;
+    let socket = Socket::new(Domain::for_address(addr), Type::DGRAM, Some(Protocol::UDP))
+        .context("create socket")?;
 
     if addr.is_ipv6() {
         socket.set_only_v6(false).context("set_only_v6")?;
diff --git a/quinn/Cargo.toml b/quinn/Cargo.toml
index 718639e0c..c1b536e2f 100644
--- a/quinn/Cargo.toml
+++ b/quinn/Cargo.toml
@@ -36,7 +36,7 @@ libc = "0.2.69"
 mio = { version = "0.7.7", features = ["net"] }
 proto = { package = "quinn-proto", path = "../quinn-proto", version = "0.7" }
 rustls = { version = "0.19", features = ["quic"], optional = true }
-socket2 = "0.3"
+socket2 = "0.4"
 thiserror = "1.0.21"
 tracing = "0.1.10"
 tokio = { version = "1.0.1", features = ["net", "rt", "rt-multi-thread", "time"] }