Skip to content

Commit 8705705

Browse files
committed
Do not reexport netlink-packet-wireguard
Since we already provides `WireguardParsed` interface, if user still want to use the old way, they should use both this crate and `netlink-packet-wireguard`. Signed-off-by: Gris Ge <cnfourt@gmail.com>
1 parent 691f911 commit 8705705

5 files changed

Lines changed: 13 additions & 23 deletions

File tree

src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use netlink_packet_core::NetlinkMessage;
44
use netlink_packet_generic::GenlMessage;
55

6-
use crate::WireguardMessage;
6+
use netlink_packet_wireguard::WireguardMessage;
77

88
#[derive(Clone, Copy, Eq, PartialEq, Debug)]
99
pub enum ErrorKind {

src/handle.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ use netlink_packet_core::{
77
NLM_F_REQUEST,
88
};
99
use netlink_packet_generic::GenlMessage;
10+
use netlink_packet_wireguard::{WireguardCmd, WireguardMessage};
1011

11-
use crate::{
12-
ErrorKind, WireguardCmd, WireguardError, WireguardMessage, WireguardParsed,
13-
};
12+
use crate::{ErrorKind, WireguardError, WireguardParsed};
1413

1514
#[derive(Clone, Debug)]
1615
pub struct WireguardHandle {

src/lib.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,6 @@ mod handle;
7474
mod parsed;
7575
mod peer_parsed;
7676

77-
// Re-export netlink-packet-wireguard data types allowing crate use to
78-
// depend on this crate only for full functionality.
79-
pub use netlink_packet_wireguard::{
80-
WireguardAddressFamily, WireguardAllowedIp, WireguardAllowedIpAttr,
81-
WireguardAttribute, WireguardCmd, WireguardMessage, WireguardPeer,
82-
WireguardPeerAttribute, WireguardTimeSpec,
83-
};
84-
8577
#[cfg(feature = "tokio_socket")]
8678
pub use self::connection::new_connection;
8779
pub use self::{

src/parsed.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
// SPDX-License-Identifier: MIT
22

33
use base64::{prelude::BASE64_STANDARD, Engine};
4-
use netlink_packet_wireguard::WireguardDeviceFlags;
5-
6-
use crate::{
7-
ErrorKind, WireguardAttribute, WireguardCmd, WireguardError,
8-
WireguardMessage, WireguardPeerParsed,
4+
use netlink_packet_wireguard::{
5+
WireguardAttribute, WireguardCmd, WireguardDeviceFlags, WireguardMessage,
96
};
107

8+
use crate::{ErrorKind, WireguardError, WireguardPeerParsed};
9+
1110
#[derive(Clone, PartialEq, Eq, Default)]
1211
#[non_exhaustive]
1312
pub struct WireguardParsed {

src/peer_parsed.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ use std::{
77
};
88

99
use base64::{prelude::BASE64_STANDARD, Engine};
10-
use netlink_packet_wireguard::{WireguardAllowedIpFlags, WireguardPeerFlags};
10+
use netlink_packet_wireguard::{
11+
WireguardAddressFamily, WireguardAllowedIp, WireguardAllowedIpAttr,
12+
WireguardAllowedIpFlags, WireguardPeer, WireguardPeerAttribute,
13+
WireguardPeerFlags, WireguardTimeSpec,
14+
};
1115

1216
use super::parsed::decode_key;
13-
use crate::{
14-
ErrorKind, WireguardAddressFamily, WireguardAllowedIp,
15-
WireguardAllowedIpAttr, WireguardError, WireguardPeer,
16-
WireguardPeerAttribute, WireguardTimeSpec,
17-
};
17+
use crate::{ErrorKind, WireguardError};
1818

1919
#[derive(Clone, Copy, PartialEq, Eq, Debug)]
2020
#[non_exhaustive]

0 commit comments

Comments
 (0)