Skip to content
Closed
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
20 changes: 14 additions & 6 deletions examples/ip_monitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use futures::stream::StreamExt;

use netlink_packet_route::constants::*;
use netlink_proto::packet::NetlinkEvent;
use rtnetlink::{
new_connection,
sys::{AsyncSocket, SocketAddr},
Expand All @@ -26,8 +27,8 @@ async fn main() -> Result<(), String> {
// handle - `Handle` to the `Connection`. Used to send/recv netlink
// messages.
//
// messages - A channel receiver.
let (mut conn, mut _handle, mut messages) =
// events - A channel receiver.
let (mut conn, mut _handle, mut events) =
new_connection().map_err(|e| format!("{}", e))?;

// These flags specify what kinds of broadcast messages we want to listen
Expand Down Expand Up @@ -63,10 +64,17 @@ async fn main() -> Result<(), String> {
// Create message to enable
});

// Start receiving events through `messages` channel.
while let Some((message, _)) = messages.next().await {
let payload = message.payload;
println!("{:?}", payload);
// Start receiving events through `events` channel.
while let Some(event) = events.next().await {
match event {
NetlinkEvent::Message((message, _)) => {
let payload = message.payload;
println!("Route change message - {:?}", payload);
}
NetlinkEvent::Overrun => {
println!("Netlink socket overrun. Some messages were lost");
}
}
}
Ok(())
}
16 changes: 12 additions & 4 deletions examples/listen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

use futures::stream::StreamExt;

use netlink_proto::packet::NetlinkEvent;
use rtnetlink::{
constants::{RTMGRP_IPV4_ROUTE, RTMGRP_IPV6_ROUTE},
new_connection,
Expand All @@ -14,7 +15,7 @@ use rtnetlink::{
#[tokio::main]
async fn main() -> Result<(), String> {
// Open the netlink socket
let (mut connection, _, mut messages) =
let (mut connection, _, mut events) =
new_connection().map_err(|e| format!("{}", e))?;

// These flags specify what kinds of broadcast messages we want to listen
Expand All @@ -32,9 +33,16 @@ async fn main() -> Result<(), String> {
.expect("failed to bind");
tokio::spawn(connection);

while let Some((message, _)) = messages.next().await {
let payload = message.payload;
println!("Route change message - {:?}", payload);
while let Some(event) = events.next().await {
match event {
NetlinkEvent::Message((message, _)) => {
let payload = message.payload;
println!("Route change message - {:?}", payload);
}
NetlinkEvent::Overrun => {
println!("Netlink socket overrun. Some messages were lost");
}
}
}
Ok(())
}
6 changes: 3 additions & 3 deletions src/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::io;
use futures::channel::mpsc::UnboundedReceiver;

use crate::{
packet::{NetlinkMessage, RtnlMessage},
packet::{NetlinkEvent, NetlinkMessage, RtnlMessage},
proto::Connection,
sys::{protocols::NETLINK_ROUTE, AsyncSocket, SocketAddr},
Handle,
Expand All @@ -16,7 +16,7 @@ use crate::{
pub fn new_connection() -> io::Result<(
Connection<RtnlMessage>,
Handle,
UnboundedReceiver<(NetlinkMessage<RtnlMessage>, SocketAddr)>,
UnboundedReceiver<NetlinkEvent<(NetlinkMessage<RtnlMessage>, SocketAddr)>>,
)> {
new_connection_with_socket()
}
Expand All @@ -25,7 +25,7 @@ pub fn new_connection() -> io::Result<(
pub fn new_connection_with_socket<S>() -> io::Result<(
Connection<RtnlMessage, S>,
Handle,
UnboundedReceiver<(NetlinkMessage<RtnlMessage>, SocketAddr)>,
UnboundedReceiver<NetlinkEvent<(NetlinkMessage<RtnlMessage>, SocketAddr)>>,
)>
where
S: AsyncSocket,
Expand Down