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

Update Bonjour browser for ServiceType 

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
This commit is contained in:
Walker Crouse 2021-08-19 18:15:13 -04:00
parent 2654a20723
commit 1b054cd745
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zeroconf/src/macos/browser.rs
View File

@ -7,7 +7,7 @@ use super::txt_record_ref::ManagedTXTRecordRef;
use super::{bonjour_util, constants}; use super::{bonjour_util, constants};
use crate::ffi::{c_str, AsRaw, FromRaw}; use crate::ffi::{c_str, AsRaw, FromRaw};
use crate::prelude::*; use crate::prelude::*;
use crate::{EventLoop, NetworkInterface, Result, TxtRecord}; use crate::{EventLoop, NetworkInterface, Result, ServiceType, TxtRecord};
use crate::{ServiceDiscoveredCallback, ServiceDiscovery}; use crate::{ServiceDiscoveredCallback, ServiceDiscovery};
use bonjour_sys::{DNSServiceErrorType, DNSServiceFlags, DNSServiceRef}; use bonjour_sys::{DNSServiceErrorType, DNSServiceFlags, DNSServiceRef};
use libc::{c_char, c_uchar, c_void, sockaddr_in}; use libc::{c_char, c_uchar, c_void, sockaddr_in};
@ -16,6 +16,7 @@ use std::ffi::CString;
use std::fmt::{self, Formatter}; use std::fmt::{self, Formatter};
use std::net::IpAddr; use std::net::IpAddr;
use std::ptr; use std::ptr;
use std::str::FromStr;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
#[derive(Debug)] #[derive(Debug)]
@ -27,10 +28,10 @@ pub struct BonjourMdnsBrowser {
} }
impl TMdnsBrowser for BonjourMdnsBrowser { impl TMdnsBrowser for BonjourMdnsBrowser {
fn new(kind: &str) -> Self { fn new(service_type: ServiceType) -> Self {
Self { Self {
service: Arc::default(), service: Arc::default(),
kind: c_string!(kind), kind: c_string!(service_type.to_string()),
interface_index: constants::BONJOUR_IF_UNSPEC, interface_index: constants::BONJOUR_IF_UNSPEC,
context: Box::into_raw(Box::default()), context: Box::into_raw(Box::default()),
} }
@ -267,7 +268,7 @@ unsafe fn handle_get_address_info(
let result = ServiceDiscovery::builder() let result = ServiceDiscovery::builder()
.name(ctx.resolved_name.take().unwrap()) .name(ctx.resolved_name.take().unwrap())
.kind(ctx.resolved_kind.take().unwrap()) .service_type(ServiceType::from_str(&ctx.resolved_kind.take().unwrap())?)
.domain(domain) .domain(domain)
.host_name(hostname) .host_name(hostname)
.address(ip) .address(ip)