jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(disc): log channel errors (#428)

Browse Source
This commit is contained in:
Matthias Seitz
2022-12-14 09:06:16 +01:00
committed by GitHub
parent 10d960c5d6
commit cbbdac2701
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
crates/net/discv4/src/lib.rs
View File

@ -576,7 +576,13 @@ impl Discv4Service {
pub(crate) fn send_packet(&mut self, msg: Message, to: SocketAddr) -> H256 { pub(crate) fn send_packet(&mut self, msg: Message, to: SocketAddr) -> H256 {
let (payload, hash) = msg.encode(&self.secret_key); let (payload, hash) = msg.encode(&self.secret_key);
trace!(target : "discv4", r#type=?msg.msg_type(), ?to, ?hash, "sending packet"); trace!(target : "discv4", r#type=?msg.msg_type(), ?to, ?hash, "sending packet");
let _ = self.egress.try_send((payload, to)); let _ = self.egress.try_send((payload, to)).map_err(|err| {
warn!(
target : "discv4",
%err,
"drop outgoing packet",
);
});
hash hash
} }
@ -999,13 +1005,23 @@ pub(crate) async fn send_loop(udp: Arc<UdpSocket>, rx: EgressReceiver) {
/// Continuously awaits new incoming messages and sends them back through the channel. /// Continuously awaits new incoming messages and sends them back through the channel.
pub(crate) async fn receive_loop(udp: Arc<UdpSocket>, tx: IngressSender, local_id: PeerId) { pub(crate) async fn receive_loop(udp: Arc<UdpSocket>, tx: IngressSender, local_id: PeerId) {
let send = |event: IngressEvent| async {
let _ = tx.send(event).await.map_err(|err| {
warn!(
target : "discv4",
%err,
"failed send incoming packet",
)
});
};
loop { loop {
let mut buf = [0; MAX_PACKET_SIZE]; let mut buf = [0; MAX_PACKET_SIZE];
let res = udp.recv_from(&mut buf).await; let res = udp.recv_from(&mut buf).await;
match res { match res {
Err(err) => { Err(err) => {
warn!(target : "discv4", ?err, "Failed to read datagram."); warn!(target : "discv4", ?err, "Failed to read datagram.");
let _ = tx.send(IngressEvent::RecvError(err)).await; send(IngressEvent::RecvError(err)).await;
} }
Ok((read, remote_addr)) => { Ok((read, remote_addr)) => {
let packet = &buf[..read]; let packet = &buf[..read];
@ -1016,13 +1032,11 @@ pub(crate) async fn receive_loop(udp: Arc<UdpSocket>, tx: IngressSender, local_i
warn!(target : "discv4", ?remote_addr, "Received own packet."); warn!(target : "discv4", ?remote_addr, "Received own packet.");
continue continue
} }
let _ = tx.send(IngressEvent::Packet(remote_addr, packet)).await; send(IngressEvent::Packet(remote_addr, packet)).await;
} }
Err(err) => { Err(err) => {
warn!( target : "discv4", ?err,"Failed to decode packet"); warn!( target : "discv4", ?err,"Failed to decode packet");
let _ = tx send(IngressEvent::BadPacket(remote_addr, err, packet.to_vec())).await
.send(IngressEvent::BadPacket(remote_addr, err, packet.to_vec()))
.await;
} }
} }
} }