Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-06 19:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

实现whip/whep delete相关功能

Browse Source 
通过whip/whep 回复http头中的Location url进行删除资源
新增delete token随机数实现删除鉴权
This commit is contained in:
xia-chu
2023-04-28 22:06:46 +08:00
parent d2349f01bd
commit 8c049d4e28
4 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/WebRtcTransport.cpp
View File

@@ -113,6 +113,13 @@ const string &WebRtcTransport::getIdentifier() const {
return _identifier;
}
const std::string& WebRtcTransport::deleteRandStr() const {
if (_delete_rand_str.empty()) {
_delete_rand_str = makeRandStr(32);
}
return _delete_rand_str;
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void WebRtcTransport::OnIceServerSendStunPacket(
@@ -1053,6 +1060,15 @@ void WebRtcTransportImp::onBeforeEncryptRtp(const char *buf, int &len, void *ctx
}
}
void WebRtcTransportImp::safeShutdown(const SockException &ex) {
std::weak_ptr<WebRtcTransportImp> weak_self = static_pointer_cast<WebRtcTransportImp>(shared_from_this());
getPoller()->async([ex, weak_self]() {
if (auto strong_self = weak_self.lock()) {
strong_self->onShutdown(ex);
}
});
}
void WebRtcTransportImp::onShutdown(const SockException &ex) {
WarnL << ex;
unrefSelf();

6
webrtc/WebRtcTransport.h
View File

@@ -40,7 +40,8 @@ public:
WebRtcInterface() = default;
virtual ~WebRtcInterface() = default;
virtual std::string getAnswerSdp(const std::string &offer) = 0;
virtual const std::string &getIdentifier() const = 0;
virtual const std::string& getIdentifier() const = 0;
virtual const std::string& deleteRandStr() const { static std::string s_null; return s_null; }
};
std::string exchangeSdp(const WebRtcInterface &exchanger, const std::string& offer);
@@ -92,6 +93,7 @@ public:
* 获取对象唯一id
*/
const std::string& getIdentifier() const override;
const std::string& deleteRandStr() const override;
/**
* socket收到udp数据
@@ -174,6 +176,7 @@ protected:
std::shared_ptr<RTC::IceServer> _ice_server;
private:
mutable std::string _delete_rand_str;
std::string _identifier;
EventPoller::Ptr _poller;
std::shared_ptr<RTC::DtlsTransport> _dtls_transport;
@@ -248,6 +251,7 @@ public:
void createRtpChannel(const std::string &rid, uint32_t ssrc, MediaTrack &track);
void removeTuple(RTC::TransportTuple* tuple);
void safeShutdown(const SockException &ex);
protected:
void OnIceServerSelectedTuple(const RTC::IceServer *iceServer, RTC::TransportTuple *tuple) override;