ConnectionManager: check if connexion is running before use

Change-Id: I4f344be3c820b744f442286f8e226f9185fa9cfd
savoirfairelinux · Sep 26, 2024 · 1aaaa96 · 1aaaa96
1 parent aca437e
commit 1aaaa96
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/include/multiplexed_socket.h b/include/multiplexed_socket.h
@@ -123,6 +123,7 @@ class MultiplexedSocket : public std::enable_shared_from_this<MultiplexedSocket>
      * This will close all channels and send a TLS EOF on the main socket.
      */
     void shutdown();
+    bool isRunning() const;
 
     /**
      * This will wait that eventLoop is stopped and stop it if necessary

diff --git a/src/connectionmanager.cpp b/src/connectionmanager.cpp
@@ -883,14 +883,16 @@ ConnectionManager::Impl::connectDevice(const std::shared_ptr<dht::crypto::Certif
         if (auto info = di->getConnectedInfo()) {
             std::unique_lock lkc(info->mutex_);
             if (auto sock = info->socket_) {
-                info->cbIds_.emplace(vid);
-                diw.requested = true;
-                lkc.unlock();
-                lk.unlock();
-                if (sthis->config_->logger)
-                    sthis->config_->logger->debug("[device {}] Peer already connected. Add a new channel", deviceId);
-                sthis->sendChannelRequest(di, info, sock, name, vid);
-                return;
+                if (sock->isRunning()) {
+                    info->cbIds_.emplace(vid);
+                    diw.requested = true;
+                    lkc.unlock();
+                    lk.unlock();
+                    if (sthis->config_->logger)
+                        sthis->config_->logger->debug("[device {}] Peer already connected. Add a new channel", deviceId);
+                    sthis->sendChannelRequest(di, info, sock, name, vid);
+                    return;
+                }
             }
         }
 

diff --git a/src/multiplexed_socket.cpp b/src/multiplexed_socket.cpp
@@ -127,6 +127,10 @@ class MultiplexedSocket::Impl
         clearSockets();
     }
 
+    bool isRunning() const {
+        return !isShutdown_ && !stop;
+    }
+
     std::shared_ptr<ChannelSocket> makeSocket(const std::string& name,
                                               uint16_t channel,
                                               bool isInitiator)
@@ -678,6 +682,12 @@ MultiplexedSocket::shutdown()
     pimpl_->shutdown();
 }
 
+bool
+MultiplexedSocket::isRunning() const
+{
+    return pimpl_->isRunning();
+}
+
 void
 MultiplexedSocket::join()
 {