Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-31 04:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactors error handling for less redundancy

Browse Source
This commit is contained in:
Keagan McClelland
2022-06-06 18:37:25 -06:00
parent 45265453cb
commit 183c5cda14
1 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,12 +94,7 @@ impl MdnsControllerInner {
std::ptr::null::<libc::c_char>(), std::ptr::null::<libc::c_char>(),
); );
if res < avahi_sys::AVAHI_OK { if res < avahi_sys::AVAHI_OK {
let e_str = avahi_strerror(res); log_str_error("add service to Avahi entry group", res);
tracing::error!(
"Could not add service to Avahi entry group: {:?}",
std::ffi::CStr::from_ptr(e_str)
);
avahi_free(e_str as *mut c_void);
panic!("Failed to load Avahi services"); panic!("Failed to load Avahi services");
} }
tracing::info!( tracing::info!(
@@ -129,12 +124,7 @@ impl MdnsControllerInner {
self.hostname.len(), self.hostname.len(),
); );
if res < avahi_sys::AVAHI_OK { if res < avahi_sys::AVAHI_OK {
let e_str = avahi_strerror(res); log_str_error("add CNAME record to Avahi entry group", res);
tracing::error!(
"Could not add CNAME record to Avahi entry group: {:?}",
std::ffi::CStr::from_ptr(e_str)
);
avahi_free(e_str as *mut c_void);
panic!("Failed to load Avahi services"); panic!("Failed to load Avahi services");
} }
tracing::info!("Published {:?}", lan_address_ptr); tracing::info!("Published {:?}", lan_address_ptr);
@@ -156,12 +146,7 @@ impl MdnsControllerInner {
err_c, err_c,
); );
if avahi_client == std::ptr::null_mut::<AvahiClient>() { if avahi_client == std::ptr::null_mut::<AvahiClient>() {
let e_str = avahi_strerror(*box_err); log_str_error("create Avahi client", *box_err);
tracing::error!(
"Could not create avahi client: {:?}",
std::ffi::CStr::from_ptr(e_str)
);
avahi_free(e_str as *mut c_void);
panic!("Failed to create Avahi Client"); panic!("Failed to create Avahi Client");
} }
let group = avahi_sys::avahi_entry_group_new( let group = avahi_sys::avahi_entry_group_new(
@@ -170,12 +155,7 @@ impl MdnsControllerInner {
std::ptr::null_mut(), 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)); log_str_error("create Avahi entry group", avahi_client_errno(avahi_client));
tracing::error!(
"Could not create avahi entry group: {:?}",
std::ffi::CStr::from_ptr(e_str)
);
avahi_free(e_str as *mut c_void);
panic!("Failed to create Avahi Entry Group"); panic!("Failed to create Avahi Entry Group");
} }
let mut hostname_buf = vec![0]; let mut hostname_buf = vec![0];
@@ -199,12 +179,7 @@ impl MdnsControllerInner {
res.load_services(); res.load_services();
let commit_err = avahi_entry_group_commit(res.entry_group); let commit_err = avahi_entry_group_commit(res.entry_group);
if commit_err < avahi_sys::AVAHI_OK { if commit_err < avahi_sys::AVAHI_OK {
let e_str = avahi_strerror(commit_err); log_str_error("reset Avahi entry group", 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"); panic!("Failed to load Avahi services: reset");
} }
res res
@@ -215,23 +190,13 @@ impl MdnsControllerInner {
let mut res; let mut res;
res = avahi_entry_group_reset(self.entry_group); res = avahi_entry_group_reset(self.entry_group);
if res < avahi_sys::AVAHI_OK { if res < avahi_sys::AVAHI_OK {
let e_str = avahi_strerror(res); log_str_error("reset Avahi entry group", 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"); panic!("Failed to load Avahi services: reset");
} }
self.load_services(); self.load_services();
res = avahi_entry_group_commit(self.entry_group); res = avahi_entry_group_commit(self.entry_group);
if res < avahi_sys::AVAHI_OK { if res < avahi_sys::AVAHI_OK {
let e_str = avahi_strerror(res); log_str_error("commit Avahi entry group", 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"); panic!("Failed to load Avahi services: commit");
} }
} }
@@ -264,6 +229,18 @@ impl Drop for MdnsControllerInner {
} }
} }
fn log_str_error(action: &str, e: i32) {
unsafe {
let e_str = avahi_strerror(e);
tracing::error!(
"Could not {}: {:?}",
action,
std::ffi::CStr::from_ptr(e_str)
);
avahi_free(e_str as *mut c_void);
}
}
unsafe extern "C" fn entry_group_callback( 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,