Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

adds some investigative logging and improves error handling for mdns (#1145)

Browse Source 
* adds some investigative logging and improves error handling for mdns

* re-adds client error to mdns controller so that memory isn't deallocated while still in use by AvahiClient
This commit is contained in:
Keagan McClelland
2022-01-27 15:12:17 -07:00
committed by GitHub
parent c11b1721c2
commit 6dea3c723e
1 changed files with 88 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
backend/src/net/mdns.rs
View File

@@ -63,7 +63,7 @@ pub struct MdnsControllerInner {
hostname_raw: *const libc::c_char, hostname_raw: *const libc::c_char,
entry_group: *mut AvahiEntryGroup, entry_group: *mut AvahiEntryGroup,
services: BTreeMap<(PackageId, InterfaceId), TorSecretKeyV3>, services: BTreeMap<(PackageId, InterfaceId), TorSecretKeyV3>,
client_error: std::pin::Pin<Box<i32>>, _client_error: std::pin::Pin<Box<i32>>,
} }
unsafe impl Send for MdnsControllerInner {} unsafe impl Send for MdnsControllerInner {}
unsafe impl Sync for MdnsControllerInner {} unsafe impl Sync for MdnsControllerInner {}
@@ -151,7 +151,7 @@ impl MdnsControllerInner {
let avahi_client = avahi_sys::avahi_client_new( let avahi_client = avahi_sys::avahi_client_new(
poll, poll,
avahi_sys::AvahiClientFlags::AVAHI_CLIENT_NO_FAIL, avahi_sys::AvahiClientFlags::AVAHI_CLIENT_NO_FAIL,
None, Some(client_callback),
std::ptr::null_mut(), std::ptr::null_mut(),
err_c, err_c,
); );
@@ -164,8 +164,11 @@ impl MdnsControllerInner {
avahi_free(e_str as *mut c_void); avahi_free(e_str as *mut c_void);
panic!("Failed to create Avahi Client"); panic!("Failed to create Avahi Client");
} }
let group = let group = avahi_sys::avahi_entry_group_new(
avahi_sys::avahi_entry_group_new(avahi_client, Some(noop), std::ptr::null_mut()); avahi_client,
Some(entry_group_callback),
std::ptr::null_mut(),
);
if group == std::ptr::null_mut() { if group == std::ptr::null_mut() {
let e_str = avahi_strerror(avahi_client_errno(avahi_client)); let e_str = avahi_strerror(avahi_client_errno(avahi_client));
tracing::error!( tracing::error!(
@@ -191,18 +194,46 @@ impl MdnsControllerInner {
hostname_raw, hostname_raw,
entry_group: group, entry_group: group,
services: BTreeMap::new(), services: BTreeMap::new(),
client_error: box_err, _client_error: box_err,
}; };
res.load_services(); res.load_services();
avahi_entry_group_commit(res.entry_group); let commit_err = avahi_entry_group_commit(res.entry_group);
if commit_err < avahi_sys::AVAHI_OK {
let e_str = avahi_strerror(commit_err);
tracing::error!(
"Could not reset Avahi entry group: {:?}",
std::ffi::CStr::from_ptr(e_str)
);
avahi_free(e_str as *mut c_void);
panic!("Failed to load Avahi services: reset");
}
res res
} }
} }
fn sync(&mut self) { fn sync(&mut self) {
unsafe { unsafe {
avahi_entry_group_reset(self.entry_group); let mut res;
res = avahi_entry_group_reset(self.entry_group);
if res < avahi_sys::AVAHI_OK {
let e_str = avahi_strerror(res);
tracing::error!(
"Could not reset Avahi entry group: {:?}",
std::ffi::CStr::from_ptr(e_str)
);
avahi_free(e_str as *mut c_void);
panic!("Failed to load Avahi services: reset");
}
self.load_services(); self.load_services();
avahi_entry_group_commit(self.entry_group); res = avahi_entry_group_commit(self.entry_group);
if res < avahi_sys::AVAHI_OK {
let e_str = avahi_strerror(res);
tracing::error!(
"Could not commit Avahi entry group: {:?}",
std::ffi::CStr::from_ptr(e_str)
);
avahi_free(e_str as *mut c_void);
panic!("Failed to load Avahi services: commit");
}
} }
} }
fn add<'a, I: IntoIterator<Item = (InterfaceId, TorSecretKeyV3)>>( fn add<'a, I: IntoIterator<Item = (InterfaceId, TorSecretKeyV3)>>(
@@ -233,9 +264,56 @@ impl Drop for MdnsControllerInner {
} }
} }
unsafe extern "C" fn noop( unsafe extern "C" fn entry_group_callback(
_group: *mut avahi_sys::AvahiEntryGroup, _group: *mut avahi_sys::AvahiEntryGroup,
_state: avahi_sys::AvahiEntryGroupState, state: avahi_sys::AvahiEntryGroupState,
_userdata: *mut core::ffi::c_void, _userdata: *mut core::ffi::c_void,
) { ) {
match state {
avahi_sys::AvahiEntryGroupState_AVAHI_ENTRY_GROUP_FAILURE => {
tracing::warn!("AvahiCallback: EntryGroupState = AVAHI_ENTRY_GROUP_FAILURE");
}
avahi_sys::AvahiEntryGroupState_AVAHI_ENTRY_GROUP_COLLISION => {
tracing::warn!("AvahiCallback: EntryGroupState = AVAHI_ENTRY_GROUP_COLLISION");
}
avahi_sys::AvahiEntryGroupState_AVAHI_ENTRY_GROUP_UNCOMMITED => {
tracing::warn!("AvahiCallback: EntryGroupState = AVAHI_ENTRY_GROUP_UNCOMMITED");
}
avahi_sys::AvahiEntryGroupState_AVAHI_ENTRY_GROUP_ESTABLISHED => {
tracing::warn!("AvahiCallback: EntryGroupState = AVAHI_ENTRY_GROUP_ESTABLISHED");
}
avahi_sys::AvahiEntryGroupState_AVAHI_ENTRY_GROUP_REGISTERING => {
tracing::warn!("AvahiCallback: EntryGroupState = AVAHI_ENTRY_GROUP_REGISTERING");
}
other => {
tracing::warn!("AvahiCallback: EntryGroupState = {}", other);
}
}
}
unsafe extern "C" fn client_callback(
_group: *mut avahi_sys::AvahiClient,
state: avahi_sys::AvahiClientState,
_userdata: *mut core::ffi::c_void,
) {
match state {
avahi_sys::AvahiClientState_AVAHI_CLIENT_FAILURE => {
tracing::warn!("AvahiCallback: ClientState = AVAHI_CLIENT_FAILURE");
}
avahi_sys::AvahiClientState_AVAHI_CLIENT_S_RUNNING => {
tracing::warn!("AvahiCallback: ClientState = AVAHI_CLIENT_S_RUNNING");
}
avahi_sys::AvahiClientState_AVAHI_CLIENT_CONNECTING => {
tracing::warn!("AvahiCallback: ClientState = AVAHI_CLIENT_CONNECTING");
}
avahi_sys::AvahiClientState_AVAHI_CLIENT_S_COLLISION => {
tracing::warn!("AvahiCallback: ClientState = AVAHI_CLIENT_S_COLLISION");
}
avahi_sys::AvahiClientState_AVAHI_CLIENT_S_REGISTERING => {
tracing::warn!("AvahiCallback: ClientState = AVAHI_CLIENT_S_REGISTERING");
}
other => {
tracing::warn!("AvahiCallback: ClientState = {}", other);
}
}
} }