Merge branch 'rust-netlink:main' into ipvlan_and_ipvtap

Author: xujunjie-cover

examples/add_neighbour.rs

@@ -2,12 +2,12 @@
 
 use futures::stream::TryStreamExt;
 use rtnetlink::{new_connection, Error, Handle};
-use std::{env, net::IpAddr};
+use std::{convert::TryFrom, env, net::IpAddr};
 
 #[tokio::main]
 async fn main() -> Result<(), ()> {
     let args: Vec<String> = env::args().collect();
-    if args.len() != 3 {
+    if args.len() != 4 {
         usage();
         return Ok(());
     }
@@ -18,10 +18,27 @@ async fn main() -> Result<(), ()> {
         std::process::exit(1);
     });
 
+    let link_local_parts: Vec<u8> = args[3]
+        .split(':')
+        .map(|b| {
+            u8::from_str_radix(b, 16).unwrap_or_else(|e| {
+                eprintln!("invalid part of mac {}: {}", b, e);
+                std::process::exit(1);
+            })
+        })
+        .collect();
+
+    let link_local_address = <[u8; 6]>::try_from(link_local_parts).unwrap_or_else(|_| {
+        eprintln!("invalid mac address, please give it in the format of 56:78:90:ab:cd:ef");
+        std::process::exit(1);
+    });
+
     let (connection, handle, _) = new_connection().unwrap();
     tokio::spawn(connection);
 
-    if let Err(e) = add_neighbour(link_name, ip, handle.clone()).await {
+    if let Err(e) =
+        add_neighbour(link_name, ip, link_local_address, handle.clone()).await
+    {
         eprintln!("{e}");
     }
     Ok(())
@@ -30,6 +47,7 @@ async fn main() -> Result<(), ()> {
 async fn add_neighbour(
     link_name: &str,
     ip: IpAddr,
+    link_local_address: [u8; 6],
     handle: Handle,
 ) -> Result<(), Error> {
     let mut links = handle
@@ -41,6 +59,7 @@ async fn add_neighbour(
         handle
             .neighbours()
             .add(link.header.index, ip)
+            .link_local_address(&link_local_address)
             .execute()
             .await?;
         println!("Done");
@@ -52,7 +71,7 @@ async fn add_neighbour(
 fn usage() {
     eprintln!(
         "usage:
-    cargo run --example add_neighbour -- <link_name> <ip_address>
+    cargo run --example add_neighbour -- <link_name> <ip_address> <mac>
 
 Note that you need to run this program as root. Instead of running cargo as root,
 build the example normally:
@@ -61,6 +80,7 @@ build the example normally:
 
 Then find the binary in the target directory:
 
-    cd ../target/debug/example ; sudo ./add_neighbour <link_name> <ip_address>"
+    cd ../target/debug/example ;
+    sudo ./add_neighbour <link_name> <ip_address> <mac>"
     );
 }

examples/add_route.rs

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 
-use std::env;
+use std::{env, net::Ipv4Addr};
 
 use ipnetwork::Ipv4Network;
-use rtnetlink::{new_connection, Error, Handle};
+use rtnetlink::{new_connection, Error, Handle, RouteMessageBuilder};
 
 const TEST_TABLE_ID: u32 = 299;
 
@@ -40,15 +40,12 @@ async fn add_route(
     gateway: &Ipv4Network,
     handle: Handle,
 ) -> Result<(), Error> {
-    let route = handle.route();
-    route
-        .add()
-        .v4()
+    let route = RouteMessageBuilder::<Ipv4Addr>::new()
         .destination_prefix(dest.ip(), dest.prefix())
         .gateway(gateway.ip())
         .table_id(TEST_TABLE_ID)
-        .execute()
-        .await?;
+        .build();
+    handle.route().add(route).execute().await?;
     Ok(())
 }
 

examples/add_route_pref_src.rs

@@ -4,7 +4,7 @@ use futures::TryStreamExt;
 use std::{env, net::Ipv4Addr};
 
 use ipnetwork::Ipv4Network;
-use rtnetlink::{new_connection, Error, Handle};
+use rtnetlink::{new_connection, Error, Handle, RouteMessageBuilder};
 
 #[tokio::main]
 async fn main() -> Result<(), ()> {
@@ -53,15 +53,12 @@ async fn add_route(
         .header
         .index;
 
-    let route = handle.route();
-    route
-        .add()
-        .v4()
+    let route = RouteMessageBuilder::<Ipv4Addr>::new()
         .destination_prefix(dest.ip(), dest.prefix())
         .output_interface(iface_idx)
         .pref_source(source)
-        .execute()
-        .await?;
+        .build();
+    handle.route().add(route).execute().await?;
     Ok(())
 }
 

examples/listen.rs

@@ -6,7 +6,10 @@
 use futures::stream::StreamExt;
 use netlink_sys::{AsyncSocket, SocketAddr};
 use rtnetlink::{
-    constants::{RTMGRP_IPV4_ROUTE, RTMGRP_IPV6_ROUTE},
+    constants::{
+        RTMGRP_IPV4_IFADDR, RTMGRP_IPV4_ROUTE, RTMGRP_IPV6_IFADDR,
+        RTMGRP_IPV6_ROUTE, RTMGRP_LINK,
+    },
     new_connection,
 };
 
@@ -18,7 +21,11 @@ async fn main() -> Result<(), String> {
 
     // These flags specify what kinds of broadcast messages we want to listen
     // for.
-    let mgroup_flags = RTMGRP_IPV4_ROUTE | RTMGRP_IPV6_ROUTE;
+    let mgroup_flags = RTMGRP_LINK
+        | RTMGRP_IPV4_IFADDR
+        | RTMGRP_IPV4_ROUTE
+        | RTMGRP_IPV6_IFADDR
+        | RTMGRP_IPV6_ROUTE;
 
     // A netlink socket address is created with said flags.
     let addr = SocketAddr::new(0, mgroup_flags);

src/lib.rs

@@ -5,6 +5,12 @@
 
 #![allow(clippy::module_inception)]
 
+pub use netlink_packet_core as packet_core;
+pub use netlink_packet_route as packet_route;
+pub use netlink_packet_utils as packet_utils;
+pub use netlink_proto as proto;
+pub use netlink_sys as sys;
+
 mod handle;
 pub use crate::handle::*;