Do not panic when join handle is canceled

mullvad · Aug 26, 2024 · 77a4b46 · 77a4b46
1 parent fb1f4e1
commit 77a4b46
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/tunnel-obfuscation/src/shadowsocks.rs b/tunnel-obfuscation/src/shadowsocks.rs
@@ -227,10 +227,11 @@ impl Obfuscator for Shadowsocks {
     }
 
     async fn run(self: Box<Self>) -> crate::Result<()> {
-        self.server
-            .await
-            .expect("server handle panicked")
-            .map_err(crate::Error::RunShadowsocksObfuscator)
+        match self.server.await {
+            Ok(result) => result.map_err(crate::Error::RunShadowsocksObfuscator),
+            Err(err) if err.is_cancelled() => Ok(()),
+            Err(err) => panic!("server handle panicked"),
+        }
     }
 
     #[cfg(target_os = "android")]