diff --git a/Cargo.lock b/Cargo.lock index b2bd7cd0c..469c976f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1907,7 +1907,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite 0.2.7", - "socket2 0.4.1", + "socket2", "tokio 1.9.0", "tower-service", "tracing", @@ -4279,18 +4279,6 @@ dependencies = [ "time 0.2.25", ] -[[package]] -name = "socket2" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.1.56", - "winapi 0.3.9", -] - [[package]] name = "socket2" version = "0.4.1" @@ -5268,7 +5256,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_derive", - "socket2 0.3.17", + "socket2", "solana-clap-utils", "solana-logger 1.8.0", "solana-sdk", diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml index 3c8b6032d..92c9f9ca5 100644 --- a/net-utils/Cargo.toml +++ b/net-utils/Cargo.toml @@ -17,7 +17,7 @@ nix = "0.20.0" rand = "0.7.0" serde = "1.0.127" serde_derive = "1.0.103" -socket2 = "0.3.17" +socket2 = "0.4.1" solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" } solana-logger = { path = "../logger", version = "=1.8.0" } solana-sdk = { path = "../sdk", version = "=1.8.0" } diff --git a/net-utils/src/lib.rs b/net-utils/src/lib.rs index 55d702bae..663525bbd 100644 --- a/net-utils/src/lib.rs +++ b/net-utils/src/lib.rs @@ -384,7 +384,7 @@ fn udp_socket(reuseaddr: bool) -> io::Result { use nix::sys::socket::sockopt::{ReuseAddr, ReusePort}; use std::os::unix::io::AsRawFd; - let sock = Socket::new(Domain::ipv4(), Type::dgram(), None)?; + let sock = Socket::new(Domain::IPV4, Type::DGRAM, None)?; let sock_fd = sock.as_raw_fd(); if reuseaddr { @@ -420,7 +420,7 @@ pub fn bind_in_range(ip_addr: IpAddr, range: PortRange) -> io::Result<(u16, UdpS let addr = SocketAddr::new(ip_addr, port); if sock.bind(&SockAddr::from(addr)).is_ok() { - let sock = sock.into_udp_socket(); + let sock: UdpSocket = sock.into(); return Result::Ok((sock.local_addr().unwrap().port(), sock)); } } @@ -482,8 +482,7 @@ pub fn bind_to(ip_addr: IpAddr, port: u16, reuseaddr: bool) -> io::Result io::Result { diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 8180efeef..2d93ed03d 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -1181,7 +1181,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite 0.2.7", - "socket2 0.4.1", + "socket2", "tokio", "tower-service", "tracing", @@ -2370,18 +2370,6 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" -[[package]] -name = "socket2" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.1.56", - "winapi", -] - [[package]] name = "socket2" version = "0.4.1" @@ -3039,7 +3027,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_derive", - "socket2 0.3.17", + "socket2", "solana-clap-utils", "solana-logger 1.8.0", "solana-sdk",