voxel/kubi
1
1
Fork 0
mirror of https://github.com/griffi-gh/kubi.git synced 2024-12-26 13:48:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

kick inactive clients

Browse source
This commit is contained in:
griffi-gh 2023-02-13 02:30:33 +01:00
parent ed721ea91c
commit 7bb7b9b131
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
kubi-udp/src/server.rs
View file

@ -74,12 +74,17 @@ impl<S, R> Server<S, R> where S: Message, R: Message {
}) })
} }
fn send_to_addr(&self, addr: SocketAddr, packet: IdServerPacket<S>) -> Result<()> {
fn send_to_addr_inner(socket: &UdpSocket, addr: SocketAddr, packet: IdServerPacket<S>) -> Result<()> {
let bytes = bincode::encode_to_vec(packet, BINCODE_CONFIG)?; let bytes = bincode::encode_to_vec(packet, BINCODE_CONFIG)?;
self.socket.send_to(&bytes, addr)?; socket.send_to(&bytes, addr)?;
Ok(()) Ok(())
} }
fn send_to_addr(&self, addr: SocketAddr, packet: IdServerPacket<S>) -> Result<()> {
Self::send_to_addr_inner(&self.socket, addr, packet)
}
fn send_packet(&self, packet: IdServerPacket<S>) -> Result<()> { fn send_packet(&self, packet: IdServerPacket<S>) -> Result<()> {
let Some(id) = packet.0 else { let Some(id) = packet.0 else {
bail!("send_to_client call without id") bail!("send_to_client call without id")
@ -144,7 +149,21 @@ impl<S, R> Server<S, R> where S: Message, R: Message {
} }
pub fn update(&mut self) -> Result<()> { pub fn update(&mut self) -> Result<()> {
//TODO client timeout //kick inactive clients
self.clients.retain(|&id, client| {
if client.timeout.elapsed() > self.config.client_timeout {
if let Err(_) = Self::send_to_addr_inner(&self.socket, client.addr, IdServerPacket(
Some(id), ServerPacket::Disconnected("Timed out".into())
)) {
log::warn!("Client {id} timed out and we failed to send the kick packet. This shouldn't reaally matter")
} else {
log::info!("Client {id} timed out");
}
return false
}
true
});
let mut buf = [0; u16::MAX as usize]; let mut buf = [0; u16::MAX as usize];
loop { loop {
match self.socket.recv_from(&mut buf) { match self.socket.recv_from(&mut buf) {