upnp: ensure proper removal of open ports

Every port but one was being left open after quitting the app.
This change ensures no deadlocks or race conditions prevent the
closure of mapped ports.

Change-Id: I953a2a714f0f4550d64cce66ac61ec93c4c9798f

Author: moc-sfl

src/upnp/protocol/pupnp/pupnp.cpp

@@ -648,7 +648,7 @@ PUPnP::requestMappingRemove(const Mapping& mapping)
     asio::post(*ioContext, [w = weak(), mapping] {
         if (auto upnpThis = w.lock()) {
             // Abort if we are shutting down.
-            if (not upnpThis->isRunning())
+            if (not upnpThis->clientRegistered_)
                 return;
             if (upnpThis->actionDeletePortMapping(mapping)) {
                 upnpThis->processRemoveMapAction(mapping);

src/upnp/upnp_context.cpp

@@ -98,6 +98,14 @@ UPnPContext::shutdown(std::condition_variable& cv)
 
     stopUpnp(true);
 
+    std::promise<void> ioFlushed;
+    asio::post(*ioCtx, [&ioFlushed] { ioFlushed.set_value(); });
+    auto status = ioFlushed.get_future().wait_for(std::chrono::seconds(5));
+    if (status == std::future_status::timeout) {
+        if (logger_)
+            logger_->warn("Timed out waiting for pending UPnP operations to complete");
+    }
+
     for (auto const& [_, proto] : protocolList_) {
         proto->terminate();
     }
@@ -224,8 +232,6 @@ UPnPContext::stopUpnp(bool forceRelease)
                 toRemoveList.emplace_back(map);
             }
         }
-        // Invalidate the current IGD.
-        currentIgd_.reset();
     }
     for (auto const& map : toRemoveList) {
         requestRemoveMapping(map);
@@ -238,6 +244,11 @@ UPnPContext::stopUpnp(bool forceRelease)
             unregisterMapping(map);
         }
     }
+    {
+        // Invalidate the current IGD.
+        std::lock_guard lock(mappingMutex_);
+        currentIgd_.reset();
+    }
 
     // Clear all current IGDs.
     for (auto const& [_, protocol] : protocolList_) {