evan/protomask
1
Fork 0
Code

Add ICMP tracker

Browse Source
This commit is contained in:
Evan Pratten 2023-08-03 18:13:48 -04:00
parent f2b2be54c8
commit 8330515f69
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libs/interproto/src/protocols/icmp/mod.rs
View File

@ -28,6 +28,16 @@ pub fn translate_icmp_to_icmpv6(
actual: icmp_packet.len(), actual: icmp_packet.len(),
})?; })?;
// Track the incoming packet's type and code
#[cfg(feature = "metrics")]
protomask_metrics::metrics::ICMP_COUNTER
.with_label_values(&[
protomask_metrics::metrics::label_values::PROTOCOL_ICMP,
&icmp_packet.get_icmp_type().0.to_string(),
&icmp_packet.get_icmp_code().0.to_string(),
])
.inc();
// Translate the ICMP type and code to their ICMPv6 equivalents // Translate the ICMP type and code to their ICMPv6 equivalents
let (icmpv6_type, icmpv6_code) = type_code::translate_type_and_code_4_to_6( let (icmpv6_type, icmpv6_code) = type_code::translate_type_and_code_4_to_6(
icmp_packet.get_icmp_type(), icmp_packet.get_icmp_type(),
@ -104,6 +114,16 @@ pub fn translate_icmpv6_to_icmp(
actual: icmpv6_packet.len(), actual: icmpv6_packet.len(),
})?; })?;
// Track the incoming packet's type and code
#[cfg(feature = "metrics")]
protomask_metrics::metrics::ICMP_COUNTER
.with_label_values(&[
protomask_metrics::metrics::label_values::PROTOCOL_ICMPV6,
&icmpv6_packet.get_icmpv6_type().0.to_string(),
&icmpv6_packet.get_icmpv6_code().0.to_string(),
])
.inc();
// Translate the ICMPv6 type and code to their ICMP equivalents // Translate the ICMPv6 type and code to their ICMP equivalents
let (icmp_type, icmp_code) = type_code::translate_type_and_code_6_to_4( let (icmp_type, icmp_code) = type_code::translate_type_and_code_6_to_4(
icmpv6_packet.get_icmpv6_type(), icmpv6_packet.get_icmpv6_type(),
@ -144,10 +164,6 @@ pub fn translate_icmpv6_to_icmp(
// Calculate the checksum // Calculate the checksum
icmp_packet.set_checksum(icmp::checksum(&icmp_packet.to_immutable())); icmp_packet.set_checksum(icmp::checksum(&icmp_packet.to_immutable()));
// Track the translated packet
#[cfg(feature = "metrics")]
protomask_metrics::metric!(PACKET_COUNTER, PROTOCOL_ICMPV6, STATUS_TRANSLATED).inc();
// Return the translated packet // Return the translated packet
Ok(output_buffer) Ok(output_buffer)
} }

7
libs/protomask-metrics/src/metrics.rs
View File

@ -27,4 +27,11 @@ lazy_static! {
"Number of packets processed", "Number of packets processed",
&["protocol", "status"] &["protocol", "status"]
).unwrap(); ).unwrap();
/// Counter for the number of different types of ICMP packets received
pub static ref ICMP_COUNTER: prometheus::IntCounterVec = prometheus::register_int_counter_vec!(
"protomask_icmp_packets_recv",
"Number of ICMP packets received",
&["protocol", "icmp_type", "icmp_code"]
).unwrap();
} }