适配zltoolkit

3rdpart/ZLToolKit

@@ -1 +1 @@
-Subproject commit ca4985c2dc34426363c5ab4eb82f941bcd31cdc2
+Subproject commit 58d0e6a4488a290e966b2a0535445dc75af0529c

server/WebApi.cpp

@@ -25,6 +25,7 @@
 #include "Http/HttpRequester.h"
 #include "Http/HttpSession.h"
 #include "Network/TcpServer.h"
+#include "Network/UdpServer.h"
 #include "Player/PlayerProxy.h"
 #include "Util/MD5.h"
 #include "WebApi.h"
@@ -538,7 +539,7 @@ void installWebApi() {
         uint16_t local_port = allArgs["local_port"].as<uint16_t>();
         string &peer_ip = allArgs["peer_ip"];
 
-        SessionMap::Instance().for_each_session([&](const string &id,const TcpSession::Ptr &session){
+        SessionMap::Instance().for_each_session([&](const string &id,const Session::Ptr &session){
             if(local_port != 0 && local_port != session->get_local_port()){
                 return;
             }
@@ -577,8 +578,8 @@ void installWebApi() {
         string &peer_ip = allArgs["peer_ip"];
         size_t count_hit = 0;
 
-        list<TcpSession::Ptr> session_list;
+        list<Session::Ptr> session_list;
-        SessionMap::Instance().for_each_session([&](const string &id,const TcpSession::Ptr &session){
+        SessionMap::Instance().for_each_session([&](const string &id,const Session::Ptr &session){
             if(local_port != 0 && local_port != session->get_local_port()){
                 return;
             }
@@ -1038,6 +1039,8 @@ void installWebApi() {
 
         val["data"]["TcpServer"] = (Json::UInt64)(ObjectStatistic<TcpServer>::count());
         val["data"]["TcpSession"] = (Json::UInt64)(ObjectStatistic<TcpSession>::count());
+        val["data"]["UdpServer"] = (Json::UInt64)(ObjectStatistic<UdpServer>::count());
+        val["data"]["UdpSession"] = (Json::UInt64)(ObjectStatistic<UdpSession>::count());
         val["data"]["TcpClient"] = (Json::UInt64)(ObjectStatistic<TcpClient>::count());
         val["data"]["Socket"] = (Json::UInt64)(ObjectStatistic<Socket>::count());
 

src/Http/WebSocketSession.h

@@ -104,9 +104,9 @@ public:
         }
     }
 
-    void attachServer(const TcpServer &server) override{
+    void attachServer(const Server &server) override{
         HttpSessionType::attachServer(server);
-        _weak_server = const_cast<TcpServer &>(server).shared_from_this();
+        _weak_server = const_cast<Server &>(server).shared_from_this();
     }
 
 protected:
@@ -226,7 +226,7 @@ protected:
 private:
     string _payload_cache;
     string _payload_section;
-    weak_ptr<TcpServer> _weak_server;
+    weak_ptr<Server> _weak_server;
     TcpSession::Ptr _session;
     Creator _creator;
 };

src/Rtp/RtpSender.cpp

@@ -54,7 +54,7 @@ void RtpSender::startSend(const string &dst_url, uint16_t dst_port, bool is_udp,
                 cb(local_port, SockException());
                 auto strong_self = weak_self.lock();
                 if (strong_self) {
-                    strong_self->_socket->setSendPeerAddr(&addr);
+                    strong_self->_socket->bindPeerAddr(&addr);
                     strong_self->onConnect();
                 }
             });

src/Rtp/RtpSession.cpp

@@ -17,8 +17,8 @@ namespace mediakit{
 
 const string RtpSession::kStreamID = "stream_id";
 
-void RtpSession::attachServer(const TcpServer &server) {
+void RtpSession::attachServer(const Server &server) {
-    _stream_id = const_cast<TcpServer &>(server)[kStreamID];
+    _stream_id = const_cast<Server &>(server)[kStreamID];
 }
 
 RtpSession::RtpSession(const Socket::Ptr &sock) : TcpSession(sock) {

src/Rtp/RtpSession.h

@@ -28,7 +28,7 @@ public:
     void onRecv(const Buffer::Ptr &) override;
     void onError(const SockException &err) override;
     void onManager() override;
-    void attachServer(const TcpServer &server) override;
+    void attachServer(const Server &server) override;
 
 protected:
     // 通知其停止推流

src/Rtsp/RtpMultiCaster.cpp

@@ -127,7 +127,7 @@ RtpMultiCaster::RtpMultiCaster(SocketHelper &helper, const string &local_ip, con
         //组播目标地址
         peer.sin_addr.s_addr = htonl(*_multicast_ip);
         bzero(&(peer.sin_zero), sizeof peer.sin_zero);
-        _udp_sock[i]->setSendPeerAddr((struct sockaddr *) &peer);
+        _udp_sock[i]->bindPeerAddr((struct sockaddr *) &peer);
     }
 
     _rtp_reader = src->getRing()->attach(helper.getPoller());

src/Rtsp/RtspPlayer.cpp

@@ -306,7 +306,7 @@ void RtspPlayer::handleResSETUP(const Parser &parser, unsigned int track_idx) {
             rtpto.sin_port = ntohs(rtp_port);
             rtpto.sin_family = AF_INET;
             rtpto.sin_addr.s_addr = inet_addr(get_peer_ip().data());
-            pRtpSockRef->setSendPeerAddr((struct sockaddr *)&(rtpto));
+            pRtpSockRef->bindPeerAddr((struct sockaddr *)&(rtpto));
             //发送rtp打洞包
             pRtpSockRef->send("\xce\xfa\xed\xfe", 4);
 
@@ -314,7 +314,7 @@ void RtspPlayer::handleResSETUP(const Parser &parser, unsigned int track_idx) {
             rtpto.sin_port = ntohs(rtcp_port);
             rtpto.sin_family = AF_INET;
             rtpto.sin_addr.s_addr = inet_addr(get_peer_ip().data());
-            pRtcpSockRef->setSendPeerAddr((struct sockaddr *)&(rtpto));
+            pRtcpSockRef->bindPeerAddr((struct sockaddr *)&(rtpto));
         }
 
         auto srcIP = inet_addr(get_peer_ip().data());

src/Rtsp/RtspPusher.cpp

@@ -313,13 +313,13 @@ void RtspPusher::handleResSetup(const Parser &parser, unsigned int track_idx) {
         rtpto.sin_port = ntohs(rtp_port);
         rtpto.sin_family = AF_INET;
         rtpto.sin_addr.s_addr = inet_addr(get_peer_ip().data());
-        rtp_sock->setSendPeerAddr((struct sockaddr *) &(rtpto));
+        rtp_sock->bindPeerAddr((struct sockaddr *) &(rtpto));
 
         //设置rtcp发送目标，为后续发送rtcp做准备
         rtpto.sin_port = ntohs(rtcp_port);
         rtpto.sin_family = AF_INET;
         rtpto.sin_addr.s_addr = inet_addr(get_peer_ip().data());
-        rtcp_sock->setSendPeerAddr((struct sockaddr *)&(rtpto));
+        rtcp_sock->bindPeerAddr((struct sockaddr *)&(rtpto));
 
         auto srcIP = inet_addr(get_peer_ip().data());
         weak_ptr<RtspPusher> weakSelf = dynamic_pointer_cast<RtspPusher>(shared_from_this());

src/Rtsp/RtspSession.cpp

@@ -686,14 +686,14 @@ void RtspSession::handleReq_Setup(const Parser &parser) {
         peerAddr.sin_port = htons(ui16RtpPort);
         peerAddr.sin_addr.s_addr = inet_addr(get_peer_ip().data());
         bzero(&(peerAddr.sin_zero), sizeof peerAddr.sin_zero);
-        pr.first->setSendPeerAddr((struct sockaddr *) (&peerAddr));
+        pr.first->bindPeerAddr((struct sockaddr *) (&peerAddr));
 
         //设置rtcp发送目标地址
         peerAddr.sin_family = AF_INET;
         peerAddr.sin_port = htons(ui16RtcpPort);
         peerAddr.sin_addr.s_addr = inet_addr(get_peer_ip().data());
         bzero(&(peerAddr.sin_zero), sizeof peerAddr.sin_zero);
-        pr.second->setSendPeerAddr((struct sockaddr *) (&peerAddr));
+        pr.second->bindPeerAddr((struct sockaddr *) (&peerAddr));
 
         //尝试获取客户端nat映射地址
         startListenPeerUdpData(trackIdx);
@@ -925,13 +925,13 @@ void RtspSession::onRcvPeerUdpData(int interleaved, const Buffer::Ptr &buf, cons
         } else if (!_udp_connected_flags.count(interleaved)) {
             //这是rtsp播放器的rtp打洞包
             _udp_connected_flags.emplace(interleaved);
-            _rtp_socks[interleaved / 2]->setSendPeerAddr(&addr);
+            _rtp_socks[interleaved / 2]->bindPeerAddr(&addr);
         }
     } else {
         //rtcp包
         if (!_udp_connected_flags.count(interleaved)) {
             _udp_connected_flags.emplace(interleaved);
-            _rtcp_socks[(interleaved - 1) / 2]->setSendPeerAddr(&addr);
+            _rtcp_socks[(interleaved - 1) / 2]->bindPeerAddr(&addr);
         }
         onRtcpPacket((interleaved - 1) / 2, _sdp_track[(interleaved - 1) / 2], buf->data(), buf->size());
     }

tests/test_wsServer.cpp

@@ -30,7 +30,7 @@ public:
         DebugL;
     }
 
-    void attachServer(const TcpServer &server) override{
+    void attachServer(const Server &server) override{
         DebugL << getIdentifier() << " " << TcpSession::getIdentifier();
     }
     void onRecv(const Buffer::Ptr &buffer) override {
@@ -57,7 +57,7 @@ public:
         DebugL;
     }
 
-    void attachServer(const TcpServer &server) override{
+    void attachServer(const Server &server) override{
         DebugL << getIdentifier() << " " << TcpSession::getIdentifier();
     }
     void onRecv(const Buffer::Ptr &buffer) override {