evan/protomask
1
Fork 0
Code

Fix pedantic clippy warnings

Browse Source
This commit is contained in:
Evan Pratten 2023-07-21 10:20:07 -04:00
parent a9c4d499a7
commit ce3645e83f
13 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib.rs
View File

@ -2,6 +2,11 @@
//!
//! *Note: There is a fair chance you are looking for `src/cli/main.rs` instead of this file.*
#![deny(clippy::pedantic)]
#![allow(clippy::module_name_repetitions)]
#![allow(clippy::missing_errors_doc)]
#![allow(clippy::missing_panics_doc)]
pub mod metrics;
pub mod nat;
mod packet;

3
src/metrics/http.rs
View File

@ -7,6 +7,7 @@ use hyper::{
use prometheus::{Encoder, TextEncoder};
/// Handle an HTTP request
#[allow(clippy::unused_async)]
async fn handle_request(request: Request<Body>) -> Result<Response<Body>, Infallible> {
// If the request is targeting the metrics endpoint
if request.method() == Method::GET && request.uri().path() == "/metrics" {
@ -39,6 +40,6 @@ pub async fn serve_metrics(bind_addr: SocketAddr) {
// Run the server
if let Err(e) = server.await {
eprintln!("Metrics server error: {}", e);
eprintln!("Metrics server error: {e}");
}
}

6
src/nat/mod.rs
View File

@ -44,7 +44,7 @@ impl Nat64 {
interface.add_route(ipv6_nat_prefix.into()).await?;
// Add the IPv4 pool prefixes as routes
for ipv4_prefix in ipv4_pool.iter() {
for ipv4_prefix in &ipv4_pool {
interface.add_route((*ipv4_prefix).into()).await?;
}
@ -149,7 +149,7 @@ impl Nat64 {
// Spawn a task to process the packet
tokio::spawn(async move {
if let Some(output) = unwrap_log(translate_ipv6_to_ipv4(
packet,
&packet,
new_source,
new_destination,
)) {
@ -169,7 +169,7 @@ impl Nat64 {
log::warn!("Translator running behind! Dropping {} packets", count);
Ok(())
}
error => Err(error),
error @ broadcast::error::RecvError::Closed => Err(error),
},
}?;
}

4
src/nat/table.rs
View File

@ -176,10 +176,10 @@ impl Nat64Table {
// Track the values
IPV4_POOL_RESERVED
.with_label_values(&["dynamic"])
.set(total_dynamic_reservations as i64);
.set(i64::from(total_dynamic_reservations));
IPV4_POOL_RESERVED
.with_label_values(&["static"])
.set(total_static_reservations as i64);
.set(i64::from(total_static_reservations));
}
}

4
src/packet/protocols/icmp.rs
View File

@ -13,7 +13,7 @@ pub struct IcmpPacket<T> {
}
impl<T> IcmpPacket<T> {
/// Construct a new ICMPv6 packet
/// Construct a new `ICMP` packet
pub fn new(icmp_type: IcmpType, icmp_code: IcmpCode, payload: T) -> Self {
Self {
icmp_type,
@ -32,7 +32,7 @@ where
fn try_from(bytes: Vec<u8>) -> Result<Self, Self::Error> {
// Parse the packet
let packet = pnet_packet::icmp::IcmpPacket::new(&bytes)
.ok_or(PacketError::TooShort(bytes.len(), bytes.to_vec()))?;
.ok_or(PacketError::TooShort(bytes.len(), bytes.clone()))?;
// Return the packet
Ok(Self {

6
src/packet/protocols/icmpv6.rs
View File

@ -19,7 +19,7 @@ pub struct Icmpv6Packet<T> {
}
impl<T> Icmpv6Packet<T> {
/// Construct a new ICMPv6 packet
/// Construct a new `ICMPv6` packet
pub fn new(
source_address: Ipv6Addr,
destination_address: Ipv6Addr,
@ -41,7 +41,7 @@ impl<T> Icmpv6Packet<T>
where
T: From<Vec<u8>>,
{
/// Construct a new ICMPv6 packet from raw bytes
/// Construct a new `ICMPv6` packet from raw bytes
#[allow(dead_code)]
pub fn new_from_bytes(
bytes: &[u8],
@ -64,7 +64,7 @@ where
}
impl Icmpv6Packet<RawBytes> {
/// Construct a new ICMPv6 packet with a raw payload from raw bytes
/// Construct a new `ICMPv6` packet with a raw payload from raw bytes
pub fn new_from_bytes_raw_payload(
bytes: &[u8],
source_address: Ipv6Addr,

3
src/packet/protocols/ipv4.rs
View File

@ -54,6 +54,7 @@ impl<T> Ipv4Packet<T> {
}
}
#[allow(clippy::cast_possible_truncation)]
fn options_length_words(&self) -> u8 {
self.options
.iter()
@ -72,7 +73,7 @@ where
fn try_from(bytes: Vec<u8>) -> Result<Self, Self::Error> {
// Parse the packet
let packet = pnet_packet::ipv4::Ipv4Packet::new(&bytes)
.ok_or(PacketError::TooShort(bytes.len(), bytes.to_vec()))?;
.ok_or(PacketError::TooShort(bytes.len(), bytes.clone()))?;
// Return the packet
Ok(Self {

4
src/packet/protocols/ipv6.rs
View File

@ -47,7 +47,7 @@ where
fn try_from(bytes: Vec<u8>) -> Result<Self, Self::Error> {
// Parse the packet
let packet = pnet_packet::ipv6::Ipv6Packet::new(&bytes)
.ok_or(PacketError::TooShort(bytes.len(), bytes.to_vec()))?;
.ok_or(PacketError::TooShort(bytes.len(), bytes.clone()))?;
// Return the packet
Ok(Self {
@ -80,7 +80,7 @@ where
output.set_version(6);
output.set_traffic_class(packet.traffic_class);
output.set_flow_label(packet.flow_label);
output.set_payload_length(payload.len() as u16);
output.set_payload_length(u16::try_from(payload.len()).unwrap());
output.set_next_header(packet.next_header);
output.set_hop_limit(packet.hop_limit);
output.set_source(packet.source_address);

15
src/packet/protocols/tcp.rs
View File

@ -103,11 +103,12 @@ impl<T> TcpPacket<T> {
}
/// Get the length of the options in words
fn options_length(&self) -> usize {
#[allow(clippy::cast_possible_truncation)]
fn options_length(&self) -> u8 {
self.options
.iter()
.map(TcpOptionPacket::packet_size)
.sum::<usize>()
.map(|option| TcpOptionPacket::packet_size(option) as u8)
.sum::<u8>()
}
}
@ -143,7 +144,7 @@ where
flags: parsed.get_flags(),
window_size: parsed.get_window(),
urgent_pointer: parsed.get_urgent_ptr(),
options: parsed.get_options().to_vec(),
options: parsed.get_options().clone(),
payload: parsed.payload().to_vec().into(),
})
}
@ -177,7 +178,7 @@ impl TcpPacket<RawBytes> {
flags: parsed.get_flags(),
window_size: parsed.get_window(),
urgent_pointer: parsed.get_urgent_ptr(),
options: parsed.get_options().to_vec(),
options: parsed.get_options().clone(),
payload: RawBytes(parsed.payload().to_vec()),
})
}
@ -196,7 +197,7 @@ where
// Allocate a mutable packet to write into
let total_length = pnet_packet::tcp::MutableTcpPacket::minimum_packet_size()
+ options_length
+ options_length as usize
+ payload.len();
let mut output =
pnet_packet::tcp::MutableTcpPacket::owned(vec![0u8; total_length]).unwrap();
@ -210,7 +211,7 @@ where
output.set_acknowledgement(packet.ack_number);
// Write the offset
output.set_data_offset(5 + (options_length / 4) as u8);
output.set_data_offset(5 + (options_length / 4));
// Write the options
output.set_options(&packet.options);

2
src/packet/protocols/udp.rs
View File

@ -160,7 +160,7 @@ where
output.set_destination(packet.destination.port());
// Write the length
output.set_length(total_length as u16);
output.set_length(u16::try_from(total_length).unwrap());
// Write the payload
output.set_payload(&payload);

4
src/packet/xlat/icmp/mod.rs
View File

@ -1,3 +1,5 @@
#![allow(clippy::doc_markdown)]
use std::net::{Ipv4Addr, Ipv6Addr};
use pnet_packet::{icmp::IcmpTypes, icmpv6::Icmpv6Types};
@ -92,7 +94,7 @@ pub fn translate_icmpv6_to_icmp(
// Translate
let inner_payload =
translate_ipv6_to_ipv4(inner_payload.try_into()?, new_source, new_destination)?;
translate_ipv6_to_ipv4(&inner_payload.try_into()?, new_source, new_destination)?;
let inner_payload: Vec<u8> = inner_payload.into();
// Build the new payload

4
src/packet/xlat/icmp/type_code.rs
View File

@ -1,5 +1,7 @@
//! Functions to map between ICMP and ICMPv6 types/codes
#![allow(clippy::doc_markdown)]
use pnet_packet::{
icmp::{destination_unreachable, IcmpCode, IcmpType, IcmpTypes},
icmpv6::{Icmpv6Code, Icmpv6Type, Icmpv6Types},
@ -30,6 +32,7 @@ pub fn translate_type_and_code_4_to_6(
(IcmpTypes::DestinationUnreachable, icmp_code) => Ok((
Icmpv6Types::DestinationUnreachable,
#[cfg_attr(rustfmt, rustfmt_skip)]
#[allow(clippy::match_same_arms)]
Icmpv6Code(match icmp_code {
destination_unreachable::IcmpCodes::DestinationHostUnreachable => 3,
destination_unreachable::IcmpCodes::DestinationProtocolUnreachable => 4,
@ -78,6 +81,7 @@ pub fn translate_type_and_code_6_to_4(
(Icmpv6Types::DestinationUnreachable, icmp_code) => Ok((
IcmpTypes::DestinationUnreachable,
#[cfg_attr(rustfmt, rustfmt_skip)]
#[allow(clippy::match_same_arms)]
match icmp_code.0 {
1 => destination_unreachable::IcmpCodes::CommunicationAdministrativelyProhibited,
2 => destination_unreachable::IcmpCodes::SourceHostIsolated,

2
src/packet/xlat/ip.rs
View File

@ -70,7 +70,7 @@ pub fn translate_ipv4_to_ipv6(
/// Translates an IPv6 packet to an IPv4 packet
pub fn translate_ipv6_to_ipv4(
input: Ipv6Packet<Vec<u8>>,
input: &Ipv6Packet<Vec<u8>>,
new_source: Ipv4Addr,
new_destination: Ipv4Addr,
) -> Result<Ipv4Packet<Vec<u8>>, PacketError> {