soruh/centralex
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

look up name in authentication routine

Browse Source
This commit is contained in:
soruh 2023-03-28 14:32:48 +02:00
parent 0aab8b16c7
commit 8f978c06f9
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/client.rs
View File

@ -51,9 +51,9 @@ async fn authenticate(
updated_server = true; updated_server = true;
} }
let mut port_handler = port_handler.lock().await; let listener = if let Some((listener, _packet)) =
port_handler.lock().await.stop_rejector(port).await
let listener = if let Some((listener, _packet)) = port_handler.stop_rejector(port).await { {
Ok(listener) Ok(listener)
} else { } else {
TcpListener::bind((config.listen_addr.ip(), port)).await TcpListener::bind((config.listen_addr.ip(), port)).await
@ -71,6 +71,17 @@ async fn authenticate(
let _ip = dyn_ip_update(&config.dyn_ip_server, number, pin, port).await?; let _ip = dyn_ip_update(&config.dyn_ip_server, number, pin, port).await?;
} }
#[cfg(feature = "debug_server")]
let name = peer_query(&config.dyn_ip_server, number).await?;
let mut port_handler = port_handler.lock().await;
#[cfg(feature = "debug_server")]
if let Some(name) = name {
info!(%name, "found client name");
port_handler.names.insert(number, name);
}
port_handler.register_update(); port_handler.register_update();
port_handler port_handler
.port_state .port_state
@ -83,7 +94,7 @@ async fn authenticate(
break Ok(Some(port)); break Ok(Some(port));
} }
port_handler.mark_port_error(number, port); port_handler.lock().await.mark_port_error(number, port);
} }
} }
@ -329,16 +340,6 @@ pub async fn handler(
info!(%addr, number, port, "authenticated"); info!(%addr, number, port, "authenticated");
#[cfg(feature = "debug_server")]
{
if let Some(name) = peer_query(&config.dyn_ip_server, number).await? {
info!(%name, "found client name");
let mut port_handler = port_handler.lock().await;
port_handler.names.insert(number, name);
port_handler.register_update();
}
}
let Some(listener) = handler_metadata.listener.as_mut() else { let Some(listener) = handler_metadata.listener.as_mut() else {
unreachable!("client sucessfully authenticated but did not set handler_metadata.listener"); unreachable!("client sucessfully authenticated but did not set handler_metadata.listener");
}; };