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

支持ssl加密的Rtsp服务器

Browse Source
This commit is contained in:
xiongziliang
2018-12-19 16:54:11 +08:00
parent 70c3e97f14
commit 84e0e83366
5 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Http/HttpSession.cpp
View File

@@ -155,11 +155,8 @@ void HttpSession::onRecvContent(const char *data,uint64_t len) {
}
void HttpSession::onRecv(const Buffer::Ptr &pBuf) {
onRecv(pBuf->data(),pBuf->size());
}
void HttpSession::onRecv(const char *data,int size){
_ticker.resetTime();
input(data,size);
input(pBuf->data(),pBuf->size());
}
void HttpSession::onError(const SockException& err) {

2
src/Http/HttpSession.h
View File

@@ -60,8 +60,6 @@ public:
static string urlDecode(const string &str);
protected:
//用于HttpsSession调用
void onRecv(const char *data,int size);
//FlvMuxer override
void onWrite(const Buffer::Ptr &data) override ;
void onWrite(const char *data,int len) override;

28
src/Http/HttpsSession.h
View File

@@ -35,49 +35,41 @@ using namespace toolkit;
namespace mediakit {
class HttpsSession: public HttpSession {
template<typename TcpSessionType>
class TcpSessionWithSSL: public TcpSessionType {
public:
HttpsSession(const std::shared_ptr<ThreadPool> &pTh, const Socket::Ptr &pSock):
HttpSession(pTh,pSock){
TcpSessionWithSSL(const std::shared_ptr<ThreadPool> &pTh, const Socket::Ptr &pSock):
TcpSessionType(pTh,pSock){
_sslBox.setOnEncData([&](const char *data, uint32_t len){
#if defined(__GNUC__) && (__GNUC__ < 5)
public_send(data,len);
#else//defined(__GNUC__) && (__GNUC__ < 5)
HttpSession::send(obtainBuffer(data,len));
#endif//defined(__GNUC__) && (__GNUC__ < 5)
});
_sslBox.setOnDecData([&](const char *data, uint32_t len){
#if defined(__GNUC__) && (__GNUC__ < 5)
public_onRecv(data,len);
#else//defined(__GNUC__) && (__GNUC__ < 5)
HttpSession::onRecv(data,len);
#endif//defined(__GNUC__) && (__GNUC__ < 5)
});
}
virtual ~HttpsSession(){
virtual ~TcpSessionWithSSL(){
//_sslBox.shutdown();
}
void onRecv(const Buffer::Ptr &pBuf) override{
TimeTicker();
_sslBox.onRecv(pBuf->data(), pBuf->size());
}
#if defined(__GNUC__) && (__GNUC__ < 5)
int public_send(const char *data, uint32_t len){
return HttpSession::send(obtainBuffer(data,len));
return TcpSessionType::send(TcpSessionType::obtainBuffer(data,len));
}
void public_onRecv(const char *data, uint32_t len){
HttpSession::onRecv(data,len);
TcpSessionType::onRecv(TcpSessionType::obtainBuffer(data,len));
}
#endif//defined(__GNUC__) && (__GNUC__ < 5)
protected:
virtual int send(const Buffer::Ptr &buf) override{
TimeTicker();
_sslBox.onSend(buf->data(), buf->size());
return buf->size();
}
private:
SSL_Box _sslBox;
};
typedef TcpSessionWithSSL<HttpSession> HttpsSession;
/**