From 0cab9c8d160600fd37b194e0388fb9e1da551b87 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sat, 27 Aug 2022 10:59:15 +0800
Subject: [PATCH] =?UTF-8?q?rtp=E5=8F=91=E9=80=81=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E9=87=8D=E8=BF=9E=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Rtp/RtpSender.cpp | 34 +++-------------------------------
 src/Rtp/RtpSender.h   |  3 +--
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/src/Rtp/RtpSender.cpp b/src/Rtp/RtpSender.cpp
index 47f4a900..4990f7ff 100644
--- a/src/Rtp/RtpSender.cpp
+++ b/src/Rtp/RtpSender.cpp
@@ -281,38 +281,10 @@ void RtpSender::onFlushRtpList(shared_ptr<List<Buffer::Ptr> > rtp_list) {
     });
 }
 
-void RtpSender::onErr(const SockException &ex, bool is_connect) {
+void RtpSender::onErr(const SockException &ex) {
     _is_connect = false;
-
-    if (_args.passive || !_args.is_udp) {
-        WarnL << "send rtp tcp connection lost: " << ex.what();
-        //tcp模式，如果对方断开连接，应该停止发送rtp
-        onClose(ex);
-        return;
-    }
-
-    //监听socket断开事件，方便重连
-    if (is_connect) {
-        WarnL << "重连" << _args.dst_url << ":" << _args.dst_port << "失败, 原因为:" << ex.what();
-    } else {
-        WarnL << "停止发送 rtp:" << _args.dst_url << ":" << _args.dst_port << ", 原因为:" << ex.what();
-    }
-
-    weak_ptr<RtpSender> weak_self = shared_from_this();
-    _connect_timer = std::make_shared<Timer>(10.0f, [weak_self]() {
-        auto strong_self = weak_self.lock();
-        if (!strong_self) {
-            return false;
-        }
-        strong_self->startSend(strong_self->_args, [weak_self](uint16_t local_port, const SockException &ex){
-            auto strong_self = weak_self.lock();
-            if (strong_self && ex) {
-                //连接失败且本对象未销毁，那么重试连接
-                strong_self->onErr(ex, true);
-            }
-        });
-        return false;
-    }, _poller);
+    WarnL << "send rtp tcp connection lost: " << ex.what();
+    onClose(ex);
 }
 
 void RtpSender::setOnClose(std::function<void(const toolkit::SockException &ex)> on_close){
diff --git a/src/Rtp/RtpSender.h b/src/Rtp/RtpSender.h
index bebd2ac3..9bafd537 100644
--- a/src/Rtp/RtpSender.h
+++ b/src/Rtp/RtpSender.h
@@ -62,7 +62,7 @@ private:
     //udp/tcp连接成功回调
     void onConnect();
     //异常断开socket事件
-    void onErr(const toolkit::SockException &ex, bool is_connect = false);
+    void onErr(const toolkit::SockException &ex);
     void createRtcpSocket();
     void onRecvRtcp(RtcpHeader *rtcp);
     void onSendRtpUdp(const toolkit::Buffer::Ptr &buf, bool check);
@@ -74,7 +74,6 @@ private:
     toolkit::Socket::Ptr _socket_rtp;
     toolkit::Socket::Ptr _socket_rtcp;
     toolkit::EventPoller::Ptr _poller;
-    toolkit::Timer::Ptr _connect_timer;
     MediaSinkInterface::Ptr _interface;
     std::shared_ptr<RtcpContext> _rtcp_context;
     toolkit::Ticker _rtcp_send_ticker;