chore: Unify enable_wg_broker and enable_broker_api features

This commit is contained in:
Katherine Watson
2024-08-11 21:20:46 -07:00
parent 065b0fcc8a
commit 274d245bed
7 changed files with 20 additions and 22 deletions

View File

@@ -36,14 +36,14 @@ rand = {workspace = true}
procspawn = {workspace = true}
[features]
enable_broker_api=[]
experimental_broker_api = []
[[bin]]
name = "rosenpass-wireguard-broker-privileged"
path = "src/bin/priviledged.rs"
test = false
doc = false
required-features=["enable_broker_api"]
required-features = ["experimental_broker_api"]
cfg = { target_os = "linux" }
[[bin]]
@@ -51,5 +51,5 @@ name = "rosenpass-wireguard-broker-socket-handler"
test = false
path = "src/bin/socket_handler.rs"
doc = false
required-features=["enable_broker_api"]
required-features = ["experimental_broker_api"]
cfg = { target_os = "linux" }

View File

@@ -2,7 +2,6 @@ use anyhow::{bail, ensure};
use mio::Interest;
use rosenpass_util::ord::max_usize;
use std::collections::VecDeque;
use std::dbg;
use std::io::{ErrorKind, Read, Write};
use crate::{SerializedBrokerConfig, WireGuardBroker, WireguardBrokerMio};

View File

@@ -1,6 +1,6 @@
#[cfg(feature = "enable_broker_api")]
#[cfg(feature = "experimental_broker_api")]
pub mod mio_client;
#[cfg(all(feature = "enable_broker_api", target_os = "linux"))]
#[cfg(all(feature = "experimental_broker_api", target_os = "linux"))]
pub mod netlink;
pub mod native_unix;

View File

@@ -34,7 +34,7 @@ pub trait WireguardBrokerMio: WireGuardBroker {
fn unregister(&mut self, registry: &mio::Registry) -> Result<(), Self::MioError>;
}
#[cfg(feature = "enable_broker_api")]
#[cfg(feature = "experimental_broker_api")]
pub mod api;
pub mod brokers;

View File

@@ -1,4 +1,4 @@
#[cfg(feature = "enable_broker_api")]
#[cfg(feature = "experimental_broker_api")]
#[cfg(test)]
mod integration_tests {