commit b6504373145c5505d87bb9620e2daa1d86d44181
author Sébastien Blin <sebastien.blin@savoirfairelinux.com> Thu Oct 12 10:35:35 2023 -0400
committer Sébastien Blin <sebastien.blin@savoirfairelinux.com> Mon Oct 16 09:05:33 2023 -0400
tree c468e0a2f9abf0ec97f9dcbf50e2363539716213
parent ef3e9fd429a79c96cc35c6d8b5712dca54525855

connectionmanager: pass weak to dht()->getPublicAddress()

dht() can live longer, so technically there is nothing preventing
this to be nullptr there

Change-Id: Ifc77f1a9c8e3b3d889da16056a7e8965ec4786ed

src/connectionmanager.cpp

diff --git a/src/connectionmanager.cpp b/src/connectionmanager.cpp
index 62fb4ef..cf78c54 100644
--- a/src/connectionmanager.cpp
+++ b/src/connectionmanager.cpp
@@ -1474,27 +1474,30 @@
 void
 ConnectionManager::Impl::storeActiveIpAddress(std::function<void()>&& cb)
 {
-    dht()->getPublicAddress([this, cb = std::move(cb)](std::vector<dht::SockAddr>&& results) {
+    dht()->getPublicAddress([w=weak(), cb = std::move(cb)](std::vector<dht::SockAddr>&& results) {
+        auto shared = w.lock();
+        if (!shared)
+            return;
         bool hasIpv4 {false}, hasIpv6 {false};
         for (auto& result : results) {
             auto family = result.getFamily();
             if (family == AF_INET) {
                 if (not hasIpv4) {
                     hasIpv4 = true;
-                    if (config_->logger)
-                        config_->logger->debug("Store DHT public IPv4 address: {}", result);
+                    if (shared->config_->logger)
+                        shared->config_->logger->debug("Store DHT public IPv4 address: {}", result);
                     //JAMI_DBG("Store DHT public IPv4 address : %s", result.toString().c_str());
-                    setPublishedAddress(*result.get());
-                    if (config_->upnpCtrl) {
-                        config_->upnpCtrl->setPublicAddress(*result.get());
+                    shared->setPublishedAddress(*result.get());
+                    if (shared->config_->upnpCtrl) {
+                        shared->config_->upnpCtrl->setPublicAddress(*result.get());
                     }
                 }
             } else if (family == AF_INET6) {
                 if (not hasIpv6) {
                     hasIpv6 = true;
-                    if (config_->logger)
-                        config_->logger->debug("Store DHT public IPv6 address: {}", result);
-                    setPublishedAddress(*result.get());
+                    if (shared->config_->logger)
+                        shared->config_->logger->debug("Store DHT public IPv6 address: {}", result);
+                    shared->setPublishedAddress(*result.get());
                 }
             }
             if (hasIpv4 and hasIpv6)