amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

提高webrtc代码健壮性

Browse Source
This commit is contained in:
ziyue 2021-09-15 11:50:15 +08:00
parent 869a707c04
commit 3c4285a056
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
webrtc/WebRtcSession.cpp
View File

@ -50,26 +50,24 @@ EventPoller::Ptr WebRtcSession::getPoller(const Buffer::Ptr &buffer) {
} }
void WebRtcSession::onRecv(const Buffer::Ptr &buffer) { void WebRtcSession::onRecv(const Buffer::Ptr &buffer) {
auto buf = buffer->data(); try {
auto len = buffer->size(); onRecv_l(buffer);
} catch (std::exception &ex) {
shutdown(SockException(Err_shutdown, ex.what()));
}
}
if (!_transport) { void WebRtcSession::onRecv_l(const Buffer::Ptr &buffer) {
auto user_name = getUserName(buffer); if (_find_transport) {
if (user_name.empty()) { //只允许寻找一次transport
//逻辑分支不太可能走到这里 _find_transport = false;
WarnL << user_name; _transport = WebRtcTransportImp::getRtcTransport(getUserName(buffer), true);
return; CHECK(_transport && _transport->getPoller()->isCurrentThread());
}
_transport = WebRtcTransportImp::getRtcTransport(user_name, true);
if (!_transport) {
//逻辑分支不太可能走到这里
WarnL << user_name;
return;
}
_transport->setSession(shared_from_this()); _transport->setSession(shared_from_this());
} }
_ticker.resetTime(); _ticker.resetTime();
_transport->inputSockData(buf, len, &_peer_addr); CHECK(_transport);
_transport->inputSockData(buffer->data(), buffer->size(), &_peer_addr);
} }
void WebRtcSession::onError(const SockException &err) { void WebRtcSession::onError(const SockException &err) {

4
webrtc/WebRtcSession.h
View File

@ -30,6 +30,10 @@ public:
void onManager() override; void onManager() override;
private: private:
void onRecv_l(const Buffer::Ptr &);
private:
bool _find_transport = true;
Ticker _ticker; Ticker _ticker;
struct sockaddr _peer_addr; struct sockaddr _peer_addr;
std::shared_ptr<WebRtcTransportImp> _transport; std::shared_ptr<WebRtcTransportImp> _transport;

5
webrtc/WebRtcTransport.cpp
View File

@ -1018,7 +1018,10 @@ void WebRtcTransportImp::unregisterSelf() {
s_rtc_map.erase(getKey()); s_rtc_map.erase(getKey());
} }
WebRtcTransportImp::Ptr WebRtcTransportImp::getRtcTransport(const string &key, bool unref_self){ WebRtcTransportImp::Ptr WebRtcTransportImp::getRtcTransport(const string &key, bool unref_self) {
if (key.empty()) {
return nullptr;
}
lock_guard<mutex> lck(s_rtc_mtx); lock_guard<mutex> lck(s_rtc_mtx);
auto it = s_rtc_map.find(key); auto it = s_rtc_map.find(key);
if (it == s_rtc_map.end()) { if (it == s_rtc_map.end()) {