YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade socket2

Browse source
This commit is contained in:
Joakim Frostegård 2021-08-15 23:32:59 +02:00
parent 1028dcc709
commit d172fc4f8c
9 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Cargo.lock generated
View file

@ -1530,11 +1530,10 @@ dependencies = [
[[package]] [[package]]
name = "socket2" name = "socket2"
version = "0.3.19" version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
dependencies = [ dependencies = [
"cfg-if",
"libc", "libc",
"winapi", "winapi",
] ]

2
aquatic_http/Cargo.toml
View file

@ -36,7 +36,7 @@ privdrop = "0.5"
rand = { version = "0.8", features = ["small_rng"] } rand = { version = "0.8", features = ["small_rng"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
smartstring = "0.2" smartstring = "0.2"
socket2 = { version = "0.3", features = ["reuseport"] } socket2 = { version = "0.4.1", features = ["all"] }
[dev-dependencies] [dev-dependencies]
quickcheck = "1.0" quickcheck = "1.0"

6
aquatic_http/src/lib/network/utils.rs
View file

@ -34,9 +34,9 @@ pub fn create_listener(
ipv6_only: bool, ipv6_only: bool,
) -> ::anyhow::Result<::std::net::TcpListener> { ) -> ::anyhow::Result<::std::net::TcpListener> {
let builder = if address.is_ipv4() { let builder = if address.is_ipv4() {
Socket::new(Domain::ipv4(), Type::stream(), Some(Protocol::tcp())) Socket::new(Domain::IPV4, Type::STREAM, Some(Protocol::TCP))
} else { } else {
Socket::new(Domain::ipv6(), Type::stream(), Some(Protocol::tcp())) Socket::new(Domain::IPV6, Type::STREAM, Some(Protocol::TCP))
} }
.context("Couldn't create socket2::Socket")?; .context("Couldn't create socket2::Socket")?;
@ -59,5 +59,5 @@ pub fn create_listener(
.listen(128) .listen(128)
.context("Couldn't listen for connections on socket")?; .context("Couldn't listen for connections on socket")?;
Ok(builder.into_tcp_listener()) Ok(builder.into())
} }

2
aquatic_udp/Cargo.toml
View file

@ -30,7 +30,7 @@ parking_lot = "0.11"
privdrop = "0.5" privdrop = "0.5"
rand = { version = "0.8", features = ["small_rng"] } rand = { version = "0.8", features = ["small_rng"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
socket2 = { version = "0.3", features = ["reuseport"] } socket2 = { version = "0.4.1", features = ["all"] }
[dev-dependencies] [dev-dependencies]
quickcheck = "1.0" quickcheck = "1.0"

6
aquatic_udp/src/lib/network.rs
View file

@ -88,9 +88,9 @@ pub fn run_socket_worker(
fn create_socket(config: &Config) -> ::std::net::UdpSocket { fn create_socket(config: &Config) -> ::std::net::UdpSocket {
let socket = if config.network.address.is_ipv4() { let socket = if config.network.address.is_ipv4() {
Socket::new(Domain::ipv4(), Type::dgram(), Some(Protocol::udp())) Socket::new(Domain::IPV4, Type::DGRAM, Some(Protocol::UDP))
} else { } else {
Socket::new(Domain::ipv6(), Type::dgram(), Some(Protocol::udp())) Socket::new(Domain::IPV6, Type::DGRAM, Some(Protocol::UDP))
} }
.expect("create socket"); .expect("create socket");
@ -116,7 +116,7 @@ fn create_socket(config: &Config) -> ::std::net::UdpSocket {
} }
} }
socket.into_udp_socket() socket.into()
} }
#[inline] #[inline]

2
aquatic_udp_load_test/Cargo.toml
View file

@ -21,7 +21,7 @@ parking_lot = "0.11"
rand = { version = "0.8", features = ["small_rng"] } rand = { version = "0.8", features = ["small_rng"] }
rand_distr = "0.4" rand_distr = "0.4"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
socket2 = { version = "0.3", features = ["reuseport"] } socket2 = { version = "0.4.1", features = ["all"] }
[dev-dependencies] [dev-dependencies]
quickcheck = "1.0" quickcheck = "1.0"

6
aquatic_udp_load_test/src/network.rs
View file

@ -15,9 +15,9 @@ const MAX_PACKET_SIZE: usize = 4096;
pub fn create_socket(config: &Config, addr: SocketAddr) -> ::std::net::UdpSocket { pub fn create_socket(config: &Config, addr: SocketAddr) -> ::std::net::UdpSocket {
let socket = if addr.is_ipv4() { let socket = if addr.is_ipv4() {
Socket::new(Domain::ipv4(), Type::dgram(), Some(Protocol::udp())) Socket::new(Domain::IPV4, Type::DGRAM, Some(Protocol::UDP))
} else { } else {
Socket::new(Domain::ipv6(), Type::dgram(), Some(Protocol::udp())) Socket::new(Domain::IPV6, Type::DGRAM, Some(Protocol::UDP))
} }
.expect("create socket"); .expect("create socket");
@ -42,7 +42,7 @@ pub fn create_socket(config: &Config, addr: SocketAddr) -> ::std::net::UdpSocket
.connect(&config.server_address.into()) .connect(&config.server_address.into())
.expect("socket: connect to server"); .expect("socket: connect to server");
socket.into_udp_socket() socket.into()
} }
pub fn run_socket_thread( pub fn run_socket_thread(

2
aquatic_ws/Cargo.toml
View file

@ -33,7 +33,7 @@ parking_lot = "0.11"
privdrop = "0.5" privdrop = "0.5"
rand = { version = "0.8", features = ["small_rng"] } rand = { version = "0.8", features = ["small_rng"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
socket2 = { version = "0.3", features = ["reuseport"] } socket2 = { version = "0.4.1", features = ["all"] }
tungstenite = "0.13" tungstenite = "0.13"
[dev-dependencies] [dev-dependencies]

6
aquatic_ws/src/lib/network/utils.rs
View file

@ -10,9 +10,9 @@ use super::connection::*;
pub fn create_listener(config: &Config) -> ::anyhow::Result<::std::net::TcpListener> { pub fn create_listener(config: &Config) -> ::anyhow::Result<::std::net::TcpListener> {
let builder = if config.network.address.is_ipv4() { let builder = if config.network.address.is_ipv4() {
Socket::new(Domain::ipv4(), Type::stream(), Some(Protocol::tcp())) Socket::new(Domain::IPV4, Type::STREAM, Some(Protocol::TCP))
} else { } else {
Socket::new(Domain::ipv6(), Type::stream(), Some(Protocol::tcp())) Socket::new(Domain::IPV6, Type::STREAM, Some(Protocol::TCP))
} }
.context("Couldn't create socket2::Socket")?; .context("Couldn't create socket2::Socket")?;
@ -35,7 +35,7 @@ pub fn create_listener(config: &Config) -> ::anyhow::Result<::std::net::TcpListe
.listen(128) .listen(128)
.context("Couldn't listen for connections on socket")?; .context("Couldn't listen for connections on socket")?;
Ok(builder.into_tcp_listener()) Ok(builder.into())
} }
pub fn remove_connection_if_exists(poll: &mut Poll, connections: &mut ConnectionMap, token: Token) { pub fn remove_connection_if_exists(poll: &mut Poll, connections: &mut ConnectionMap, token: Token) {