Threads: Keep alive when got RTP plaintext

winlinvip · winlinvip · commit 14bc7bca27f2 · 2021-04-26T08:13:30.000+08:00
diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp
@@ -205,37 +205,21 @@ srs_error_t SrsSecurityTransport::srtp_initialize()
 
 srs_error_t SrsSecurityTransport::on_rtp_plaintext(char* plaintext, int size)
 {
-    // We should keep alive here, because when tunnel is enabled, the connection die
-    // for the SrsRtcServer::on_udp_packet might be skipped.
-    session_->alive();
-
     return session_->on_rtp_plaintext(plaintext, size);
 }
 
 srs_error_t SrsSecurityTransport::on_rtcp_plaintext(char* plaintext, int size)
 {
-    // We should keep alive here, because when tunnel is enabled, the connection die
-    // for the SrsRtcServer::on_udp_packet might be skipped.
-    session_->alive();
-
     return session_->on_rtcp_plaintext(plaintext, size);
 }
 
 srs_error_t SrsSecurityTransport::on_rtp_cipher(char* cipher, int size)
 {
-    // We should keep alive here, because when tunnel is enabled, the connection die
-    // for the SrsRtcServer::on_udp_packet might be skipped.
-    session_->alive();
-
     return session_->on_rtp_cipher(cipher, size);
 }
 
 srs_error_t SrsSecurityTransport::on_rtcp_cipher(char* cipher, int size)
 {
-    // We should keep alive here, because when tunnel is enabled, the connection die
-    // for the SrsRtcServer::on_udp_packet might be skipped.
-    session_->alive();
-
     return session_->on_rtcp_cipher(cipher, size);
 }
 
@@ -2245,6 +2229,9 @@ srs_error_t SrsRtcConnection::on_rtp_plaintext(char* plaintext, int nb_plaintext
 {
     srs_error_t err = srs_success;
 
+    // We should keep alive here, for tunnel is enabled.
+    alive();
+
     SrsRtcPublishStream* publisher = NULL;
     if ((err = find_publisher(plaintext, nb_plaintext, &publisher)) != srs_success) {
         return srs_error_wrap(err, "find");

Original file line number	Diff line number	Diff line change
`@@ -205,37 +205,21 @@ srs_error_t SrsSecurityTransport::srtp_initialize()`
`205`	`205`
`206`	`206`	`srs_error_t SrsSecurityTransport::on_rtp_plaintext(char* plaintext, int size)`
`207`	`207`	`{`
`208`		`- // We should keep alive here, because when tunnel is enabled, the connection die`
`209`		`- // for the SrsRtcServer::on_udp_packet might be skipped.`
`210`		`- session_->alive();`
`211`		`-`
`212`	`208`	`return session_->on_rtp_plaintext(plaintext, size);`
`213`	`209`	`}`
`214`	`210`
`215`	`211`	`srs_error_t SrsSecurityTransport::on_rtcp_plaintext(char* plaintext, int size)`
`216`	`212`	`{`
`217`		`- // We should keep alive here, because when tunnel is enabled, the connection die`
`218`		`- // for the SrsRtcServer::on_udp_packet might be skipped.`
`219`		`- session_->alive();`
`220`		`-`
`221`	`213`	`return session_->on_rtcp_plaintext(plaintext, size);`
`222`	`214`	`}`
`223`	`215`
`224`	`216`	`srs_error_t SrsSecurityTransport::on_rtp_cipher(char* cipher, int size)`
`225`	`217`	`{`
`226`		`- // We should keep alive here, because when tunnel is enabled, the connection die`
`227`		`- // for the SrsRtcServer::on_udp_packet might be skipped.`
`228`		`- session_->alive();`
`229`		`-`
`230`	`218`	`return session_->on_rtp_cipher(cipher, size);`
`231`	`219`	`}`
`232`	`220`
`233`	`221`	`srs_error_t SrsSecurityTransport::on_rtcp_cipher(char* cipher, int size)`
`234`	`222`	`{`
`235`		`- // We should keep alive here, because when tunnel is enabled, the connection die`
`236`		`- // for the SrsRtcServer::on_udp_packet might be skipped.`
`237`		`- session_->alive();`
`238`		`-`
`239`	`223`	`return session_->on_rtcp_cipher(cipher, size);`
`240`	`224`	`}`
`241`	`225`
`@@ -2245,6 +2229,9 @@ srs_error_t SrsRtcConnection::on_rtp_plaintext(char* plaintext, int nb_plaintext`
`2245`	`2229`	`{`
`2246`	`2230`	`srs_error_t err = srs_success;`
`2247`	`2231`
	`2232`	`+ // We should keep alive here, for tunnel is enabled.`
	`2233`	`+ alive();`
	`2234`	`+`
`2248`	`2235`	`SrsRtcPublishStream* publisher = NULL;`
`2249`	`2236`	`if ((err = find_publisher(plaintext, nb_plaintext, &publisher)) != srs_success) {`
`2250`	`2237`	`return srs_error_wrap(err, "find");`