BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-04-04 14:56:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

clients joining should no longer block acception runtime

Browse Source
This commit is contained in:
Luuk van Oijen
2023-11-08 12:52:34 +01:00
parent 3fedcf5bd5
commit e1b9f2b969
1 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/server/mod.rs
View File

@@ -3,7 +3,7 @@ use std::sync::{Arc, Mutex, atomic::{AtomicBool, Ordering}};
use std::time::Instant;
use tokio::net::{TcpListener, UdpSocket};
use tokio::task::JoinHandle;
use tokio::task::{JoinHandle, JoinSet};
use num_enum::IntoPrimitive;
@@ -70,32 +70,45 @@ impl Server {
let clients_incoming_ref = Arc::clone(&clients_incoming);
debug!("Client acception runtime starting...");
let connect_runtime_handle = tokio::spawn(async move {
let mut set = JoinSet::new();
loop {
match tcp_listener_ref.accept().await {
Ok((mut socket, addr)) => {
info!("New client connected: {:?}", addr);
socket.set_nodelay(true);
let cfg_ref = config_ref.clone();
let ci_ref = clients_incoming_ref.clone();
let mut client = Client::new(socket);
match client.authenticate(&config_ref).await {
Ok(_) => {
let mut lock = clients_incoming_ref
.lock()
.map_err(|e| error!("{:?}", e))
.expect("Failed to acquire lock on mutex!");
lock.push(client);
drop(lock);
},
Err(e) => {
error!("Authentication error occured, kicking player...");
error!("{:?}", e);
client.kick("Failed to authenticate player!").await;
set.spawn(async move {
socket.set_nodelay(true);
let mut client = Client::new(socket);
match client.authenticate(&cfg_ref).await {
Ok(_) => {
let mut lock = ci_ref
.lock()
.map_err(|e| error!("{:?}", e))
.expect("Failed to acquire lock on mutex!");
lock.push(client);
drop(lock);
},
Err(e) => {
error!("Authentication error occured, kicking player...");
error!("{:?}", e);
client.kick("Failed to authenticate player!").await;
}
}
}
});
}
Err(e) => error!("Failed to accept incoming connection: {:?}", e),
}
if set.is_empty() == false {
tokio::select!(
_ = set.join_next() => {},
_ = tokio::time::sleep(tokio::time::Duration::from_secs(1)) => {},
)
}
}
});
debug!("Client acception runtime started!");