Skip to content

Commit

Permalink
impl Debug, Clone for all requests and handles
Browse files Browse the repository at this point in the history
Sometimes we need to change both IPv4 and v6 at the same time, so building with common options first, and then cloning and applying twice will make code cleaner.
  • Loading branch information
hack3ric authored and cathay4t committed Jan 21, 2025
1 parent 23ff71e commit 515471f
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/route/add.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use crate::{try_nl, Error, Handle};

/// A request to create a new route. This is equivalent to the `ip route add`
/// commands.
#[derive(Debug, Clone)]
pub struct RouteAddRequest<T = IpAddr> {
handle: Handle,
message: RouteMessage,
Expand Down
1 change: 1 addition & 0 deletions src/route/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use netlink_packet_route::{
AddressFamily,
};

#[derive(Debug, Clone)]
pub struct RouteMessageBuilder<T = IpAddr> {
message: RouteMessage,
_phantom: PhantomData<T>,
Expand Down
1 change: 1 addition & 0 deletions src/route/del.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use netlink_packet_route::{route::RouteMessage, RouteNetlinkMessage};

use crate::{Error, Handle};

#[derive(Debug, Clone)]
pub struct RouteDelRequest {
handle: Handle,
message: RouteMessage,
Expand Down
1 change: 1 addition & 0 deletions src/route/get.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use netlink_packet_route::{

use crate::{try_rtnl, Error, Handle};

#[derive(Debug, Clone)]
pub struct RouteGetRequest {
handle: Handle,
message: RouteMessage,
Expand Down
1 change: 1 addition & 0 deletions src/route/handle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use crate::{Handle, RouteAddRequest, RouteDelRequest, RouteGetRequest};
use netlink_packet_route::route::RouteMessage;

#[derive(Debug, Clone)]
pub struct RouteHandle(Handle);

impl RouteHandle {
Expand Down
1 change: 1 addition & 0 deletions src/rule/add.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use crate::{try_nl, Error, Handle};

/// A request to create a new rule. This is equivalent to the `ip rule add`
/// command.
#[derive(Debug, Clone)]
pub struct RuleAddRequest<T = ()> {
handle: Handle,
message: RuleMessage,
Expand Down
1 change: 1 addition & 0 deletions src/rule/del.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use netlink_packet_route::{rule::RuleMessage, RouteNetlinkMessage};

use crate::{try_nl, Error, Handle};

#[derive(Debug, Clone)]
pub struct RuleDelRequest {
handle: Handle,
message: RuleMessage,
Expand Down
1 change: 1 addition & 0 deletions src/rule/get.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use netlink_packet_route::{

use crate::{try_rtnl, Error, Handle, IpVersion};

#[derive(Debug, Clone)]
pub struct RuleGetRequest {
handle: Handle,
message: RuleMessage,
Expand Down
1 change: 1 addition & 0 deletions src/rule/handle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use crate::{
};
use netlink_packet_route::rule::RuleMessage;

#[derive(Debug, Clone)]
pub struct RuleHandle(Handle);

impl RuleHandle {
Expand Down
1 change: 1 addition & 0 deletions src/traffic_control/add_filter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use crate::{
try_nl, Error, Handle,
};

#[derive(Debug, Clone)]
pub struct TrafficFilterNewRequest {
handle: Handle,
message: TcMessage,
Expand Down
1 change: 1 addition & 0 deletions src/traffic_control/add_qdisc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use crate::{
try_nl, Error, Handle,
};

#[derive(Debug, Clone)]
pub struct QDiscNewRequest {
handle: Handle,
message: TcMessage,
Expand Down
1 change: 1 addition & 0 deletions src/traffic_control/del_qdisc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use netlink_packet_route::{tc::TcMessage, RouteNetlinkMessage};

use crate::{try_nl, Error, Handle};

#[derive(Debug, Clone)]
pub struct QDiscDelRequest {
handle: Handle,
message: TcMessage,
Expand Down
4 changes: 4 additions & 0 deletions src/traffic_control/get.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use netlink_packet_route::{

use crate::{try_rtnl, Error, Handle};

#[derive(Debug, Clone)]
pub struct QDiscGetRequest {
handle: Handle,
message: TcMessage,
Expand Down Expand Up @@ -60,6 +61,7 @@ impl QDiscGetRequest {
}
}

#[derive(Debug, Clone)]
pub struct TrafficClassGetRequest {
handle: Handle,
message: TcMessage,
Expand Down Expand Up @@ -94,6 +96,7 @@ impl TrafficClassGetRequest {
}
}

#[derive(Debug, Clone)]
pub struct TrafficFilterGetRequest {
handle: Handle,
message: TcMessage,
Expand Down Expand Up @@ -135,6 +138,7 @@ impl TrafficFilterGetRequest {
}
}

#[derive(Debug, Clone)]
pub struct TrafficChainGetRequest {
handle: Handle,
message: TcMessage,
Expand Down
4 changes: 4 additions & 0 deletions src/traffic_control/handle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use crate::Handle;
use netlink_packet_core::{NLM_F_CREATE, NLM_F_EXCL, NLM_F_REPLACE};
use netlink_packet_route::tc::TcMessage;

#[derive(Debug, Clone)]
pub struct QDiscHandle(Handle);

impl QDiscHandle {
Expand Down Expand Up @@ -57,6 +58,7 @@ impl QDiscHandle {
}
}

#[derive(Debug, Clone)]
pub struct TrafficClassHandle {
handle: Handle,
ifindex: i32,
Expand All @@ -74,6 +76,7 @@ impl TrafficClassHandle {
}
}

#[derive(Debug, Clone)]
pub struct TrafficFilterHandle {
handle: Handle,
ifindex: i32,
Expand Down Expand Up @@ -118,6 +121,7 @@ impl TrafficFilterHandle {
}
}

#[derive(Debug, Clone)]
pub struct TrafficChainHandle {
handle: Handle,
ifindex: i32,
Expand Down

0 comments on commit 515471f

Please sign in to comment.