fix(upnp): don't panic when gateway is dropped

libp2p · Mar 27, 2024 · 9232d80 · 9232d80
1 parent 5bbec49
commit 9232d80
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/protocols/upnp/CHANGELOG.md b/protocols/upnp/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.2
+- Fix a panic caused when `upnp::Gateway` is dropped and its events queue receiver is no longer
+available.
+  See [PR XXXX](https://github.com/libp2p/rust-libp2p/pull/XXXX).
+
 ## 0.2.1
 - Fix a panic caused when dropping `upnp::Behaviour` such as when used together with `Toggle`.
   See [PR 5096](https://github.com/libp2p/rust-libp2p/pull/5096).

diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-upnp"
 edition = "2021"
 rust-version = "1.60.0"
 description = "UPnP support for libp2p transports"
-version = "0.2.1"
+version = "0.2.2"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]

diff --git a/protocols/upnp/src/tokio.rs b/protocols/upnp/src/tokio.rs
@@ -158,10 +158,10 @@ pub(crate) fn search_gateway() -> oneshot::Receiver<Result<Gateway, Box<dyn Erro
                     }
                 }
             };
-            task_sender
-                .send(event)
-                .await
-                .expect("receiver should be available");
+            // Gateway was dropped.
+            if let Err(_) = task_sender.send(event).await {
+                return;
+            }
         }
     });