diff --git a/Cargo.lock b/Cargo.lock index 61a7a64..23633e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -712,7 +712,7 @@ checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" [[package]] name = "rtnetlink" version = "0.14.1" -source = "git+https://github.com/hack3ric/rust-rtnetlink?branch=for-flow#f488afb54309ee155a9c5c2c175b5bd00fadc1bc" +source = "git+https://github.com/hack3ric/rust-rtnetlink?branch=for-flow#3fcc4f469495af04073a89f33b31566c75225dc2" dependencies = [ "futures", "log", diff --git a/src/integration_tests/helpers/kernel/rtnl.rs b/src/integration_tests/helpers/kernel/rtnl.rs index 641500a..3b91d85 100644 --- a/src/integration_tests/helpers/kernel/rtnl.rs +++ b/src/integration_tests/helpers/kernel/rtnl.rs @@ -11,7 +11,6 @@ use rtnetlink::packet_utils::nla::Nla; use rtnetlink::packet_utils::Emitable; use rtnetlink::{Handle, IpVersion, LinkMessageBuilder, LinkUnspec, RouteMessageBuilder}; use std::cmp::Ordering; -use std::net::IpAddr; pub async fn create_dummy_link(handle: &Handle, addr: IpWithPrefix) -> anyhow::Result { let name: String = "dummy_" @@ -94,7 +93,7 @@ fn rule_attr_sort(a: &RuleAttribute, b: &RuleAttribute) -> Ordering { } pub async fn get_ip_route(handle: &Handle, ip_version: IpVersion, table: u32) -> anyhow::Result> { - let mut msg = RouteMessageBuilder::::new().table_id(table).build(); + let mut msg = RouteMessageBuilder::new().table_id(table).build(); msg.header.address_family = match ip_version { IpVersion::V4 => AddressFamily::Inet, IpVersion::V6 => AddressFamily::Inet6, diff --git a/src/integration_tests/kernel_linux.rs b/src/integration_tests/kernel_linux.rs index e2b7cfe..2a1aa42 100644 --- a/src/integration_tests/kernel_linux.rs +++ b/src/integration_tests/kernel_linux.rs @@ -17,7 +17,6 @@ use nftables::stmt; use rand::distributions::Alphanumeric; use rand::Rng; use rtnetlink::{IpVersion, RouteMessageBuilder}; -use std::net::IpAddr; use std::time::Duration; use tokio::select; use tokio::time::sleep; @@ -107,13 +106,13 @@ async fn test_redirect_to_ip() -> anyhow::Result<()> { assert!(ip_rules.contains(&ip_rule_exp)); let mut ip_routes_exp = [ - RouteMessageBuilder::::new() + RouteMessageBuilder::new() .table_id(table_index) .destination_prefix("172.20.0.0".parse()?, 16)? .output_interface(dummy_index) .gateway("10.128.128.1".parse()?)? .build(), - RouteMessageBuilder::::new() + RouteMessageBuilder::new() .table_id(table_index) .destination_prefix("172.21.0.0".parse()?, 16)? .output_interface(dummy_index) @@ -169,13 +168,13 @@ async fn test_redirect_to_ipv6() -> anyhow::Result<()> { assert!(ip_rules.contains(&ip_rule_exp)); let mut ip_routes_exp = [ - RouteMessageBuilder::::new() + RouteMessageBuilder::new() .table_id(table_index) .destination_prefix("fc00::".parse()?, 16)? .output_interface(dummy_index) .gateway("fc64::ffff".parse()?)? .build(), - RouteMessageBuilder::::new() + RouteMessageBuilder::new() .table_id(table_index) .destination_prefix("fc65:6565::".parse()?, 32)? .output_interface(dummy_index) diff --git a/src/kernel/rtnl.rs b/src/kernel/rtnl.rs index b87e364..558f748 100644 --- a/src/kernel/rtnl.rs +++ b/src/kernel/rtnl.rs @@ -78,7 +78,7 @@ impl RtNetlink { }; // ...and then add route to the table... - let mut msg = RouteMessageBuilder::::new() + let mut msg = RouteMessageBuilder::new() .destination_prefix(prefix.prefix(), prefix.len()) .expect("destination prefix should be valid") .table_id(table_id) @@ -128,7 +128,7 @@ impl RtNetlink { } async fn del_route(&self, table_id: u32, prefix: IpPrefix) { - let msg = RouteMessageBuilder::::new() + let msg = RouteMessageBuilder::new() .destination_prefix(prefix.prefix(), prefix.len()) .expect("destination prefix should be valid") .table_id(table_id) @@ -242,7 +242,7 @@ impl RtNetlink { let new_attrs = Self::get_route2(handle, *next_hop).await?; if *attrs != new_attrs { *attrs = new_attrs.clone(); - let mut msg = RouteMessageBuilder::::new() + let mut msg = RouteMessageBuilder::new() .destination_prefix(prefix.prefix(), prefix.len()) .expect("destination prefix should be valid") .table_id(*table_id) @@ -258,11 +258,11 @@ impl RtNetlink { Self::get_route2(&self.handle, ip).await } async fn get_route2(handle: &Handle, ip: IpAddr) -> Result> { - let msg = RouteMessageBuilder::::new() + let msg = RouteMessageBuilder::new() .destination_prefix(ip, if ip.is_ipv4() { 32 } else { 128 }) .expect("destination prefix should be valid") .build(); - let mut msg = (handle.route()).get(msg).dump(false).execute(); + let mut msg = handle.route().get(msg).execute(); let Some(rt) = msg.try_next().await? else { unreachable!(); };