Merge pull request #117 from awiouy/nit1

simplify dns-sd/mdns code
This commit is contained in:
Sasha Hilton 2018-02-04 20:10:09 +01:00 committed by GitHub
commit 59782fe285
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -218,11 +218,7 @@ pub fn discovery(handle: &Handle, config: ConnectConfig, device_id: String, port
http.serve_addr_handle(&format!("0.0.0.0:{}", port).parse().unwrap(), &handle, move || Ok(discovery.clone())).unwrap()
};
#[cfg(feature = "with-dns-sd")]
let port = serve.incoming_ref().local_addr().port();
#[cfg(not(feature = "with-dns-sd"))]
let addr = serve.incoming_ref().local_addr();
let s_port = serve.incoming_ref().local_addr().port();
let server_future = {
let handle = handle.clone();
@ -239,7 +235,7 @@ pub fn discovery(handle: &Handle, config: ConnectConfig, device_id: String, port
"_spotify-connect._tcp",
None,
None,
port,
s_port,
&["VERSION=1.0", "CPath=/"]).unwrap();
#[cfg(not(feature = "with-dns-sd"))]
@ -249,7 +245,7 @@ pub fn discovery(handle: &Handle, config: ConnectConfig, device_id: String, port
let svc = responder.register(
"_spotify-connect._tcp".to_owned(),
config.name,
addr.port(),
s_port,
&["VERSION=1.0", "CPath=/"]);
Ok(DiscoveryStream {