YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-01 10:15:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli_helpers: use anyhow in app fn; aquatic_ws: reorganize error handling

Browse source
This commit is contained in:
Joakim Frostegård 2020-05-23 14:05:50 +02:00
parent 1efe6f96c5
commit 526faa9aab
13 changed files with 134 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,6 @@
use std::fs::File;
use std::io::Read;
use std::time::Instant;
use mio::Token;
use native_tls::{Identity, TlsAcceptor};
use net2::{TcpBuilder, unix::UnixTcpBuilderExt};
use crate::config::Config;
@ -11,53 +8,26 @@ use crate::config::Config;
use super::connection::*;
pub fn create_listener(config: &Config) -> ::std::net::TcpListener {
let mut builder = &{
if config.network.address.is_ipv4(){
TcpBuilder::new_v4().expect("socket: build")
} else {
TcpBuilder::new_v6().expect("socket: build")
}
};
pub fn create_listener(
config: &Config
) -> ::anyhow::Result<::std::net::TcpListener> {
let builder = if config.network.address.is_ipv4(){
TcpBuilder::new_v4()
} else {
TcpBuilder::new_v6()
}?;
builder = builder.reuse_port(true)
.expect("socket: set reuse port");
let builder = builder.reuse_port(true)?;
let builder = builder.bind(&config.network.address)?;
builder = builder.bind(&config.network.address)
.expect(&format!("socket: bind to {}", &config.network.address));
let listener = builder.listen(128)?;
let listener = builder.listen(128)
.expect("tcpbuilder to tcp listener");
listener.set_nonblocking(true)?;
listener.set_nonblocking(true)
.expect("socket: set nonblocking");
listener
Ok(listener)
}
pub fn create_tls_acceptor(
config: &Config,
) -> TlsAcceptor {
let mut identity_bytes = Vec::new();
let mut file = File::open(&config.network.tls_pkcs12_path)
.expect("open pkcs12 file");
file.read_to_end(&mut identity_bytes).expect("read pkcs12 file");
let identity = Identity::from_pkcs12(
&mut identity_bytes,
&config.network.tls_pkcs12_password
).expect("create pkcs12 identity");
let acceptor = TlsAcceptor::new(identity)
.expect("create TlsAcceptor");
acceptor
}
/// Don't bother with deregistering from Poll. In my understanding, this is
/// done automatically when the stream is dropped, as long as there are no
/// other references to the file descriptor, such as when it is accessed