２個目以上の WS 接続で落ちることがあったのを修正

shiguredo · Oct 24, 2024 · a28da31 · a28da31
1 parent 06af5af
commit a28da31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/include/sora/sora_signaling.h b/include/sora/sora_signaling.h
@@ -325,7 +325,6 @@ class SoraSignaling : public std::enable_shared_from_this<SoraSignaling>,
     Connected,
     Closing,
     Closed,
-    Destructing,
   };
 
   State state_ = State::Init;

diff --git a/src/sora_signaling.cpp b/src/sora_signaling.cpp
@@ -759,10 +759,6 @@ void SoraSignaling::OnConnect(boost::system::error_code ec,
                      [ws](std::shared_ptr<Websocket> p) { return p == ws; }),
       connecting_wss_.end());
 
-  if (state_ == State::Closed) {
-    return;
-  }
-
   if (ec) {
     RTC_LOG(LS_WARNING) << "Failed Websocket handshake: " << ec
                         << " url=" << url << " state=" << (int)state_
@@ -779,9 +775,10 @@ void SoraSignaling::OnConnect(boost::system::error_code ec,
     return;
   }
 
-  if (state_ == State::Connected || state_ == State::Redirecting) {
+  if (state_ == State::Connected || state_ == State::Redirecting ||
+      state_ == State::Closing || state_ == State::Closed) {
     // 既に他の接続が先に完了していたので、切断する
-    ws->Close([self = shared_from_this(), ws](boost::system::error_code) {},
+    ws->Close([ws](boost::system::error_code) {},
               config_.websocket_close_timeout);
     return;
   }