修复android测试程序bug

This commit is contained in:
xiongziliang 2019-07-16 17:22:45 +08:00
parent 4122084e05
commit c0a6981662

View File

@ -102,15 +102,21 @@ static onceToken token1([](){
#define REALM "realm_zlmedaikit"
static map<string,FlvRecorder::Ptr> s_mapFlvRecorder;
static mutex s_mtxFlvRecorder;
static onceToken s_token([](){
static void initEvent() {
static onceToken s_token([]() {
//监听kBroadcastOnGetRtspRealm事件决定rtsp链接是否需要鉴权(传统的rtsp鉴权方案)才能访问
NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastOnGetRtspRealm,[](BroadcastOnGetRtspRealmArgs){
DebugL << "RTSP是否需要鉴权事件" << args._schema << " " << args._vhost << " " << args._app << " " << args._streamid << " " << args._param_strs ;
if(string("1") == args._streamid ){
NoticeCenter::Instance().addListener(nullptr, Broadcast::kBroadcastOnGetRtspRealm,
[](BroadcastOnGetRtspRealmArgs) {
DebugL << "RTSP是否需要鉴权事件" << args._schema << " "
<< args._vhost << " " << args._app << " "
<< args._streamid << " "
<< args._param_strs;
if (string("1") == args._streamid) {
// live/1需要认证
//该流需要认证并且设置realm
invoker(REALM);
}else{
} else {
//有时我们要查询redis或数据库来判断该流是否需要认证通过invoker的方式可以做到完全异步
//该流我们不需要认证
invoker("");
@ -118,96 +124,136 @@ static onceToken s_token([](){
});
//监听kBroadcastOnRtspAuth事件返回正确的rtsp鉴权用户密码
NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastOnRtspAuth,[](BroadcastOnRtspAuthArgs){
DebugL << "RTSP播放鉴权:" << args._schema << " " << args._vhost << " " << args._app << " " << args._streamid << " " << args._param_strs ;
DebugL << "RTSP用户" << user_name << (must_no_encrypt ? " Base64" : " MD5" )<< " 方式登录";
NoticeCenter::Instance().addListener(nullptr, Broadcast::kBroadcastOnRtspAuth,
[](BroadcastOnRtspAuthArgs) {
DebugL << "RTSP播放鉴权:" << args._schema << " "
<< args._vhost << " " << args._app << " "
<< args._streamid << " "
<< args._param_strs;
DebugL << "RTSP用户" << user_name
<< (must_no_encrypt ? " Base64" : " MD5")
<< " 方式登录";
string user = user_name;
//假设我们异步读取数据库
if(user == "test0"){
if (user == "test0") {
//假设数据库保存的是明文
invoker(false,"pwd0");
invoker(false, "pwd0");
return;
}
if(user == "test1"){
if (user == "test1") {
//假设数据库保存的是密文
auto encrypted_pwd = MD5(user + ":" + REALM + ":" + "pwd1").hexdigest();
invoker(true,encrypted_pwd);
auto encrypted_pwd = MD5(
user + ":" + REALM + ":" +
"pwd1").hexdigest();
invoker(true, encrypted_pwd);
return;
}
if(user == "test2" && must_no_encrypt){
if (user == "test2" && must_no_encrypt) {
//假设登录的是test2,并且以base64方式登录此时我们提供加密密码那么会导致认证失败
//可以通过这个方式屏蔽base64这种不安全的加密方式
invoker(true,"pwd2");
invoker(true, "pwd2");
return;
}
//其他用户密码跟用户名一致
invoker(false,user);
invoker(false, user);
});
//监听rtsp/rtmp推流事件返回结果告知是否有推流权限
NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastMediaPublish,[](BroadcastMediaPublishArgs){
DebugL << "推流鉴权:" << args._schema << " " << args._vhost << " " << args._app << " " << args._streamid << " " << args._param_strs ;
NoticeCenter::Instance().addListener(nullptr, Broadcast::kBroadcastMediaPublish,
[](BroadcastMediaPublishArgs) {
DebugL << "推流鉴权:" << args._schema << " "
<< args._vhost << " " << args._app << " "
<< args._streamid << " "
<< args._param_strs;
invoker("");//鉴权成功
//invoker("this is auth failed message");//鉴权失败
});
//监听rtsp/rtsps/rtmp/http-flv播放事件返回结果告知是否有播放权限(rtsp通过kBroadcastOnRtspAuth或此事件都可以实现鉴权)
NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastMediaPlayed,[](BroadcastMediaPlayedArgs){
DebugL << "播放鉴权:" << args._schema << " " << args._vhost << " " << args._app << " " << args._streamid << " " << args._param_strs ;
NoticeCenter::Instance().addListener(nullptr, Broadcast::kBroadcastMediaPlayed,
[](BroadcastMediaPlayedArgs) {
DebugL << "播放鉴权:" << args._schema << " "
<< args._vhost << " " << args._app << " "
<< args._streamid << " "
<< args._param_strs;
invoker("");//鉴权成功
//invoker("this is auth failed message");//鉴权失败
});
//shell登录事件通过shell可以登录进服务器执行一些命令
NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastShellLogin,[](BroadcastShellLoginArgs){
DebugL << "shell login:" << user_name << " " << passwd;
NoticeCenter::Instance().addListener(nullptr, Broadcast::kBroadcastShellLogin,
[](BroadcastShellLoginArgs) {
DebugL << "shell login:" << user_name << " "
<< passwd;
invoker("");//鉴权成功
//invoker("this is auth failed message");//鉴权失败
});
//监听rtsp、rtmp源注册或注销事件此处用于测试rtmp保存为flv录像保存在http根目录下
NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastMediaChanged,[](BroadcastMediaChangedArgs){
if(schema == RTMP_SCHEMA && app == "live"){
NoticeCenter::Instance().addListener(nullptr, Broadcast::kBroadcastMediaChanged,
[](BroadcastMediaChangedArgs) {
if (schema == RTMP_SCHEMA && app == "live") {
lock_guard<mutex> lck(s_mtxFlvRecorder);
if(bRegist){
DebugL << "开始录制RTMP" << schema << " " << vhost << " " << app << " " << stream;
GET_CONFIG(string,http_root,Http::kRootPath);
auto path = http_root + "/" + vhost + "/" + app + "/" + stream + "_" + to_string(time(NULL)) + ".flv";
if (bRegist) {
DebugL << "开始录制RTMP" << schema << " "
<< vhost << " " << app << " "
<< stream;
GET_CONFIG(string, http_root,
Http::kRootPath);
auto path = http_root + "/" + vhost + "/" +
app + "/" + stream + "_" +
to_string(time(NULL)) + ".flv";
FlvRecorder::Ptr recorder(new FlvRecorder);
try{
recorder->startRecord(EventPollerPool::Instance().getPoller(),dynamic_pointer_cast<RtmpMediaSource>(sender.shared_from_this()),path);
s_mapFlvRecorder[vhost + "/" + app + "/" + stream] = recorder;
}catch(std::exception &ex){
try {
recorder->startRecord(
EventPollerPool::Instance().getPoller(),
dynamic_pointer_cast<RtmpMediaSource>(
sender.shared_from_this()),
path);
s_mapFlvRecorder[vhost + "/" + app +
"/" +
stream] = recorder;
} catch (std::exception &ex) {
WarnL << ex.what();
}
}else{
s_mapFlvRecorder.erase(vhost + "/" + app + "/" + stream);
} else {
s_mapFlvRecorder.erase(
vhost + "/" + app + "/" + stream);
}
}
});
//监听播放失败(未找到特定的流)事件
NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastNotFoundStream,[](BroadcastNotFoundStreamArgs){
NoticeCenter::Instance().addListener(nullptr, Broadcast::kBroadcastNotFoundStream,
[](BroadcastNotFoundStreamArgs) {
/**
*
* ZLMediaKit会把其立即转发给播放器(55)
*/
DebugL << "未找到流事件:" << args._schema << " " << args._vhost << " " << args._app << " " << args._streamid << " " << args._param_strs ;
DebugL << "未找到流事件:" << args._schema << " "
<< args._vhost << " " << args._app << " "
<< args._streamid << " "
<< args._param_strs;
});
//监听播放或推流结束时消耗流量事件
NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastFlowReport,[](BroadcastFlowReportArgs){
DebugL << "播放器(推流器)断开连接事件:" << args._schema << " " << args._vhost << " " << args._app << " " << args._streamid << " " << args._param_strs
<< "\r\n使用流量:" << totalBytes << " bytes,连接时长:" << totalDuration << "" ;
NoticeCenter::Instance().addListener(nullptr, Broadcast::kBroadcastFlowReport,
[](BroadcastFlowReportArgs) {
DebugL << "播放器(推流器)断开连接事件:" << args._schema << " "
<< args._vhost << " " << args._app << " "
<< args._streamid << " " << args._param_strs
<< "\r\n使用流量:" << totalBytes
<< " bytes,连接时长:" << totalDuration << "";
});
}, nullptr);
}, nullptr);
}
#if !defined(SIGHUP)
#define SIGHUP 1
@ -296,6 +342,7 @@ static int do_main(string ini_file) {
TcpServer::Ptr rtspSSLSrv(new TcpServer());
rtspSSLSrv->start<RtspSessionWithSSL>(rtspsPort);//默认322
initEvent();
//服务器支持动态切换端口(不影响现有连接)
NoticeCenter::Instance().addListener(ReloadConfigTag,Broadcast::kBroadcastReloadConfig,[&](BroadcastReloadConfigArgs){
//重新创建服务器