commit c5b971d6eacc32114fe9ae0f156a37ed56c4a194
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Tue Jun 13 19:41:25 2023 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Tue Jun 13 20:05:24 2023 -0400
tree d13ec88eb6ac6d6b3efac5bf5f84e32aa3abd50c
parent 7e8b056dcdb33bf4e69c250ed5c4e3dd3631a40d

connectionmanager: do not cancel all waiting channel if first is declined

backport of 22d5417da3023095695d3b9655403b5632f528db in jami-daemon

Change-Id: I865617ff71d1a5fc96fd075b23cd8f85dc7e6599

include/multiplexed_socket.h

diff --git a/include/multiplexed_socket.h b/include/multiplexed_socket.h
index d8e6e16..9e254bb 100644
--- a/include/multiplexed_socket.h
+++ b/include/multiplexed_socket.h
@@ -48,7 +48,7 @@
                          const std::string& /* name */)>;
 using OnConnectionReadyCb
     = std::function<void(const DeviceId& /* deviceId */, const std::shared_ptr<ChannelSocket>&)>;
-using ChannelReadyCb = std::function<void(void)>;
+using ChannelReadyCb = std::function<void(bool)>;
 using OnShutdownCb = std::function<void(void)>;
 
 static constexpr auto SEND_BEACON_TIMEOUT = std::chrono::milliseconds(3000);
@@ -298,7 +298,7 @@
      */
     void shutdown() override;
 
-    void ready();
+    void ready(bool accepted);
     /**
      * Triggered when a specific channel is ready
      * Used by ConnectionManager::connectDevice()