debug code removal and comments

This commit is contained in:
Adam Ierymenko 2022-09-23 16:52:21 -04:00
parent eaacb26187
commit 80151f0dc7
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3

View file

@ -645,6 +645,8 @@ impl<HostSystemImpl: HostSystem> Node<HostSystemImpl> {
// Legacy ZeroTier V1 packet handling // Legacy ZeroTier V1 packet handling
if let Ok(fragment_header) = data.struct_mut_at::<v1::FragmentHeader>(0) { if let Ok(fragment_header) = data.struct_mut_at::<v1::FragmentHeader>(0) {
if let Some(dest) = Address::from_bytes_fixed(&fragment_header.dest) { if let Some(dest) = Address::from_bytes_fixed(&fragment_header.dest) {
// Packet is addressed to this node.
if dest == self.identity.address { if dest == self.identity.address {
let fragment_header = &*fragment_header; // discard mut let fragment_header = &*fragment_header; // discard mut
let path = self.canonical_path(source_endpoint, source_local_socket, source_local_interface, time_ticks); let path = self.canonical_path(source_endpoint, source_local_socket, source_local_interface, time_ticks);
@ -706,8 +708,7 @@ impl<HostSystemImpl: HostSystem> Node<HostSystemImpl> {
} }
} }
} }
} else { } else if let Ok(packet_header) = data.struct_at::<v1::PacketHeader>(0) {
if let Ok(packet_header) = data.struct_at::<v1::PacketHeader>(0) {
debug_event!( debug_event!(
host_system, host_system,
"[vl1] [v1] #{:0>16x} is unfragmented", "[vl1] [v1] #{:0>16x} is unfragmented",
@ -722,8 +723,9 @@ impl<HostSystemImpl: HostSystem> Node<HostSystemImpl> {
} }
} }
} }
}
} else { } else {
// Packet is addressed somewhere else.
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
let debug_packet_id; let debug_packet_id;
@ -743,8 +745,7 @@ impl<HostSystemImpl: HostSystem> Node<HostSystemImpl> {
debug_event!(host_system, "[vl1] [v1] #{:0>16x} discarded: max hops exceeded!", debug_packet_id); debug_event!(host_system, "[vl1] [v1] #{:0>16x} discarded: max hops exceeded!", debug_packet_id);
return; return;
} }
} else { } else if let Ok(packet_header) = data.struct_mut_at::<v1::PacketHeader>(0) {
if let Ok(packet_header) = data.struct_mut_at::<v1::PacketHeader>(0) {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
{ {
debug_packet_id = u64::from_be_bytes(packet_header.id); debug_packet_id = u64::from_be_bytes(packet_header.id);
@ -767,7 +768,6 @@ impl<HostSystemImpl: HostSystem> Node<HostSystemImpl> {
} else { } else {
return; return;
} }
}
if let Some(peer) = self.peer(dest) { if let Some(peer) = self.peer(dest) {
// TODO: SHOULD we forward? Need a way to check. // TODO: SHOULD we forward? Need a way to check.