Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-02 05:23:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes: Builds for the macs (#2397)

Browse Source 
* Fixes: Builds for the macs

* misc: Allow the feature flags run during the build for the avahi tools
This commit is contained in:
J H
2023-08-17 16:23:33 -06:00
committed by GitHub
parent af116794c4
commit b7593fac44
8 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/net/mod.rs
View File

@@ -10,7 +10,6 @@ pub mod dhcp;
pub mod dns;
pub mod interface;
pub mod keys;
#[cfg(feature = "avahi")]
pub mod mdns;
pub mod net_controller;
pub mod ssl;

5
backend/src/net/net_controller.rs
View File

@@ -11,7 +11,6 @@ use crate::error::ErrorCollection;
use crate::hostname::Hostname;
use crate::net::dns::DnsController;
use crate::net::keys::Key;
#[cfg(feature = "avahi")]
use crate::net::mdns::MdnsController;
use crate::net::ssl::{export_cert, export_key, SslManager};
use crate::net::tor::TorController;
@@ -22,7 +21,6 @@ use crate::{Error, HOST_IP};
pub struct NetController {
pub(super) tor: TorController,
#[cfg(feature = "avahi")]
pub(super) mdns: MdnsController,
pub(super) vhost: VHostController,
pub(super) dns: DnsController,
@@ -43,7 +41,6 @@ impl NetController {
let ssl = Arc::new(ssl);
let mut res = Self {
tor: TorController::new(tor_control, tor_socks),
#[cfg(feature = "avahi")]
mdns: MdnsController::init().await?,
vhost: VHostController::new(ssl.clone()),
dns: DnsController::init(dns_bind).await?,
@@ -201,14 +198,12 @@ impl NetController {
)
.await?,
);
#[cfg(feature = "avahi")]
rcs.push(self.mdns.add(key.base_address()).await?);
Ok(rcs)
}
async fn remove_lan(&self, key: &Key, external: u16, rcs: Vec<Arc<()>>) -> Result<(), Error> {
drop(rcs);
#[cfg(feature = "avahi")]
self.mdns.gc(key.base_address()).await?;
self.vhost.gc(Some(key.local_address()), external).await
}