From 7e25537957185e2f350ee8029d41800617a81f2b Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Thu, 13 Feb 2020 11:33:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=B1=87=E6=8A=A5=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7=E7=AB=AFip?= =?UTF-8?q?=E5=92=8C=E7=AB=AF=E5=8F=A3=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/include/mk_events.h | 6 +++++- api/source/mk_events.cpp | 4 +++- api/tests/server.c | 10 +++++++--- server/WebHook.cpp | 4 +++- src/Common/config.h | 2 +- src/Http/HttpFileManager.cpp | 7 +++++-- src/Http/HttpSession.cpp | 2 +- src/Record/HlsMediaSource.cpp | 6 ++++-- src/Record/HlsMediaSource.h | 4 +++- src/Rtmp/RtmpSession.cpp | 2 +- src/Rtsp/RtspSession.cpp | 2 +- 11 files changed, 34 insertions(+), 15 deletions(-) diff --git a/api/include/mk_events.h b/api/include/mk_events.h index c9373af3..3c7bd4f7 100644 --- a/api/include/mk_events.h +++ b/api/include/mk_events.h @@ -162,11 +162,15 @@ typedef struct { * @param total_bytes 耗费上下行总流量，单位字节数 * @param total_seconds 本次tcp会话时长，单位秒 * @param is_player 客户端是否为播放器 + * @param peer_ip 客户端ip + * @param peer_port 客户端端口号 */ void (API_CALL *on_mk_flow_report)(const mk_media_info url_info, uint64_t total_bytes, uint64_t total_seconds, - int is_player); + int is_player, + const char *peer_ip, + uint16_t peer_port); } mk_events; diff --git a/api/source/mk_events.cpp b/api/source/mk_events.cpp index 5e693587..90499f86 100644 --- a/api/source/mk_events.cpp +++ b/api/source/mk_events.cpp @@ -151,7 +151,9 @@ API_EXPORT void API_CALL mk_events_listen(const mk_events *events){ s_events.on_mk_flow_report((mk_media_info) &args, totalBytes, totalDuration, - isPlayer); + isPlayer, + peerIP.c_str(), + peerPort); } }); diff --git a/api/tests/server.c b/api/tests/server.c index 85714d50..af203e90 100644 --- a/api/tests/server.c +++ b/api/tests/server.c @@ -372,19 +372,23 @@ void API_CALL on_mk_shell_login(const char *user_name, * @param total_bytes 耗费上下行总流量，单位字节数 * @param total_seconds 本次tcp会话时长，单位秒 * @param is_player 客户端是否为播放器 + * @param peer_ip 客户端ip + * @param peer_port 客户端端口号 */ void API_CALL on_mk_flow_report(const mk_media_info url_info, uint64_t total_bytes, uint64_t total_seconds, - int is_player) { + int is_player, + const char *peer_ip, + uint16_t peer_port) { log_printf(LOG_LEV,"%s/%s/%s/%s, url params: %s," - "total_bytes: %d, total_seconds: %d, is_player: %d", + "total_bytes: %d, total_seconds: %d, is_player: %d, peer_ip:%s, peer_port:%d", mk_media_info_get_schema(url_info), mk_media_info_get_vhost(url_info), mk_media_info_get_app(url_info), mk_media_info_get_stream(url_info), mk_media_info_get_params(url_info), - (int)total_bytes, (int)total_seconds, (int)is_player); + (int)total_bytes, (int)total_seconds, (int)is_player,peer_ip, (int)peer_port); } static int flag = 1; diff --git a/server/WebHook.cpp b/server/WebHook.cpp index e2e7824e..5a5d3720 100644 --- a/server/WebHook.cpp +++ b/server/WebHook.cpp @@ -269,13 +269,15 @@ void installWebHook(){ }); NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastFlowReport,[](BroadcastFlowReportArgs){ - if(!hook_enable || args._param_strs == hook_adminparams || hook_flowreport.empty()){ + if(!hook_enable || args._param_strs == hook_adminparams || hook_flowreport.empty() || peerIP == "127.0.0.1"){ return; } auto body = make_json(args); body["totalBytes"] = (Json::UInt64)totalBytes; body["duration"] = (Json::UInt64)totalDuration; body["player"] = isPlayer; + body["ip"] = peerIP; + body["port"] = peerPort; //执行hook do_http_hook(hook_flowreport,body, nullptr); }); diff --git a/src/Common/config.h b/src/Common/config.h index d8d51e35..32fb7b84 100644 --- a/src/Common/config.h +++ b/src/Common/config.h @@ -127,7 +127,7 @@ extern const string kBroadcastShellLogin; //停止rtsp/rtmp/http-flv会话后流量汇报事件广播 extern const string kBroadcastFlowReport; -#define BroadcastFlowReportArgs const MediaInfo &args,const uint64_t &totalBytes,const uint64_t &totalDuration,const bool &isPlayer +#define BroadcastFlowReportArgs const MediaInfo &args,const uint64_t &totalBytes,const uint64_t &totalDuration,const bool &isPlayer, const string &peerIP,const uint16_t &peerPort //未找到流后会广播该事件，请在监听该事件后去拉流或其他方式产生流，这样就能按需拉流了 extern const string kBroadcastNotFoundStream; diff --git a/src/Http/HttpFileManager.cpp b/src/Http/HttpFileManager.cpp index 2ffc0819..ce0960ac 100644 --- a/src/Http/HttpFileManager.cpp +++ b/src/Http/HttpFileManager.cpp @@ -378,8 +378,11 @@ static void canAccessPath(TcpSession &sender, const Parser &parser, const MediaI } bool is_hls = mediaInfo._schema == HLS_SCHEMA; + string peer_ip = sender.get_peer_ip(); + uint16_t peer_port = sender.get_peer_port(); + //该用户从来未获取过cookie，这个时候我们广播是否允许该用户访问该http目录 - HttpSession::HttpAccessPathInvoker accessPathInvoker = [callback, uid, path, is_dir, is_hls, mediaInfo] + HttpSession::HttpAccessPathInvoker accessPathInvoker = [callback, uid, path, is_dir, is_hls, mediaInfo, peer_ip, peer_port] (const string &errMsg, const string &cookie_path_in, int cookieLifeSecond) { HttpServerCookie::Ptr cookie; if (cookieLifeSecond) { @@ -402,7 +405,7 @@ static void canAccessPath(TcpSession &sender, const Parser &parser, const MediaI attachment._is_hls = is_hls; if(is_hls){ //hls相关信息 - attachment._hls_data = std::make_shared(mediaInfo); + attachment._hls_data = std::make_shared(mediaInfo, peer_ip, peer_port); //hls未查找MediaSource attachment._have_find_media_source = false; } diff --git a/src/Http/HttpSession.cpp b/src/Http/HttpSession.cpp index 320e7338..4280e28a 100644 --- a/src/Http/HttpSession.cpp +++ b/src/Http/HttpSession.cpp @@ -112,7 +112,7 @@ void HttpSession::onError(const SockException& err) { GET_CONFIG(uint32_t,iFlowThreshold,General::kFlowThreshold); if(_ui64TotalBytes > iFlowThreshold * 1024){ - NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport, _mediaInfo, _ui64TotalBytes, _ticker.createdTime()/1000, true); + NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport, _mediaInfo, _ui64TotalBytes, _ticker.createdTime()/1000, true, get_peer_ip(), get_peer_port()); } return; } diff --git a/src/Record/HlsMediaSource.cpp b/src/Record/HlsMediaSource.cpp index 1f48723a..c10cf0ca 100644 --- a/src/Record/HlsMediaSource.cpp +++ b/src/Record/HlsMediaSource.cpp @@ -28,8 +28,10 @@ namespace mediakit{ -HlsCookieData::HlsCookieData(const MediaInfo &info) { +HlsCookieData::HlsCookieData(const MediaInfo &info, const string &peer_ip, uint16_t peer_port) { _info = info; + _peer_ip = peer_ip; + _peer_port = peer_port; _added = std::make_shared(false); addReaderCount(); } @@ -61,7 +63,7 @@ HlsCookieData::~HlsCookieData() { WarnL << "HLS播放器(" << _info._vhost << "/" << _info._app << "/" << _info._streamid << ")断开,播放时间:" << duration; GET_CONFIG(uint32_t, iFlowThreshold, General::kFlowThreshold); if (_bytes > iFlowThreshold * 1024) { - NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport, _info, _bytes, duration, true); + NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport, _info, _bytes, duration, true, _peer_ip, _peer_port); } } } diff --git a/src/Record/HlsMediaSource.h b/src/Record/HlsMediaSource.h index df0379be..82952e21 100644 --- a/src/Record/HlsMediaSource.h +++ b/src/Record/HlsMediaSource.h @@ -92,7 +92,7 @@ private: class HlsCookieData{ public: typedef std::shared_ptr Ptr; - HlsCookieData(const MediaInfo &info); + HlsCookieData(const MediaInfo &info, const string &peer_ip, uint16_t peer_port); ~HlsCookieData(); void addByteUsage(uint64_t bytes); private: @@ -100,6 +100,8 @@ private: private: uint64_t _bytes = 0; MediaInfo _info; + string _peer_ip; + uint16_t _peer_port; std::shared_ptr _added; weak_ptr _src; Ticker _ticker; diff --git a/src/Rtmp/RtmpSession.cpp b/src/Rtmp/RtmpSession.cpp index 061e512a..7ef95ea1 100644 --- a/src/Rtmp/RtmpSession.cpp +++ b/src/Rtmp/RtmpSession.cpp @@ -55,7 +55,7 @@ void RtmpSession::onError(const SockException& err) { GET_CONFIG(uint32_t,iFlowThreshold,General::kFlowThreshold); if(_ui64TotalBytes > iFlowThreshold * 1024){ - NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport, _mediaInfo, _ui64TotalBytes, _ticker.createdTime()/1000, isPlayer); + NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport, _mediaInfo, _ui64TotalBytes, _ticker.createdTime()/1000, isPlayer, get_peer_ip(), get_peer_port()); } } diff --git a/src/Rtsp/RtspSession.cpp b/src/Rtsp/RtspSession.cpp index 6da40b06..19eae91b 100644 --- a/src/Rtsp/RtspSession.cpp +++ b/src/Rtsp/RtspSession.cpp @@ -106,7 +106,7 @@ void RtspSession::onError(const SockException& err) { //流量统计事件广播 GET_CONFIG(uint32_t,iFlowThreshold,General::kFlowThreshold); if(_ui64TotalBytes > iFlowThreshold * 1024){ - NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport, _mediaInfo, _ui64TotalBytes, _ticker.createdTime()/1000, isPlayer); + NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport, _mediaInfo, _ui64TotalBytes, _ticker.createdTime()/1000, isPlayer, get_peer_ip(), get_peer_port()); } }