Skip to content
Open
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
5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ description = "async netlink protocol"
[dependencies]
bytes = "1.0"
log = "0.4.8"
futures = "0.3"
futures-channel = "0.3"
futures-util = { version = "0.3", features = ["sink"] }
netlink-packet-core = "0.8.0"
netlink-sys = { default-features = false, version = "0.8.4" }
thiserror = "2"
Expand All @@ -29,7 +30,7 @@ smol_socket = ["netlink-sys/smol_socket"]
env_logger = "0.8.2"
tokio = { version = "1.0.1", default-features = false, features = ["macros", "rt-multi-thread", "time"] }
netlink-packet-route = { version = "0.25.0" }
netlink-packet-audit = { version = "0.5.0" }
netlink-packet-audit = { version = "0.6.0" }
async-std = {version = "1.9.0", features = ["attributes"]}

[[example]]
Expand Down
2 changes: 1 addition & 1 deletion examples/audit_netlink_events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// `<repo-root>/target/debug/examples/audit_netlink_events`. This example runs
// forever, you must hit ^C to kill it.

use futures::stream::StreamExt;
use futures_util::stream::StreamExt;
use netlink_packet_audit::{AuditMessage, StatusMessage};
use netlink_packet_core::{
NetlinkMessage, NetlinkPayload, NLM_F_ACK, NLM_F_REQUEST,
Expand Down
2 changes: 1 addition & 1 deletion examples/dump_links.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

use futures::StreamExt;
use futures_util::StreamExt;
use netlink_packet_core::{
NetlinkHeader, NetlinkMessage, NLM_F_DUMP, NLM_F_REQUEST,
};
Expand Down
2 changes: 1 addition & 1 deletion examples/dump_links_async.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

use futures::StreamExt;
use futures_util::StreamExt;
use netlink_packet_core::{
NetlinkHeader, NetlinkMessage, NLM_F_DUMP, NLM_F_REQUEST,
};
Expand Down
6 changes: 2 additions & 4 deletions src/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ use std::{
task::{Context, Poll},
};

use futures::{
channel::mpsc::{UnboundedReceiver, UnboundedSender},
Future, Sink, Stream,
};
use futures_channel::mpsc::{UnboundedReceiver, UnboundedSender};
use futures_util::{Future, Sink, Stream};
use log::{error, warn};
use netlink_packet_core::{
NetlinkDeserializable, NetlinkMessage, NetlinkPayload, NetlinkSerializable,
Expand Down
2 changes: 1 addition & 1 deletion src/framed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::{
task::{Context, Poll},
};

use futures::{Sink, Stream};
use futures_util::{Sink, Stream};
use log::error;

use crate::{
Expand Down
6 changes: 2 additions & 4 deletions src/handle.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// SPDX-License-Identifier: MIT

use futures::{
channel::mpsc::{unbounded, UnboundedSender},
Stream,
};
use futures_channel::mpsc::{unbounded, UnboundedSender};
use futures_util::Stream;
use netlink_packet_core::NetlinkMessage;
use std::fmt::Debug;

Expand Down
8 changes: 4 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
//! - `netlink-packet-audit = "^0.1"`
//!
//! ```rust,no_run
//! use futures::stream::StreamExt;
//! use futures_util::stream::StreamExt;
//! use netlink_packet_core::{NetlinkMessage, NetlinkPayload, NLM_F_ACK,
//! NLM_F_REQUEST};
//! use netlink_packet_audit::{
Expand Down Expand Up @@ -108,7 +108,7 @@
//! in a `Connection` which was polled automatically by the runtime.
//!
//! ```rust,no_run
//! use futures::StreamExt;
//! use futures_util::StreamExt;
//!
//! use netlink_packet_route::{link::LinkMessage, RouteNetlinkMessage};
//! use netlink_packet_core::{
Expand Down Expand Up @@ -159,7 +159,7 @@
//! }
//! ```
#[macro_use]
extern crate futures;
extern crate futures_util;
#[macro_use]
extern crate log;

Expand All @@ -185,7 +185,7 @@ pub use crate::errors::*;
mod handle;
pub use crate::handle::*;

use futures::channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
use futures_channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
use std::{fmt::Debug, io};

pub(crate) use netlink_packet_core as packet;
Expand Down