rei-forks/zeroconf-rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement AvahiMdnsService set_host() and set_domain()

Browse Source 
Signed-off-by: Walker Crouse <walker.crouse@coop.co.uk>
This commit is contained in:
Walker Crouse 2020-09-29 14:18:37 -04:00
parent 95a563e1e6
commit 060b5924ed
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
zeroconf/src/linux/service.rs
View File

@ -5,7 +5,7 @@ use super::client::{self, ManagedAvahiClient, ManagedAvahiClientParams};
use super::constants; use super::constants;
use super::entry_group::{AddServiceParams, ManagedAvahiEntryGroup, ManagedAvahiEntryGroupParams}; use super::entry_group::{AddServiceParams, ManagedAvahiEntryGroup, ManagedAvahiEntryGroupParams};
use super::poll::ManagedAvahiSimplePoll; use super::poll::ManagedAvahiSimplePoll;
use crate::ffi::{c_str, AsRaw, FromRaw}; use crate::ffi::{c_str, AsRaw, FromRaw, UnwrapOrNull};
use crate::prelude::*; use crate::prelude::*;
use crate::{ use crate::{
EventLoop, NetworkInterface, Result, ServiceRegisteredCallback, ServiceRegistration, TxtRecord, EventLoop, NetworkInterface, Result, ServiceRegisteredCallback, ServiceRegistration, TxtRecord,
@ -18,7 +18,6 @@ use libc::c_void;
use std::any::Any; use std::any::Any;
use std::ffi::CString; use std::ffi::CString;
use std::fmt::{self, Formatter}; use std::fmt::{self, Formatter};
use std::ptr;
use std::sync::Arc; use std::sync::Arc;
#[derive(Debug)] #[derive(Debug)]
@ -51,12 +50,12 @@ impl TMdnsService for AvahiMdnsService {
unsafe { (*self.context).interface_index = avahi_util::interface_index(interface) }; unsafe { (*self.context).interface_index = avahi_util::interface_index(interface) };
} }
fn set_domain(&mut self, _domain: &str) { fn set_domain(&mut self, domain: &str) {
todo!() unsafe { (*self.context).domain = Some(c_string!(domain)) };
} }
fn set_host(&mut self, _host: &str) { fn set_host(&mut self, host: &str) {
todo!() unsafe { (*self.context).host = Some(c_string!(host)) };
} }
fn set_txt_record(&mut self, txt_record: TxtRecord) { fn set_txt_record(&mut self, txt_record: TxtRecord) {
@ -103,6 +102,8 @@ struct AvahiServiceContext {
group: Option<ManagedAvahiEntryGroup>, group: Option<ManagedAvahiEntryGroup>,
txt_record: Option<TxtRecord>, txt_record: Option<TxtRecord>,
interface_index: AvahiIfIndex, interface_index: AvahiIfIndex,
domain: Option<CString>,
host: Option<CString>,
registered_callback: Option<Box<ServiceRegisteredCallback>>, registered_callback: Option<Box<ServiceRegisteredCallback>>,
user_context: Option<Arc<dyn Any>>, user_context: Option<Arc<dyn Any>>,
} }
@ -116,6 +117,8 @@ impl AvahiServiceContext {
group: None, group: None,
txt_record: None, txt_record: None,
interface_index: constants::AVAHI_IF_UNSPEC, interface_index: constants::AVAHI_IF_UNSPEC,
domain: None,
host: None,
registered_callback: None, registered_callback: None,
user_context: None, user_context: None,
} }
@ -199,8 +202,8 @@ unsafe fn create_service(
.flags(0) .flags(0)
.name(context.name.as_ref().unwrap().as_ptr()) .name(context.name.as_ref().unwrap().as_ptr())
.kind(context.kind.as_ptr()) .kind(context.kind.as_ptr())
.domain(ptr::null_mut()) .domain(context.domain.as_ref().map(|d| d.as_ptr()).unwrap_or_null())
.host(ptr::null_mut()) .host(context.host.as_ref().map(|h| h.as_ptr()).unwrap_or_null())
.port(context.port) .port(context.port)
.txt(context.txt_record.as_ref().map(|t| t.inner())) .txt(context.txt_record.as_ref().map(|t| t.inner()))
.build()?, .build()?,