evan/protomask
1
Fork 0
Code

Fix MTR bugs

Browse Source
This commit is contained in:
Evan Pratten 2023-07-17 16:07:03 -04:00
parent 5969fc9cae
commit ada8d57fe4
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debug.sh
View File

@ -19,6 +19,6 @@ ip netns exec protomask firewall-cmd --zone=trusted --add-interface=test1
ip netns exec protomask firewall-cmd --zone=trusted --add-interface=test2 ip netns exec protomask firewall-cmd --zone=trusted --add-interface=test2
# Run protomask # Run protomask
ip netns exec protomask ./target/debug/protomask protomask.toml -v ip netns exec protomask ./target/x86_64-unknown-linux-musl/debug/protomask protomask.toml -v

37
src/nat/xlat/icmp.rs
View File

@ -11,7 +11,7 @@ use pnet_packet::{
Packet, Packet,
}; };
use crate::{icmpv6_packet, ipv4_packet, ipv6_packet, icmp_packet}; use crate::{icmp_packet, icmpv6_packet, ipv4_packet, ipv6_packet};
use super::PacketTranslationError; use super::PacketTranslationError;
@ -130,7 +130,7 @@ pub fn translate_icmp_4_to_6(
{ {
// "Time Exceeded" requires an additional payload be embedded in the packet // "Time Exceeded" requires an additional payload be embedded in the packet
// This payload looks like: 4bytes + IPv6(data) // This payload looks like: 4bytes + IPv6(data)
let mut output_payload = vec![]; let mut output_payload = icmp_packet.payload().to_vec();
if icmpv6_type == Icmpv6Types::TimeExceeded { if icmpv6_type == Icmpv6Types::TimeExceeded {
// Get access to the original payload // Get access to the original payload
let original_payload = let original_payload =
@ -153,10 +153,14 @@ pub fn translate_icmp_4_to_6(
new_source, new_source,
new_dest, new_dest,
icmpv6_type, icmpv6_type,
icmpv6_code icmpv6_code,
&original_payload_inner[4..]
); );
original_payload_inner = inner_icmpv6.packet().to_vec(); original_payload_inner = inner_icmpv6.packet().to_vec();
log::debug!("Translated inner ICMPv6 packet: {:?}", original_payload_inner); log::debug!(
"Translated inner ICMPv6 packet: {:?}",
original_payload_inner
);
} }
} }
@ -173,9 +177,8 @@ pub fn translate_icmp_4_to_6(
); );
// Set the payload // Set the payload
let mut payload = vec![0u8; 4 + new_payload_packet.packet().len()]; output_payload = vec![0u8; 4 + new_payload_packet.packet().len()];
payload[4..].copy_from_slice(new_payload_packet.packet()); output_payload[4..].copy_from_slice(new_payload_packet.packet());
output_payload = payload;
} }
// Create a new ICMPv6 packet for the translated values to be stored in // Create a new ICMPv6 packet for the translated values to be stored in
@ -190,6 +193,10 @@ pub fn translate_icmp_4_to_6(
output.set_icmpv6_type(icmpv6_type); output.set_icmpv6_type(icmpv6_type);
output.set_icmpv6_code(icmpv6_code); output.set_icmpv6_code(icmpv6_code);
// Set the payload
log::debug!("Setting ICMPv6 payload: {:?}", output_payload);
output.set_payload(&output_payload);
// Calculate the checksum // Calculate the checksum
output.set_checksum(0); output.set_checksum(0);
output.set_checksum(icmpv6::checksum( output.set_checksum(icmpv6::checksum(
@ -198,9 +205,6 @@ pub fn translate_icmp_4_to_6(
&new_dest, &new_dest,
)); ));
// Set the payload
output.set_payload(&output_payload);
// Return the translated packet // Return the translated packet
return Ok(Some( return Ok(Some(
Icmpv6Packet::owned(output.to_immutable().packet().to_vec()).unwrap(), Icmpv6Packet::owned(output.to_immutable().packet().to_vec()).unwrap(),
@ -236,7 +240,7 @@ pub fn translate_icmp_6_to_4(
) { ) {
// "Time Exceeded" requires an additional payload be embedded in the packet // "Time Exceeded" requires an additional payload be embedded in the packet
// This payload looks like: 4bytes + IPv6(8bytes) // This payload looks like: 4bytes + IPv6(8bytes)
let mut output_payload = vec![]; let mut output_payload = icmpv6_packet.payload().to_vec();
if icmp_type == IcmpTypes::TimeExceeded { if icmp_type == IcmpTypes::TimeExceeded {
// Get access to the original payload // Get access to the original payload
let original_payload = let original_payload =
@ -257,10 +261,8 @@ pub fn translate_icmp_6_to_4(
Icmpv6Type(original_payload_inner[0]), Icmpv6Type(original_payload_inner[0]),
Icmpv6Code(original_payload_inner[1]), Icmpv6Code(original_payload_inner[1]),
) { ) {
let inner_icmp = icmp_packet!( let inner_icmp =
icmp_type, icmp_packet!(icmp_type, icmp_code, &original_payload_inner[8..]);
icmp_code
);
original_payload_inner = inner_icmp.packet().to_vec(); original_payload_inner = inner_icmp.packet().to_vec();
log::debug!("Translated inner ICMP packet: {:?}", original_payload_inner); log::debug!("Translated inner ICMP packet: {:?}", original_payload_inner);
} }
@ -279,9 +281,8 @@ pub fn translate_icmp_6_to_4(
); );
// Set the payload // Set the payload
let mut payload = vec![0u8; 4 + new_payload_packet.packet().len()]; output_payload = vec![0u8; 4 + new_payload_packet.packet().len()];
payload[4..].copy_from_slice(new_payload_packet.packet()); output_payload[4..].copy_from_slice(new_payload_packet.packet());
output_payload = payload;
} }
// Create a new ICMP packet for the translated values to be stored in // Create a new ICMP packet for the translated values to be stored in