SquashSRS4: Fix DTLS config bug, dup Alert bug. 4.0.83

README.md

@@ -186,6 +186,8 @@ Other documents:
 
 ## V4 changes
 
+* v4.0, 2021-03-08, DTLS: Fix dead loop by duplicated Alert message. 4.0.83
+* v4.0, 2021-03-08, Fix bug when client DTLS is passive. 4.0.82
 * v4.0, 2021-03-03, Fix [#2106][bug #2106], [#2011][bug #2011], RTMP/AAC transcode to Opus bug. 4.0.81
 * v4.0, 2021-03-02, Refine build script for FFmpeg and SRTP. 4.0.80
 * v4.0, 2021-03-02, Upgrade libsrtp from 2.0.0 to 2.3.0, with source code. 4.0.79

trunk/src/app/srs_app_rtc_conn.cpp

@@ -1920,7 +1920,7 @@ srs_error_t SrsRtcConnection::initialize(SrsRequest* r, bool dtls, bool srtp, st
         }
     }
 
-    SrsSessionConfig* cfg = &local_sdp.session_config_;
+    SrsSessionConfig* cfg = &local_sdp.session_negotiate_;
     if ((err = transport_->initialize(cfg)) != srs_success) {
         return srs_error_wrap(err, "init");
     }

trunk/src/app/srs_app_rtc_dtls.cpp

@@ -471,17 +471,33 @@ srs_error_t SrsDtlsImpl::do_on_dtls(char* data, int nb_data)
         return srs_error_wrap(err, "do handshake");
     }
 
-    while (BIO_ctrl_pending(bio_in) > 0) {
+    // If there is data in bio_in, read it to let SSL consume it.
+    // @remark Limit the max loop, to avoid the dead loop.
+    for (int i = 0; i < 1024 && BIO_ctrl_pending(bio_in) > 0; i++) {
         char buf[8092];
-        int nb = SSL_read(dtls, buf, sizeof(buf));
-        if (nb <= 0) {
+        int r0 = SSL_read(dtls, buf, sizeof(buf));
+        int r1 = SSL_get_error(dtls, r0);
+
+        if (r0 <= 0) {
+            // SSL_ERROR_ZERO_RETURN
+            //
+            // The TLS/SSL connection has been closed. If the protocol version is SSL 3.0 or higher,
+            // this result code is returned only if a closure alert has occurred in the protocol,
+            // i.e. if the connection has been closed cleanly.
+            // @see https://www.openssl.org/docs/man1.1.0/man3/SSL_get_error.html
+            // @remark Already close, never read again, because padding always exsists.
+            if (r1 != SSL_ERROR_WANT_READ && r1 != SSL_ERROR_WANT_WRITE) {
+                break;
+            }
             continue;
         }
-        srs_trace("DTLS: read nb=%d, data=[%s]", nb, srs_string_dumps_hex(buf, nb, 32).c_str());
 
-        if ((err = callback_->on_dtls_application_data(buf, nb)) != srs_success) {
-            return srs_error_wrap(err, "on DTLS data, size=%u, data=[%s]", nb,
-                srs_string_dumps_hex(buf, nb, 32).c_str());
+        srs_trace("DTLS: read r0=%d, r1=%d, padding=%d, done=%d, data=[%s]",
+            r0, r1, BIO_ctrl_pending(bio_in), handshake_done_for_us, srs_string_dumps_hex(buf, r0, 32).c_str());
+
+        if ((err = callback_->on_dtls_application_data(buf, r0)) != srs_success) {
+            return srs_error_wrap(err, "on DTLS data, done=%d, r1=%d, size=%u, data=[%s]", handshake_done_for_us,
+                r1, r0, srs_string_dumps_hex(buf, r0, 32).c_str());
         }
     }
 

trunk/src/app/srs_app_rtc_dtls.hpp

@@ -118,7 +118,7 @@ protected:
     // @remark: dtls_version_ default value is SrsDtlsVersionAuto.
     SrsDtlsVersion version_;
 protected:
-    // Whether the handhshake is done, for us only.
+    // Whether the handshake is done, for us only.
     // @remark For us only, means peer maybe not done, we also need to handle the DTLS packet.
     bool handshake_done_for_us;
     // DTLS packet cache, only last out-going packet.

trunk/src/app/srs_app_rtc_sdp.hpp

@@ -37,7 +37,7 @@ const std::string kTWCCExt = "http://www.ietf.org/id/draft-holmer-rmcat-transpor
 // TDOO: FIXME: Rename it, and add utest.
 extern std::vector<std::string> split_str(const std::string& str, const std::string& delim);
 
-struct SrsSessionConfig
+class SrsSessionConfig
 {
 public:
     std::string dtls_role;
@@ -237,6 +237,7 @@ public:
 
     SrsSessionInfo session_info_;
     SrsSessionConfig session_config_;
+    SrsSessionConfig session_negotiate_;
 
     std::vector<std::string> groups_;
     std::string group_policy_;

trunk/src/app/srs_app_rtc_server.cpp

@@ -590,18 +590,23 @@ srs_error_t SrsRtcServer::do_create_session(
         srs_trace("RTC: Use candidates %s", srs_join_vector_string(candidate_ips, ", ").c_str());
     }
 
+    // Setup the negotiate DTLS by config.
+    local_sdp.session_negotiate_ = local_sdp.session_config_;
+
+    // Setup the negotiate DTLS role.
     if (remote_sdp.get_dtls_role() == "active") {
-        local_sdp.set_dtls_role("passive");
+        local_sdp.session_negotiate_.dtls_role = "passive";
     } else if (remote_sdp.get_dtls_role() == "passive") {
-        local_sdp.set_dtls_role("active");
+        local_sdp.session_negotiate_.dtls_role = "active";
     } else if (remote_sdp.get_dtls_role() == "actpass") {
-        local_sdp.set_dtls_role(local_sdp.session_config_.dtls_role);
+        local_sdp.session_negotiate_.dtls_role = local_sdp.session_config_.dtls_role;
     } else {
         // @see: https://tools.ietf.org/html/rfc4145#section-4.1
         // The default value of the setup attribute in an offer/answer exchange
         // is 'active' in the offer and 'passive' in the answer.
-        local_sdp.set_dtls_role("passive");
+        local_sdp.session_negotiate_.dtls_role = "passive";
     }
+    local_sdp.set_dtls_role(local_sdp.session_negotiate_.dtls_role);
 
     session->set_remote_sdp(remote_sdp);
     // We must setup the local SDP, then initialize the session object.

trunk/src/app/srs_app_rtc_source.cpp

@@ -433,6 +433,8 @@ void SrsRtcStream::on_consumer_destroy(SrsRtcConsumer* consumer)
 
 bool SrsRtcStream::can_publish()
 {
+    // TODO: FIXME: Should check the status of bridger.
+    
     return !is_created_;
 }
 

trunk/src/app/srs_app_source.cpp

@@ -2123,6 +2123,8 @@ void SrsSource::update_auth(SrsRequest* r)
 
 bool SrsSource::can_publish(bool is_edge)
 {
+    // TODO: FIXME: Should check the status of bridger.
+
     if (is_edge) {
         return publish_edge->can_publish();
     }

trunk/src/core/srs_core_version4.hpp

@@ -24,6 +24,6 @@
 #ifndef SRS_CORE_VERSION4_HPP
 #define SRS_CORE_VERSION4_HPP
 
-#define SRS_VERSION4_REVISION 81
+#define SRS_VERSION4_REVISION 83
 
 #endif