switch to socket2

net2 has been deprecated for some time now

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

lib/Cargo.toml

@@ -27,7 +27,7 @@ include = [
 rand = "^0.8"
 url = "^2.1"
 log = "^0.4"
-net2 = "^0.2"
+socket2 ={ version =  "^0.4", features = [ "all" ] }
 time = "^0.3"
 mio = { version = "^0.7", features = [ "os-poll", "os-ext", "net" ] }
 libc = "^0.2"

lib/src/http.rs

@@ -1407,7 +1407,7 @@ impl Listener {
         }
 
         let mut listener = tcp_listener.or_else(|| {
-            server_bind(&self.config.address)
+            server_bind(self.config.address)
                 .map_err(|e| {
                     error!(
                         "could not create listener {:?}: {:?}",

lib/src/https_openssl.rs

@@ -1589,7 +1589,7 @@ impl Listener {
         }
 
         let mut listener = tcp_listener.or_else(|| {
-            server_bind(&self.config.address)
+            server_bind(self.config.address)
                 .map_err(|e| {
                     error!(
                         "could not create listener {:?}: {:?}",

lib/src/https_rustls/configuration.rs

@@ -185,7 +185,7 @@ impl Listener {
         }
 
         let mut listener = tcp_listener.or_else(|| {
-            server_bind(&self.config.address)
+            server_bind(self.config.address)
                 .map_err(|e| {
                     error!(
                         "could not create listener {:?}: {:?}",

lib/src/lib.rs

@@ -153,14 +153,14 @@ extern crate hdrhistogram;
 extern crate libc;
 extern crate log;
 extern crate mio;
-extern crate net2;
 #[cfg(feature = "use-openssl")]
 extern crate openssl;
 extern crate pool as pool_crate;
 extern crate rand;
 extern crate rustls;
 extern crate rusty_ulid;
 extern crate slab;
+extern crate socket2;
 extern crate time;
 extern crate url;
 #[macro_use]

lib/src/socket.rs

@@ -1,9 +1,8 @@
 use mio::net::{TcpListener, TcpStream};
-use net2::unix::UnixTcpBuilderExt;
-use net2::TcpBuilder;
 #[cfg(feature = "use-openssl")]
 use openssl::ssl::{ErrorCode, SslStream, SslVersion};
 use rustls::{ProtocolVersion, ServerSession, Session};
+use socket2::{Domain, Protocol, Socket, Type};
 use std::io::{self, ErrorKind, Read, Write};
 use std::net::SocketAddr;
 
@@ -444,27 +443,25 @@ impl SocketHandler for FrontRustls {
     }
 }
 
-pub fn server_bind(addr: &SocketAddr) -> io::Result<TcpListener> {
-    let sock = match *addr {
-        SocketAddr::V4(..) => TcpBuilder::new_v4()?,
-        SocketAddr::V6(..) => TcpBuilder::new_v6()?,
-    };
+pub fn server_bind(addr: SocketAddr) -> io::Result<TcpListener> {
+    let sock = Socket::new(Domain::for_address(addr), Type::STREAM, Some(Protocol::TCP))?;
 
     // set so_reuseaddr, but only on unix (mirrors what libstd does)
     if cfg!(unix) {
-        sock.reuse_address(true)?;
+        sock.set_reuse_address(true)?;
     }
 
-    sock.reuse_port(true)?;
+    sock.set_reuse_port(true)?;
 
     // bind the socket
-    sock.bind(addr)?;
+    let addr = addr.into();
+    sock.bind(&addr)?;
+
+    sock.set_nonblocking(true)?;
 
     // listen
     // FIXME: make the backlog configurable?
-    let listener = sock.listen(1024)?;
-
-    listener.set_nonblocking(true)?;
+    sock.listen(1024)?;
 
-    Ok(TcpListener::from_std(listener))
+    Ok(TcpListener::from_std(sock.into()))
 }

lib/src/tcp.rs

@@ -1060,7 +1060,7 @@ impl Listener {
         }
 
         let mut listener = tcp_listener.or_else(|| {
-            server_bind(&self.config.address)
+            server_bind(self.config.address)
                 .map_err(|e| {
                     error!(
                         "could not create listener {:?}: {:?}",