void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-26 08:57:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

debug code removal and comments

Browse source
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
1 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
network-hypervisor/src/vl1/node.rs
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,24 +708,24 @@ 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", u64::from_be_bytes(packet_header.id)
u64::from_be_bytes(packet_header.id) );
);
if let Some(source) = Address::from_bytes(&packet_header.src) { if let Some(source) = Address::from_bytes(&packet_header.src) {
if let Some(peer) = self.peer(source) { if let Some(peer) = self.peer(source) {
peer.receive(self, host_system, inner, time_ticks, &path, packet_header, data.as_ref(), &[]); peer.receive(self, host_system, inner, time_ticks, &path, packet_header, data.as_ref(), &[]);
} else { } else {
self.whois(host_system, source, Some((Arc::downgrade(&path), data)), time_ticks); self.whois(host_system, source, Some((Arc::downgrade(&path), data)), time_ticks);
}
} }
} }
} }
} else { } else {
// Packet is addressed somewhere else.
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
let debug_packet_id; let debug_packet_id;
@ -743,30 +745,28 @@ 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)]
{
debug_packet_id = u64::from_be_bytes(packet_header.id);
debug_event!(
host_system,
"[vl1] [v1] #{:0>16x} forwarding packet to {}",
debug_packet_id,
dest.to_string()
);
}
if packet_header.increment_hops() > v1::FORWARD_MAX_HOPS {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
{ debug_event!(
debug_packet_id = u64::from_be_bytes(packet_header.id); host_system,
debug_event!( "[vl1] [v1] #{:0>16x} discarded: max hops exceeded!",
host_system, u64::from_be_bytes(packet_header.id)
"[vl1] [v1] #{:0>16x} forwarding packet to {}", );
debug_packet_id,
dest.to_string()
);
}
if packet_header.increment_hops() > v1::FORWARD_MAX_HOPS {
#[cfg(debug_assertions)]
debug_event!(
host_system,
"[vl1] [v1] #{:0>16x} discarded: max hops exceeded!",
u64::from_be_bytes(packet_header.id)
);
return;
}
} else {
return; return;
} }
} else {
return;
} }
if let Some(peer) = self.peer(dest) { if let Some(peer) = self.peer(dest) {