log client name
This commit is contained in:
parent
1340e87c15
commit
c01e18f5f2
@ -2,7 +2,7 @@ use std::net::SocketAddr;
|
|||||||
|
|
||||||
use eyre::eyre;
|
use eyre::eyre;
|
||||||
use tracing::{debug, instrument};
|
use tracing::{debug, instrument};
|
||||||
use zerocopy::{AsBytes, FromBytes, LittleEndian, Unaligned};
|
use zerocopy::{AsBytes, LittleEndian};
|
||||||
|
|
||||||
use crate::packets::{Header, Packet, PacketKind};
|
use crate::packets::{Header, Packet, PacketKind};
|
||||||
|
|
||||||
|
@ -329,9 +329,9 @@ pub async fn handler(
|
|||||||
|
|
||||||
info!(%addr, number, port, "authenticated");
|
info!(%addr, number, port, "authenticated");
|
||||||
|
|
||||||
let res = peer_query(&config.dyn_ip_server, number).await;
|
let name = peer_query(&config.dyn_ip_server, number).await?;
|
||||||
|
|
||||||
dbg!(&res);
|
info!(%name, "found client name");
|
||||||
|
|
||||||
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");
|
||||||
|
@ -101,13 +101,9 @@ pub async fn peer_query(server: &SocketAddr, number: u32) -> eyre::Result<Option
|
|||||||
|
|
||||||
packet.recv_into(&mut reader).await?;
|
packet.recv_into(&mut reader).await?;
|
||||||
|
|
||||||
dbg!(&packet);
|
Ok(if packet.kind().raw() == 5 {
|
||||||
|
|
||||||
if packet.kind().raw() == 5 {
|
|
||||||
// PeerReply
|
// PeerReply
|
||||||
let reply = PeerReply::read_from(packet.data.as_slice());
|
PeerReply::read_from(packet.data.as_slice()).and_then(|x| {
|
||||||
dbg!(&reply);
|
|
||||||
Ok(reply.and_then(|x| {
|
|
||||||
let i = x
|
let i = x
|
||||||
.name
|
.name
|
||||||
.iter()
|
.iter()
|
||||||
@ -115,9 +111,9 @@ pub async fn peer_query(server: &SocketAddr, number: u32) -> eyre::Result<Option
|
|||||||
.find_map(|(i, c)| (*c == 0).then_some(i))
|
.find_map(|(i, c)| (*c == 0).then_some(i))
|
||||||
.unwrap_or(x.name.len());
|
.unwrap_or(x.name.len());
|
||||||
|
|
||||||
std::str::from_utf8(&x.name[..i]).ok().map(|x| x.to_owned())
|
Some(std::str::from_utf8(&x.name[..i]).ok()?.to_owned())
|
||||||
}))
|
})
|
||||||
} else {
|
} else {
|
||||||
Ok(None)
|
None
|
||||||
}
|
})
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user