From 88dc59ec68087451bb6a75c6d4da02f8193f62d7 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 17 Nov 2023 05:49:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0http=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Common/MediaSource.h | 4 +++ src/Common/Parser.cpp | 27 +++++++++++++++--- src/Common/Parser.h | 2 ++ src/Http/HlsPlayer.cpp | 2 ++ src/Http/HttpClient.cpp | 58 ++++++++++++++++++++++++++++++-------- src/Http/HttpClient.h | 18 +++++++++++- src/Http/HttpClientImp.cpp | 22 +++++++++++++-- src/Http/HttpClientImp.h | 1 + src/Http/TsPlayer.cpp | 1 + src/Player/MediaPlayer.cpp | 4 ++- src/Player/MediaPlayer.h | 3 +- src/Player/PlayerBase.h | 6 ++++ src/Player/PlayerProxy.cpp | 2 +- src/Rtmp/FlvPlayer.cpp | 1 + src/Rtp/TSDecoder.cpp | 3 +- 15 files changed, 130 insertions(+), 24 deletions(-) diff --git a/src/Common/MediaSource.h b/src/Common/MediaSource.h index 73306385..51991c35 100644 --- a/src/Common/MediaSource.h +++ b/src/Common/MediaSource.h @@ -199,6 +199,8 @@ public: // 支持通过on_publish返回值替换stream_id std::string stream_replace; + // http proxy url + std::string proxy_url; template ProtocolOption(const MAP &allArgs) : ProtocolOption() { @@ -229,6 +231,8 @@ public: GET_OPT_VALUE(hls_save_path); GET_OPT_VALUE(stream_replace); + + GET_OPT_VALUE(proxy_url); } private: diff --git a/src/Common/Parser.cpp b/src/Common/Parser.cpp index 9c073f2c..d9b6c19a 100644 --- a/src/Common/Parser.cpp +++ b/src/Common/Parser.cpp @@ -8,12 +8,13 @@ * may be found in the AUTHORS file in the root of the source tree. */ -#include #include "Parser.h" -#include "strCoding.h" -#include "macros.h" -#include "Network/sockutil.h" #include "Common/macros.h" +#include "Network/sockutil.h" +#include "Util/base64.h" +#include "macros.h" +#include "strCoding.h" +#include using namespace std; using namespace toolkit; @@ -325,6 +326,24 @@ void splitUrl(const std::string &url, std::string &host, uint16_t &port) { host = url.substr(0, pos); checkHost(host); } + +void parseProxyUrl(const std::string &proxy_url, std::string &proxy_host, uint16_t &proxy_port, std::string &proxy_auth){ + //判断是否包含http://, 如果是则去掉 + std::string host; + auto pos = proxy_url.find("://"); + if (pos != string::npos) { + host = proxy_url.substr(pos + 3); + }else{ + host = proxy_url; + } + //判断是否包含用户名和密码 + pos = host.rfind('@'); + if (pos != string::npos) { + proxy_auth = encodeBase64(host.substr(0, pos)); + host = host.substr(pos + 1, host.size()); + } + splitUrl(host, proxy_host, proxy_port); +} #if 0 //测试代码 static onceToken token([](){ diff --git a/src/Common/Parser.h b/src/Common/Parser.h index 3741f4bc..a2165ce1 100644 --- a/src/Common/Parser.h +++ b/src/Common/Parser.h @@ -21,6 +21,8 @@ namespace mediakit { std::string findSubString(const char *buf, const char *start, const char *end, size_t buf_size = 0); // 把url解析为主机地址和端口号,兼容ipv4/ipv6/dns void splitUrl(const std::string &url, std::string &host, uint16_t &port); +// 解析proxy url,仅支持http +void parseProxyUrl(const std::string &proxy_url, std::string &proxy_host, uint16_t &proxy_port, std::string &proxy_auth); struct StrCaseCompare { bool operator()(const std::string &__x, const std::string &__y) const { return strcasecmp(__x.data(), __y.data()) < 0; } diff --git a/src/Http/HlsPlayer.cpp b/src/Http/HlsPlayer.cpp index c6509c0c..7ae2a038 100644 --- a/src/Http/HlsPlayer.cpp +++ b/src/Http/HlsPlayer.cpp @@ -22,6 +22,7 @@ HlsPlayer::HlsPlayer(const EventPoller::Ptr &poller) { void HlsPlayer::play(const string &url) { _play_result = false; _play_url = url; + setProxyUrl(_option.proxy_url); fetchIndexFile(); } @@ -88,6 +89,7 @@ void HlsPlayer::fetchSegment() { weak_ptr weak_self = static_pointer_cast(shared_from_this()); if (!_http_ts_player) { _http_ts_player = std::make_shared(getPoller()); + _http_ts_player->setProxyUrl(_option.proxy_url); _http_ts_player->setOnCreateSocket([weak_self](const EventPoller::Ptr &poller) { auto strong_self = weak_self.lock(); if (strong_self) { diff --git a/src/Http/HttpClient.cpp b/src/Http/HttpClient.cpp index dd1546db..8386118c 100644 --- a/src/Http/HttpClient.cpp +++ b/src/Http/HttpClient.cpp @@ -78,12 +78,15 @@ void HttpClient::sendRequest(const string &url) { printer.pop_back(); _header.emplace("Cookie", printer); } - - if (!alive() || host_changed) { - startConnect(host, port, _wait_header_ms / 1000.0f); + if (isUsedProxy()) { + startConnect(_proxy_host, _proxy_port, _wait_header_ms / 1000.0f); } else { - SockException ex; - onConnect_l(ex); + if (!alive() || host_changed) { + startConnect(host, port, _wait_header_ms / 1000.0f); + } else { + SockException ex; + onConnect_l(ex); + } } } @@ -158,15 +161,23 @@ void HttpClient::onConnect_l(const SockException &ex) { onResponseCompleted_l(ex); return; } - _StrPrinter printer; - printer << _method + " " << _path + " HTTP/1.1\r\n"; - for (auto &pr : _header) { - printer << pr.first + ": "; - printer << pr.second + "\r\n"; + //不使用代理或者代理服务器已经连接成功 + if(_proxy_connected || !isUsedProxy()) { + printer << _method + " " << _path + " HTTP/1.1\r\n"; + for (auto &pr : _header) { + printer << pr.first + ": "; + printer << pr.second + "\r\n"; + } + _header.clear(); + _path.clear(); + }else{ + printer << "CONNECT "<< _last_host <<" HTTP/1.1\r\n"; + printer << "Proxy-Connection: keep-alive\r\n"; + if(!_proxy_auth.empty()) { + printer << "Proxy-Authorization: Basic " << _proxy_auth << "\r\n"; + } } - _header.clear(); - _path.clear(); SockSender::send(printer << "\r\n"); onFlush(); } @@ -400,5 +411,28 @@ void HttpClient::setBodyTimeout(size_t timeout_ms) { void HttpClient::setCompleteTimeout(size_t timeout_ms) { _wait_complete_ms = timeout_ms; } +bool HttpClient::isUsedProxy() const { + return _used_proxy; +} +bool HttpClient::isProxyConnected() const { + return _proxy_connected; +} + +void HttpClient::setProxyUrl(const string &proxyUrl) { + _proxy_url = proxyUrl; + if (!_proxy_url.empty()) { + parseProxyUrl(_proxy_url, _proxy_host, _proxy_port, _proxy_auth); + _used_proxy = true; + }else{ + _used_proxy = false; + } +} + +bool HttpClient::checkProxyConnected(const char *data, size_t len) { + auto ret = strstr(data, "HTTP/1.1 200 Connection established"); + _proxy_connected = ret != nullptr; + return _proxy_connected; +} + } /* namespace mediakit */ diff --git a/src/Http/HttpClient.h b/src/Http/HttpClient.h index 497f4a1d..9ef9e18a 100644 --- a/src/Http/HttpClient.h +++ b/src/Http/HttpClient.h @@ -141,6 +141,8 @@ public: */ void setCompleteTimeout(size_t timeout_ms); + void setProxyUrl(const std::string &proxyUrl); + protected: /** * 收到http回复头 @@ -181,11 +183,19 @@ protected: void onFlush() override; void onManager() override; + bool checkProxyConnected(const char *data, size_t len); + + bool isUsedProxy() const; + + bool isProxyConnected() const; + + void clearResponse(); + private: void onResponseCompleted_l(const toolkit::SockException &ex); void onConnect_l(const toolkit::SockException &ex); void checkCookie(HttpHeader &headers); - void clearResponse(); + private: //for http response @@ -215,6 +225,12 @@ private: toolkit::Ticker _wait_header; toolkit::Ticker _wait_body; toolkit::Ticker _wait_complete; + std::string _proxy_url; + std::string _proxy_host; + std::string _proxy_auth; + uint16_t _proxy_port; + bool _proxy_connected = false; + bool _used_proxy = false; }; } /* namespace mediakit */ diff --git a/src/Http/HttpClientImp.cpp b/src/Http/HttpClientImp.cpp index 7b36b46c..235612dc 100644 --- a/src/Http/HttpClientImp.cpp +++ b/src/Http/HttpClientImp.cpp @@ -15,13 +15,29 @@ using namespace toolkit; namespace mediakit { void HttpClientImp::onConnect(const SockException &ex) { - if (!isHttps()) { - //https 302跳转 http时，需要关闭ssl + if (isUsedProxy() && !isProxyConnected()) { + //连接代理服务器 setDoNotUseSSL(); HttpClient::onConnect(ex); } else { - TcpClientWithSSL::onConnect(ex); + if (!isHttps()) { + //https 302跳转 http时，需要关闭ssl + setDoNotUseSSL(); + HttpClient::onConnect(ex); + } else { + TcpClientWithSSL::onConnect(ex); + } } } +ssize_t HttpClientImp::onRecvHeader(const char *data, size_t len) { + if (isUsedProxy() && !isProxyConnected()) { + if(checkProxyConnected(data, len)) { + clearResponse(); + onConnect(SockException(Err_success, "proxy connected")); + return 0; + } + } + return HttpClient::onRecvHeader(data, len); +} } /* namespace mediakit */ diff --git a/src/Http/HttpClientImp.h b/src/Http/HttpClientImp.h index 491b594f..8c1da91b 100644 --- a/src/Http/HttpClientImp.h +++ b/src/Http/HttpClientImp.h @@ -24,6 +24,7 @@ public: protected: void onConnect(const toolkit::SockException &ex) override; + virtual ssize_t onRecvHeader(const char *data, size_t len) override; }; } /* namespace mediakit */ diff --git a/src/Http/TsPlayer.cpp b/src/Http/TsPlayer.cpp index 20737bc5..ca023e64 100644 --- a/src/Http/TsPlayer.cpp +++ b/src/Http/TsPlayer.cpp @@ -21,6 +21,7 @@ void TsPlayer::play(const string &url) { TraceL << "play http-ts: " << url; _play_result = false; _benchmark_mode = (*this)[Client::kBenchmarkMode].as(); + setProxyUrl(_option.proxy_url); setHeaderTimeout((*this)[Client::kTimeoutMS].as()); setBodyTimeout((*this)[Client::kMediaTimeoutMS].as()); setMethod("GET"); diff --git a/src/Player/MediaPlayer.cpp b/src/Player/MediaPlayer.cpp index 1eb5f449..889a5097 100644 --- a/src/Player/MediaPlayer.cpp +++ b/src/Player/MediaPlayer.cpp @@ -16,8 +16,9 @@ using namespace toolkit; namespace mediakit { -MediaPlayer::MediaPlayer(const EventPoller::Ptr &poller) { +MediaPlayer::MediaPlayer(const EventPoller::Ptr &poller, const ProtocolOption &option) { _poller = poller ? poller : EventPollerPool::Instance().getPoller(); + _option = option; } static void setOnCreateSocket_l(const std::shared_ptr &delegate, const Socket::onCreateSocket &cb){ @@ -37,6 +38,7 @@ static void setOnCreateSocket_l(const std::shared_ptr &delegate, con void MediaPlayer::play(const string &url) { _delegate = PlayerBase::createPlayer(_poller, url); assert(_delegate); + _delegate->setOption(_option); setOnCreateSocket_l(_delegate, _on_create_socket); _delegate->setOnShutdown(_on_shutdown); _delegate->setOnPlayResult(_on_play_result); diff --git a/src/Player/MediaPlayer.h b/src/Player/MediaPlayer.h index a425f956..7978e594 100644 --- a/src/Player/MediaPlayer.h +++ b/src/Player/MediaPlayer.h @@ -21,7 +21,7 @@ class MediaPlayer : public PlayerImp { public: using Ptr = std::shared_ptr; - MediaPlayer(const toolkit::EventPoller::Ptr &poller = nullptr); + MediaPlayer(const toolkit::EventPoller::Ptr &poller = nullptr, const ProtocolOption &option=ProtocolOption()); ~MediaPlayer() override = default; void play(const std::string &url) override; @@ -29,6 +29,7 @@ public: void setOnCreateSocket(toolkit::Socket::onCreateSocket cb); private: + ProtocolOption _option; toolkit::EventPoller::Ptr _poller; toolkit::Socket::onCreateSocket _on_create_socket; }; diff --git a/src/Player/PlayerBase.h b/src/Player/PlayerBase.h index 73c9d3ee..72d3cadf 100644 --- a/src/Player/PlayerBase.h +++ b/src/Player/PlayerBase.h @@ -115,10 +115,16 @@ public: */ virtual void setOnResume(const std::function &cb) = 0; + void setOption(const ProtocolOption &option){ + _option = option; + } + protected: virtual void onResume() = 0; virtual void onShutdown(const toolkit::SockException &ex) = 0; virtual void onPlayResult(const toolkit::SockException &ex) = 0; +protected: + ProtocolOption _option; }; template diff --git a/src/Player/PlayerProxy.cpp b/src/Player/PlayerProxy.cpp index 73e46b71..a2dd095b 100644 --- a/src/Player/PlayerProxy.cpp +++ b/src/Player/PlayerProxy.cpp @@ -27,7 +27,7 @@ namespace mediakit { PlayerProxy::PlayerProxy( const string &vhost, const string &app, const string &stream_id, const ProtocolOption &option, int retry_count, const EventPoller::Ptr &poller, int reconnect_delay_min, int reconnect_delay_max, int reconnect_delay_step) - : MediaPlayer(poller) + : MediaPlayer(poller, option) , _option(option) { _tuple.vhost = vhost; _tuple.app = app; diff --git a/src/Rtmp/FlvPlayer.cpp b/src/Rtmp/FlvPlayer.cpp index 0095eb04..df8b28af 100644 --- a/src/Rtmp/FlvPlayer.cpp +++ b/src/Rtmp/FlvPlayer.cpp @@ -22,6 +22,7 @@ FlvPlayer::FlvPlayer(const EventPoller::Ptr &poller) { void FlvPlayer::play(const string &url) { TraceL << "play http-flv: " << url; _play_result = false; + setProxyUrl(_option.proxy_url); setHeaderTimeout((*this)[Client::kTimeoutMS].as()); setBodyTimeout((*this)[Client::kMediaTimeoutMS].as()); setMethod("GET"); diff --git a/src/Rtp/TSDecoder.cpp b/src/Rtp/TSDecoder.cpp index 4f00ada0..7206ba9e 100644 --- a/src/Rtp/TSDecoder.cpp +++ b/src/Rtp/TSDecoder.cpp @@ -39,7 +39,8 @@ const char *TSSegment::onSearchPacketTail(const char *data, size_t len) { if (((uint8_t *) data)[_size] == TS_SYNC_BYTE) { return data + _size; } - auto pos = memchr(data + _size, TS_SYNC_BYTE, len - _size); + //搜索ts包头 + auto pos = memchr(data, TS_SYNC_BYTE, len); if (pos) { return (char *) pos; }