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

aquatic_ws: use socket2 instead of net2

Browse source
This commit is contained in:
Joakim Frostegård 2020-05-25 18:24:36 +02:00
parent 5c07370786
commit 1ec4745f45
3 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aquatic_ws/Cargo.toml
View file

@ -25,12 +25,12 @@ log = "0.4"
mimalloc = { version = "0.1", default-features = false }
mio = { version = "0.7", features = ["tcp", "os-poll", "os-util"] }
native-tls = "0.2"
net2 = "0.2"
parking_lot = "0.10"
privdrop = "0.3"
rand = { version = "0.7", features = ["small_rng"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
socket2 = { version = "0.3", features = ["reuseport"] }
simplelog = "0.8"
tungstenite = "0.10"

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

@ -2,7 +2,7 @@ use std::time::Instant;
use anyhow::Context;
use mio::Token;
use net2::{TcpBuilder, unix::UnixTcpBuilderExt};
use socket2::{Socket, Domain, Type, Protocol};
use crate::config::Config;
@ -12,30 +12,28 @@ use super::connection::*;
pub fn create_listener(
config: &Config
) -> ::anyhow::Result<::std::net::TcpListener> {
let mut builder = &if config.network.address.is_ipv4(){
TcpBuilder::new_v4()
let builder = if config.network.address.is_ipv4(){
Socket::new(Domain::ipv4(), Type::stream(), Some(Protocol::tcp()))
} else {
TcpBuilder::new_v6()
}.context("Couldn't create TcpBuilder")?;
Socket::new(Domain::ipv6(), Type::stream(), Some(Protocol::tcp()))
}.context("Couldn't create socket2::Socket")?;
if config.network.ipv6_only {
builder = builder.only_v6(true)
builder.set_only_v6(true)
.context("Couldn't put socket in ipv6 only mode")?
}
builder = builder.reuse_port(true)
builder.set_nonblocking(true)
.context("Couldn't put socket in non-blocking mode")?;
builder.set_reuse_port(true)
.context("Couldn't put socket in reuse_port mode")?;
builder = builder.bind(&config.network.address).with_context(||
builder.bind(&config.network.address.into()).with_context(||
format!("Couldn't bind socket to address {}", config.network.address)
)?;
let listener = builder.listen(128)
builder.listen(128)
.context("Couldn't listen for connections on socket")?;
listener.set_nonblocking(true)
.context("Couldn't put tcp listener in non-blocking mode")?;
Ok(listener)
Ok(builder.into_tcp_listener())
}