更新zltoolkit,适配最新代码

src/Http/HttpClient.cpp

@@ -176,7 +176,7 @@ void HttpClient::onRecv(const Buffer::Ptr &pBuf) {
     HttpRequestSplitter::input(pBuf->data(), pBuf->size());
 }
 
-void HttpClient::onErr(const SockException &ex) {
+void HttpClient::onError(const SockException &ex) {
     onResponseCompleted_l(ex);
 }
 

src/Http/HttpClient.h

@@ -177,7 +177,7 @@ protected:
     //// TcpClient override ////
     void onConnect(const toolkit::SockException &ex) override;
     void onRecv(const toolkit::Buffer::Ptr &pBuf) override;
-    void onErr(const toolkit::SockException &ex) override;
+    void onError(const toolkit::SockException &ex) override;
     void onFlush() override;
     void onManager() override;
 

src/Http/HttpFileManager.cpp

@@ -367,7 +367,7 @@ static void accessFile(Session &sender, const Parser &parser, const MediaInfo &m
         replace(const_cast<string &>(media_info._streamid), kHlsSuffix, "");
     }
 
-    weak_ptr<Session> weakSession = sender.shared_from_this();
+    weak_ptr<Session> weakSession = static_pointer_cast<Session>(sender.shared_from_this());
     //判断是否有权限访问该文件
     canAccessPath(sender, parser, media_info, false, [cb, file_path, parser, is_hls, media_info, weakSession](const string &err_msg, const HttpServerCookie::Ptr &cookie) {
         auto strongSession = weakSession.lock();

src/Http/HttpSession.cpp

@@ -612,7 +612,7 @@ void HttpSession::sendResponse(int code,
     }
 
     //发送http body
-    AsyncSenderData::Ptr data = std::make_shared<AsyncSenderData>(shared_from_this(), body, bClose);
+    AsyncSenderData::Ptr data = std::make_shared<AsyncSenderData>(static_pointer_cast<Session>(shared_from_this()), body, bClose);
     getSock()->setOnFlush([data]() { return AsyncSender::onSocketFlushed(data); });
     AsyncSender::onSocketFlushed(data);
 }

src/Http/WebSocketClient.h

@@ -218,7 +218,7 @@ protected:
     /**
      * tcp连接断开
      */
-    void onErr(const toolkit::SockException &ex) override {
+    void onError(const toolkit::SockException &ex) override {
         // tcp断开或者shutdown导致的断开
         onWebSocketException(ex);
     }
@@ -350,7 +350,7 @@ private:
             // 握手成功之后的中途断开
             _onRecv = nullptr;
             if (auto strong_ref = _weak_delegate.lock()) {
-                strong_ref->onErr(ex);
+                strong_ref->onError(ex);
             }
             return;
         }

src/Rtmp/RtmpPlayer.cpp

@@ -90,7 +90,7 @@ void RtmpPlayer::play(const string &url)  {
     startConnect(host_url, port, play_timeout_sec);
 }
 
-void RtmpPlayer::onErr(const SockException &ex){
+void RtmpPlayer::onError(const SockException &ex){
     //定时器_pPlayTimer为空后表明握手结束了
     onPlayResult_l(ex, !_play_timer);
 }

src/Rtmp/RtmpPlayer.h

@@ -50,7 +50,7 @@ protected:
     //form Tcpclient
     void onRecv(const toolkit::Buffer::Ptr &buf) override;
     void onConnect(const toolkit::SockException &err) override;
-    void onErr(const toolkit::SockException &ex) override;
+    void onError(const toolkit::SockException &ex) override;
     //from RtmpProtocol
     void onRtmpChunk(RtmpPacket::Ptr chunk_data) override;
     void onStreamDry(uint32_t stream_index) override;

src/Rtmp/RtmpPusher.cpp

@@ -97,7 +97,7 @@ void RtmpPusher::publish(const string &url)  {
     startConnect(host_url, port);
 }
 
-void RtmpPusher::onErr(const SockException &ex){
+void RtmpPusher::onError(const SockException &ex){
     //定时器_pPublishTimer为空后表明握手结束了
     onPublishResult_l(ex, !_publish_timer);
 }

src/Rtmp/RtmpPusher.h

@@ -31,7 +31,7 @@ protected:
     //for Tcpclient override
     void onRecv(const toolkit::Buffer::Ptr &buf) override;
     void onConnect(const toolkit::SockException &err) override;
-    void onErr(const toolkit::SockException &ex) override;
+    void onError(const toolkit::SockException &ex) override;
 
     //for RtmpProtocol override
     void onRtmpChunk(RtmpPacket::Ptr chunk_data) override;

src/Rtsp/RtspPlayer.cpp

@@ -131,7 +131,7 @@ void RtspPlayer::onRecv(const Buffer::Ptr& buf) {
     }
 }
 
-void RtspPlayer::onErr(const SockException &ex) {
+void RtspPlayer::onError(const SockException &ex) {
     //定时器_pPlayTimer为空后表明握手结束了
     onPlayResult_l(ex,!_play_check_timer);
 }

src/Rtsp/RtspPlayer.h

@@ -84,7 +84,7 @@ protected:
     /////////////TcpClient override/////////////
     void onConnect(const toolkit::SockException &err) override;
     void onRecv(const toolkit::Buffer::Ptr &buf) override;
-    void onErr(const toolkit::SockException &ex) override;
+    void onError(const toolkit::SockException &ex) override;
 
 private:
     void onPlayResult_l(const toolkit::SockException &ex , bool handshake_done);

src/Rtsp/RtspPusher.cpp

@@ -118,7 +118,7 @@ void RtspPusher::onPublishResult_l(const SockException &ex, bool handshake_done)
     }
 }
 
-void RtspPusher::onErr(const SockException &ex) {
+void RtspPusher::onError(const SockException &ex) {
     //定时器_pPublishTimer为空后表明握手结束了
     onPublishResult_l(ex, !_publish_timer);
 }

src/Rtsp/RtspPusher.h

@@ -35,7 +35,7 @@ protected:
     //for Tcpclient override
     void onRecv(const toolkit::Buffer::Ptr &buf) override;
     void onConnect(const toolkit::SockException &err) override;
-    void onErr(const toolkit::SockException &ex) override;
+    void onError(const toolkit::SockException &ex) override;
 
     //RtspSplitter override
     void onWholeRtspPacket(Parser &parser) override ;