dont panic during init

Signed-off-by: Walker Crouse <walker.crouse@acuitybrands.com>
windy1 · Jan 28, 2024 · ad5e519 · ad5e519
1 parent bc05415
commit ad5e519
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/zeroconf/src/avahi/browser.rs b/zeroconf/src/avahi/browser.rs
@@ -137,8 +137,11 @@ unsafe extern "C" fn client_callback(
     let context = AvahiBrowserContext::from_raw(userdata);
 
     match state {
-        avahi_sys::AvahiClientState_AVAHI_CLIENT_S_RUNNING => create_browser(client, context)
-            .unwrap_or_else(|e| panic!("failed to create browser: {}", e)),
+        avahi_sys::AvahiClientState_AVAHI_CLIENT_S_RUNNING => {
+            if let Err(e) = create_browser(client, context) {
+                context.invoke_callback(Err(e));
+            }
+        }
         avahi_sys::AvahiClientState_AVAHI_CLIENT_FAILURE => {
             context.invoke_callback(Err(avahi_util::get_last_error(client).into()))
         }

diff --git a/zeroconf/src/avahi/service.rs b/zeroconf/src/avahi/service.rs
@@ -186,9 +186,14 @@ unsafe extern "C" fn client_callback(
     let context = AvahiServiceContext::from_raw(userdata);
 
     match state {
-        avahi_sys::AvahiClientState_AVAHI_CLIENT_S_RUNNING => create_service(client, context)
-            .unwrap_or_else(|e| panic!("failed to create service: {}", e)),
-        avahi_sys::AvahiClientState_AVAHI_CLIENT_FAILURE => {
+        avahi_sys::AvahiServerState_AVAHI_SERVER_RUNNING => {
+            if let Err(e) = create_service(client, context) {
+                context.invoke_callback(Err(e))
+            }
+        }
+        avahi_sys::AvahiServerState_AVAHI_SERVER_INVALID
+        | avahi_sys::AvahiServerState_AVAHI_SERVER_COLLISION
+        | avahi_sys::AvahiServerState_AVAHI_SERVER_FAILURE => {
             context.invoke_callback(Err(avahi_util::get_last_error(client).into()))
         }
         _ => {}