Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions examples/get_neighbours.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: MIT

use futures_util::stream::TryStreamExt;
use rtnetlink::{new_connection, Error, Handle, IpVersion};
use netlink_packet_route::{neighbour::NeighbourFlags, AddressFamily};
use rtnetlink::{new_connection, Error, Handle};

#[tokio::main]
async fn main() -> Result<(), ()> {
Expand All @@ -13,6 +14,11 @@ async fn main() -> Result<(), ()> {
eprintln!("{e}");
}
println!();
println!("dumping neighbours on bridge interfaces");
if let Err(e) = dump_neighbours_bridge(handle.clone()).await {
eprintln!("{e}");
}
println!();

Ok(())
}
Expand All @@ -21,7 +27,20 @@ async fn dump_neighbours(handle: Handle) -> Result<(), Error> {
let mut neighbours = handle
.neighbours()
.get()
.set_family(IpVersion::V4)
.set_address_family(AddressFamily::Inet)
.execute();
while let Some(route) = neighbours.try_next().await? {
println!("{route:?}");
}
Ok(())
}

async fn dump_neighbours_bridge(handle: Handle) -> Result<(), Error> {
let mut neighbours = handle
.neighbours()
.get()
.set_address_family(AddressFamily::Bridge)
.set_flags(NeighbourFlags::Own)
.execute();
while let Some(route) = neighbours.try_next().await? {
println!("{route:?}");
Expand Down
16 changes: 15 additions & 1 deletion src/neighbour/get.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use netlink_packet_core::{
};
use netlink_packet_route::{
neighbour::{NeighbourFlags, NeighbourMessage},
RouteNetlinkMessage,
AddressFamily, RouteNetlinkMessage,
};

use crate::{Error, Handle, IpVersion};
Expand All @@ -33,11 +33,25 @@ impl NeighbourGetRequest {
self
}

#[deprecated(
since = "0.22.0",
note = "please use `set_address_family` instead"
)]
pub fn set_family(mut self, ip_version: IpVersion) -> Self {
self.message.header.family = ip_version.family();
self
}

pub fn set_address_family(mut self, family: AddressFamily) -> Self {
self.message.header.family = family;
self
}

pub fn set_flags(mut self, flags: NeighbourFlags) -> Self {
self.message.header.flags = flags;
self
}

/// Execute the request
pub fn execute(
self,
Expand Down
4 changes: 1 addition & 3 deletions src/traffic_control/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,7 @@ async fn _get_chains(ifindex: i32) -> Vec<TcMessage> {
Ok(None) => {
break;
}
Err(NetlinkError(ErrorMessage {
code, header: _, ..
})) => {
Err(NetlinkError(ErrorMessage { code, .. })) => {
assert_eq!(code, std::num::NonZeroI32::new(-95));
eprintln!(
"The chain in traffic control is not supported, \
Expand Down
Loading