From fcb0124f2923891d508ccd696dfd28df20de0154 Mon Sep 17 00:00:00 2001 From: xia-chu <771730766@qq.com> Date: Wed, 19 Apr 2023 13:12:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=9B=B4=E6=96=B0zltoolkit,?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A2=9E=E5=BC=BA=E7=BD=91=E7=BB=9C=E5=BA=93?= =?UTF-8?q?=EF=BC=9A#2397?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3rdpart/ZLToolKit | 2 +- webrtc/WebRtcSession.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit index ca26e43a..dd1d308b 160000 --- a/3rdpart/ZLToolKit +++ b/3rdpart/ZLToolKit @@ -1 +1 @@ -Subproject commit ca26e43a5f62986bb8a007226e0bad148d154abc +Subproject commit dd1d308bd01a3aab038a87b938013be39134e1c1 diff --git a/webrtc/WebRtcSession.cpp b/webrtc/WebRtcSession.cpp index ade1ce20..87fcc116 100644 --- a/webrtc/WebRtcSession.cpp +++ b/webrtc/WebRtcSession.cpp @@ -71,7 +71,7 @@ void WebRtcSession::onRecv_l(const char *data, size_t len) { if (!transport->getPoller()->isCurrentThread()) { auto sock = Socket::createSocket(transport->getPoller(), false); //1、克隆socket(fd不变),切换poller线程到WebRtcTransport所在线程 - sock->cloneFromPeerSocket(*(getSock())); + sock->cloneSocket(*(getSock())); auto server = _server; std::string str(data, len); sock->getPoller()->async([sock, server, str](){