SmartPtr: Support interrupt transport when close session.

ossrs · Jun 13, 2024 · f3fda03 · f3fda03
1 parent f8ab409
commit f3fda03
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/trunk/src/app/srs_app_rtc_network.cpp b/trunk/src/app/srs_app_rtc_network.cpp
@@ -436,7 +436,7 @@ srs_error_t SrsRtcUdpNetwork::write(void* buf, size_t size, ssize_t* nwrite)
     return sendonly_skt_->sendto(buf, size, SRS_UTIME_NO_TIMEOUT);
 }
 
-SrsRtcTcpNetwork::SrsRtcTcpNetwork(SrsRtcConnection* conn, SrsEphemeralDelta* delta) : owner_(NULL)
+SrsRtcTcpNetwork::SrsRtcTcpNetwork(SrsRtcConnection* conn, SrsEphemeralDelta* delta) : owner_(new SrsRtcTcpConn())
 {
     conn_ = conn;
     delta_ = delta;
@@ -448,6 +448,7 @@ SrsRtcTcpNetwork::SrsRtcTcpNetwork(SrsRtcConnection* conn, SrsEphemeralDelta* de
 
 SrsRtcTcpNetwork::~SrsRtcTcpNetwork()
 {
+    owner_->interrupt();
     srs_freep(transport_);
 }
 
@@ -693,13 +694,20 @@ void SrsRtcTcpNetwork::dispose()
 
 #define SRS_RTC_TCP_PACKET_MAX 1500
 
-SrsRtcTcpConn::SrsRtcTcpConn(ISrsProtocolReadWriter* skt, std::string cip, int port)
+SrsRtcTcpConn::SrsRtcTcpConn()
 {
     wrapper_ = NULL;
     owner_coroutine_ = NULL;
     owner_cid_ = NULL;
     cid_ = _srs_context->get_id();
 
+    pkt_ = NULL;
+    delta_ = NULL;
+    skt_ = NULL;
+}
+
+SrsRtcTcpConn::SrsRtcTcpConn(ISrsProtocolReadWriter* skt, std::string cip, int port) : SrsRtcTcpConn()
+{
     ip_ = cip;
     port_ = port;
     skt_ = skt;
@@ -728,6 +736,12 @@ ISrsKbpsDelta* SrsRtcTcpConn::delta()
     return delta_;
 }
 
+void SrsRtcTcpConn::interrupt()
+{
+    session_ = NULL;
+    if (owner_coroutine_) owner_coroutine_->interrupt();
+}
+
 std::string SrsRtcTcpConn::desc()
 {
     return "Tcp";
@@ -863,7 +877,7 @@ srs_error_t SrsRtcTcpConn::handshake()
 
     // Should support only one TCP candidate.
     SrsRtcTcpNetwork* network = dynamic_cast<SrsRtcTcpNetwork*>(session->tcp());
-    if (!network->owner().get()) {
+    if (network->owner().get() != this) {
         network->set_owner(*wrapper_);
         session_ = session;
     }

diff --git a/trunk/src/app/srs_app_rtc_network.hpp b/trunk/src/app/srs_app_rtc_network.hpp
@@ -253,13 +253,16 @@ class SrsRtcTcpConn : public ISrsConnection, public ISrsCoroutineHandler, public
     ISrsContextIdSetter* owner_cid_;
     SrsContextId cid_;
 public:
+    SrsRtcTcpConn();
     SrsRtcTcpConn(ISrsProtocolReadWriter* skt, std::string cip, int port);
     virtual ~SrsRtcTcpConn();
 public:
     // Setup the owner, the wrapper is the shared ptr, the interruptable object is the coroutine, and the cid is the context id.
     void setup_owner(SrsSharedResource<SrsRtcTcpConn>* wrapper, ISrsInterruptable* owner_coroutine, ISrsContextIdSetter* owner_cid);
 public:
     ISrsKbpsDelta* delta();
+    // Interrupt transport by session.
+    void interrupt();
 // Interface ISrsResource.
 public:
     virtual std::string desc();