From c0f41167ba9aa16adbec622b92edc40bb64a4899 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Fri, 31 May 2019 18:01:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BASocket=E4=BC=98=E5=85=88?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=9C=AC=E7=BA=BF=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3rdpart/ZLToolKit | 2 +- src/Rtsp/RtpBroadCaster.cpp | 2 +- src/Rtsp/RtspPlayer.cpp | 6 +++--- src/Rtsp/RtspPusher.cpp | 4 ++-- src/Rtsp/RtspSession.cpp | 2 +- src/Rtsp/UDPServer.cpp | 4 ++-- src/Rtsp/UDPServer.h | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit index aef48ed0..ef90b577 160000 --- a/3rdpart/ZLToolKit +++ b/3rdpart/ZLToolKit @@ -1 +1 @@ -Subproject commit aef48ed0ec6989edbc2e9667d3ac0ffa9c023fbc +Subproject commit ef90b577856be9f7873adf7617a651e1c23d12f6 diff --git a/src/Rtsp/RtpBroadCaster.cpp b/src/Rtsp/RtpBroadCaster.cpp index 303f5d8b..b5e4b7dd 100644 --- a/src/Rtsp/RtpBroadCaster.cpp +++ b/src/Rtsp/RtpBroadCaster.cpp @@ -105,7 +105,7 @@ RtpBroadCaster::RtpBroadCaster(const EventPoller::Ptr &poller,const string &strL } _multiAddr = MultiCastAddressMaker::Instance().obtain(); for(auto i = 0; i < 2; i++){ - _apUdpSock[i].reset(new Socket()); + _apUdpSock[i].reset(new Socket(poller)); if(!_apUdpSock[i]->bindUdpSock(0, strLocalIp.data())){ auto strErr = StrPrinter << "绑定UDP端口失败:" << strLocalIp << endl; throw std::runtime_error(strErr); diff --git a/src/Rtsp/RtspPlayer.cpp b/src/Rtsp/RtspPlayer.cpp index 5f6a14a9..8a690e89 100644 --- a/src/Rtsp/RtspPlayer.cpp +++ b/src/Rtsp/RtspPlayer.cpp @@ -247,12 +247,12 @@ void RtspPlayer::sendSetup(unsigned int trackIndex) { } break; case Rtsp::RTP_UDP: { - _apRtpSock[trackIndex].reset(new Socket()); + _apRtpSock[trackIndex].reset(new Socket(getPoller())); if (!_apRtpSock[trackIndex]->bindUdpSock(0, get_local_ip().data())) { _apRtpSock[trackIndex].reset(); throw std::runtime_error("open rtp sock err"); } - _apRtcpSock[trackIndex].reset(new Socket()); + _apRtcpSock[trackIndex].reset(new Socket(getPoller())); if (!_apRtcpSock[trackIndex]->bindUdpSock(_apRtpSock[trackIndex]->get_local_port() + 1, get_local_ip().data())) { _apRtcpSock[trackIndex].reset(); throw std::runtime_error("open rtcp sock err"); @@ -304,7 +304,7 @@ void RtspPlayer::handleResSETUP(const Parser &parser, unsigned int uiTrackIndex) if (_eType == Rtsp::RTP_MULTICAST) { //udp组播 auto multiAddr = FindField((strTransport + ";").data(), "destination=", ";"); - pRtpSockRef.reset(new Socket()); + pRtpSockRef.reset(new Socket(getPoller())); if (!pRtpSockRef->bindUdpSock(rtp_port, multiAddr.data())) { pRtpSockRef.reset(); throw std::runtime_error("open udp sock err"); diff --git a/src/Rtsp/RtspPusher.cpp b/src/Rtsp/RtspPusher.cpp index 196d8315..d49694e6 100644 --- a/src/Rtsp/RtspPusher.cpp +++ b/src/Rtsp/RtspPusher.cpp @@ -252,7 +252,7 @@ void RtspPusher::sendSetup(unsigned int trackIndex) { } break; case Rtsp::RTP_UDP: { - _apUdpSock[trackIndex].reset(new Socket()); + _apUdpSock[trackIndex].reset(new Socket(getPoller())); if (!_apUdpSock[trackIndex]->bindUdpSock(0, get_local_ip().data())) { _apUdpSock[trackIndex].reset(); throw std::runtime_error("open udp sock err"); @@ -291,7 +291,7 @@ void RtspPusher::handleResSetup(const Parser &parser, unsigned int uiTrackIndex) uint16_t port = atoi(FindField(port_str.data(), NULL, "-").data()); auto &pUdpSockRef = _apUdpSock[uiTrackIndex]; if(!pUdpSockRef){ - pUdpSockRef.reset(new Socket()); + pUdpSockRef.reset(new Socket(getPoller())); } struct sockaddr_in rtpto; diff --git a/src/Rtsp/RtspSession.cpp b/src/Rtsp/RtspSession.cpp index 214659cb..4e63b705 100644 --- a/src/Rtsp/RtspSession.cpp +++ b/src/Rtsp/RtspSession.cpp @@ -679,7 +679,7 @@ void RtspSession::handleReq_Setup(const Parser &parser) { int iSrvPort = _pBrdcaster->getPort(trackRef->_type); //我们用trackIdx区分rtp和rtcp包 //由于组播udp端口是共享的，而rtcp端口为组播udp端口+1，所以rtcp端口需要改成共享端口 - auto pSockRtcp = UDPServer::Instance().getSock(get_local_ip().data(),2*trackIdx + 1,iSrvPort + 1); + auto pSockRtcp = UDPServer::Instance().getSock(getPoller(),get_local_ip().data(),2*trackIdx + 1,iSrvPort + 1); if (!pSockRtcp) { //分配端口失败 send_NotAcceptable(); diff --git a/src/Rtsp/UDPServer.cpp b/src/Rtsp/UDPServer.cpp index 391557b1..210d04b0 100644 --- a/src/Rtsp/UDPServer.cpp +++ b/src/Rtsp/UDPServer.cpp @@ -41,12 +41,12 @@ UDPServer::~UDPServer() { InfoL; } -Socket::Ptr UDPServer::getSock(const char* strLocalIp, int intervaled,uint16_t iLocalPort) { +Socket::Ptr UDPServer::getSock(const EventPoller::Ptr &poller,const char* strLocalIp, int intervaled,uint16_t iLocalPort) { lock_guard lck(_mtxUpdSock); string strKey = StrPrinter << strLocalIp << ":" << intervaled << endl; auto it = _mapUpdSock.find(strKey); if (it == _mapUpdSock.end()) { - Socket::Ptr pSock(new Socket()); + Socket::Ptr pSock(new Socket(poller)); //InfoL<bindUdpSock(iLocalPort, strLocalIp)) { //分配失败 diff --git a/src/Rtsp/UDPServer.h b/src/Rtsp/UDPServer.h index 8eac1f10..497986a8 100644 --- a/src/Rtsp/UDPServer.h +++ b/src/Rtsp/UDPServer.h @@ -46,7 +46,7 @@ public: typedef function< bool(int intervaled, const Buffer::Ptr &buffer, struct sockaddr *peer_addr)> onRecvData; ~UDPServer(); static UDPServer &Instance(); - Socket::Ptr getSock(const char *strLocalIp, int intervaled,uint16_t iLocalPort = 0); + Socket::Ptr getSock(const EventPoller::Ptr &poller,const char *strLocalIp, int intervaled,uint16_t iLocalPort = 0); void listenPeer(const char *strPeerIp, void *pSelf, const onRecvData &cb); void stopListenPeer(const char *strPeerIp, void *pSelf); private: