Merge branch 'release/2023.5.1' into main

shiguredo · May 16, 2023 · f7f74f7 · f7f74f7
2 parents 2885285 + 05f632c
commit f7f74f7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,11 @@
 
 ## develop
 
+## 2023.5.1 (2023-05-16)
+
+- [FIX] ソケット切断時にクラッシュすることがあるのを修正
+    - @melpon
+
 ## 2023.5.0 (2023-05-08)
 
 - [UPDATE] WebRTC を m114.5735.0.1 に上げる

diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
-SORA_CPP_SDK_VERSION=2023.5.0
+SORA_CPP_SDK_VERSION=2023.5.1
 WEBRTC_BUILD_VERSION=m114.5735.0.1
 BOOST_VERSION=1.82.0
 CMAKE_VERSION=3.25.3

diff --git a/src/sora_signaling.cpp b/src/sora_signaling.cpp
@@ -266,7 +266,8 @@ void SoraSignaling::OnRedirect(boost::system::error_code ec,
     return;
   }
 
-  connection_timeout_timer_.cancel();
+  boost::system::error_code tec;
+  connection_timeout_timer_.cancel(tec);
 
   state_ = State::Connected;
   ws_ = ws;
@@ -642,7 +643,8 @@ void SoraSignaling::DoInternalDisconnect(
               });
           self->on_ws_close_ = [self, ec1,
                                 on_close](boost::system::error_code ec2) {
-            self->closing_timeout_timer_.cancel();
+            boost::system::error_code tec;
+            self->closing_timeout_timer_.cancel(tec);
             auto ws_reason = self->ws_->reason();
             std::string ws_reason_str =
                 " wscode=" + std::to_string(ws_reason.code) +
@@ -714,7 +716,8 @@ void SoraSignaling::DoInternalDisconnect(
                 self->ws_->Cancel();
               });
           self->on_ws_close_ = [self, on_close](boost::system::error_code ec) {
-            self->closing_timeout_timer_.cancel();
+            boost::system::error_code tec;
+            self->closing_timeout_timer_.cancel(tec);
             bool ec_error = ec != boost::beast::websocket::error::closed;
             if (ec_error) {
               auto reason = self->ws_->reason();
@@ -785,7 +788,8 @@ void SoraSignaling::OnConnect(boost::system::error_code ec,
     return;
   }
 
-  connection_timeout_timer_.cancel();
+  boost::system::error_code tec;
+  connection_timeout_timer_.cancel(tec);
 
   RTC_LOG(LS_INFO) << "Signaling Websocket is connected: url=" << url;
   state_ = State::Connected;
@@ -1359,8 +1363,9 @@ bool SoraSignaling::SendDataChannel(const std::string& label,
 }
 
 void SoraSignaling::Clear() {
-  connection_timeout_timer_.cancel();
-  closing_timeout_timer_.cancel();
+  boost::system::error_code tec;
+  connection_timeout_timer_.cancel(tec);
+  closing_timeout_timer_.cancel(tec);
   connecting_wss_.clear();
   connected_signaling_url_.clear();
   pc_ = nullptr;

diff --git a/src/websocket.cpp b/src/websocket.cpp
@@ -522,15 +522,17 @@ void Websocket::OnClose(close_callback_t on_close,
   RTC_LOG(LS_INFO) << "Websocket::OnClose this=" << (void*)this
                    << " ec=" << ec.message() << " code=" << reason().code
                    << " reason=" << reason().reason;
-  close_timeout_timer_.cancel();
+  boost::system::error_code tec;
+  close_timeout_timer_.cancel(tec);
   on_close(ec);
 }
 
 void Websocket::Cancel() {
+  boost::system::error_code ec;
   if (IsSSL()) {
-    wss_->next_layer().next_layer().cancel();
+    wss_->next_layer().next_layer().cancel(ec);
   } else {
-    ws_->next_layer().cancel();
+    ws_->next_layer().cancel(ec);
   }
 }