mirror of
https://github.com/librespot-org/librespot.git
synced 2025-10-05 02:39:53 +02:00
Discovery: Refactor and add Avahi DBus backend (#1347)
* discovery: use opaque error type for DnsSdError This helps to decouple discovery and core by not leaking implementation details of the zeroconf backend into Error conversion impls in core. * discovery: map all MDNS/DNS-SD errors to DiscoveryError::DnsSdError previously, libmdns errors would use a generic conversion from std::io::Error to core::Error * discovery: use an opaque type for the handle to the DNS-SD service * discovery: make features additive i.e. add with-libmdns instead of using not(with-dns-sd). The logic is such that enabling with-dns-sd in addition to the default with-libmdns will still end up using dns-sd, as before. If only with-libmdns is enabled, that will be the default. If none of the features is enabled, attempting to build a `Discovery` will yield an error. * discovery: add --zeroconf-backend CLI flag * discovery: Add minimal Avahi zeroconf backend * bump MSRV to 1.75 required by zbus >= 4 * discovery: ensure that server and dns-sd backend shutdown gracefully Previously, on drop the the shutdown_tx/close_tx, it wasn't guaranteed the corresponding tasks would continue to be polled until they actually completed their shutdown. Since dns_sd::Service is not Send and non-async, and because libmdns is non-async, put them on their own threads. * discovery: use a shared channel for server and zeroconf status messages * discovery: add Avahi reconnection logic This deals gracefully with the case where the Avahi daemon is restarted or not running initially. * discovery: allow running when compiled without zeroconf backend... ...but exit with an error if there's no way to authenticate * better error messages for invalid options with no short flag
This commit is contained in:
parent
d2324ddd1b
commit
94d174c33d
15 changed files with 1156 additions and 129 deletions
151
discovery/src/avahi.rs
Normal file
151
discovery/src/avahi.rs
Normal file
|
@ -0,0 +1,151 @@
|
|||
#![cfg(feature = "with-avahi")]
|
||||
|
||||
#[allow(unused)]
|
||||
pub use server::ServerProxy;
|
||||
|
||||
#[allow(unused)]
|
||||
pub use entry_group::{
|
||||
EntryGroupProxy, EntryGroupState, StateChangedStream as EntryGroupStateChangedStream,
|
||||
};
|
||||
|
||||
mod server {
|
||||
// This is not the full interface, just the methods we need!
|
||||
// Avahi also implements a newer version of the interface ("org.freedesktop.Avahi.Server2"), but
|
||||
// the additions are not relevant for us, and the older version is not intended to be deprecated.
|
||||
// cf. the release notes for 0.8 at https://github.com/avahi/avahi/blob/master/docs/NEWS
|
||||
#[zbus::proxy(
|
||||
interface = "org.freedesktop.Avahi.Server",
|
||||
default_service = "org.freedesktop.Avahi",
|
||||
default_path = "/",
|
||||
gen_blocking = false
|
||||
)]
|
||||
trait Server {
|
||||
/// EntryGroupNew method
|
||||
#[zbus(object = "super::entry_group::EntryGroup")]
|
||||
fn entry_group_new(&self);
|
||||
|
||||
/// GetState method
|
||||
fn get_state(&self) -> zbus::Result<i32>;
|
||||
|
||||
/// StateChanged signal
|
||||
#[zbus(signal)]
|
||||
fn state_changed(&self, state: i32, error: &str) -> zbus::Result<()>;
|
||||
}
|
||||
}
|
||||
|
||||
mod entry_group {
|
||||
use serde_repr::Deserialize_repr;
|
||||
use zbus::zvariant;
|
||||
|
||||
#[derive(Clone, Copy, Debug, Deserialize_repr)]
|
||||
#[repr(i32)]
|
||||
pub enum EntryGroupState {
|
||||
// The group has not yet been committed, the user must still call avahi_entry_group_commit()
|
||||
Uncommited = 0,
|
||||
// The entries of the group are currently being registered
|
||||
Registering = 1,
|
||||
// The entries have successfully been established
|
||||
Established = 2,
|
||||
// A name collision for one of the entries in the group has been detected, the entries have been withdrawn
|
||||
Collision = 3,
|
||||
// Some kind of failure happened, the entries have been withdrawn
|
||||
Failure = 4,
|
||||
}
|
||||
|
||||
impl zvariant::Type for EntryGroupState {
|
||||
fn signature() -> zvariant::Signature<'static> {
|
||||
zvariant::Signature::try_from("i").unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
#[zbus::proxy(
|
||||
interface = "org.freedesktop.Avahi.EntryGroup",
|
||||
default_service = "org.freedesktop.Avahi",
|
||||
gen_blocking = false
|
||||
)]
|
||||
trait EntryGroup {
|
||||
/// AddAddress method
|
||||
fn add_address(
|
||||
&self,
|
||||
interface: i32,
|
||||
protocol: i32,
|
||||
flags: u32,
|
||||
name: &str,
|
||||
address: &str,
|
||||
) -> zbus::Result<()>;
|
||||
|
||||
/// AddRecord method
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn add_record(
|
||||
&self,
|
||||
interface: i32,
|
||||
protocol: i32,
|
||||
flags: u32,
|
||||
name: &str,
|
||||
clazz: u16,
|
||||
type_: u16,
|
||||
ttl: u32,
|
||||
rdata: &[u8],
|
||||
) -> zbus::Result<()>;
|
||||
|
||||
/// AddService method
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn add_service(
|
||||
&self,
|
||||
interface: i32,
|
||||
protocol: i32,
|
||||
flags: u32,
|
||||
name: &str,
|
||||
type_: &str,
|
||||
domain: &str,
|
||||
host: &str,
|
||||
port: u16,
|
||||
txt: &[&[u8]],
|
||||
) -> zbus::Result<()>;
|
||||
|
||||
/// AddServiceSubtype method
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn add_service_subtype(
|
||||
&self,
|
||||
interface: i32,
|
||||
protocol: i32,
|
||||
flags: u32,
|
||||
name: &str,
|
||||
type_: &str,
|
||||
domain: &str,
|
||||
subtype: &str,
|
||||
) -> zbus::Result<()>;
|
||||
|
||||
/// Commit method
|
||||
fn commit(&self) -> zbus::Result<()>;
|
||||
|
||||
/// Free method
|
||||
fn free(&self) -> zbus::Result<()>;
|
||||
|
||||
/// GetState method
|
||||
fn get_state(&self) -> zbus::Result<EntryGroupState>;
|
||||
|
||||
/// IsEmpty method
|
||||
fn is_empty(&self) -> zbus::Result<bool>;
|
||||
|
||||
/// Reset method
|
||||
fn reset(&self) -> zbus::Result<()>;
|
||||
|
||||
/// UpdateServiceTxt method
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn update_service_txt(
|
||||
&self,
|
||||
interface: i32,
|
||||
protocol: i32,
|
||||
flags: u32,
|
||||
name: &str,
|
||||
type_: &str,
|
||||
domain: &str,
|
||||
txt: &[&[u8]],
|
||||
) -> zbus::Result<()>;
|
||||
|
||||
/// StateChanged signal
|
||||
#[zbus(signal)]
|
||||
fn state_changed(&self, state: EntryGroupState, error: &str) -> zbus::Result<()>;
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue