external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

del print_sip_message config

Browse source
This commit is contained in:
xialixin 2020-04-05 13:45:52 +08:00
parent 92d351ef35
commit 8ac39cb22f
5 changed files with 36 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
trunk/src/app/srs_app_config.cpp
View file

@ -4459,26 +4459,26 @@ bool SrsConfig::get_stream_caster_gb28181_audio_enable(SrsConfDirective* conf)
return SRS_CONF_PERFER_FALSE(conf->arg0());
}
bool SrsConfig::get_stream_caster_gb28181_print_sip_message(SrsConfDirective* conf)
{
static bool DEFAULT = false;
// bool SrsConfig::get_stream_caster_gb28181_print_sip_message(SrsConfDirective* conf)
// {
// static bool DEFAULT = false;
if (!conf) {
return DEFAULT;
}
// if (!conf) {
// return DEFAULT;
// }
conf = conf->get("sip");
if (!conf) {
return DEFAULT;
}
// conf = conf->get("sip");
// if (!conf) {
// return DEFAULT;
// }
conf = conf->get("print_sip_message");
if (!conf || conf->arg0().empty()) {
return DEFAULT;
}
// conf = conf->get("print_sip_message");
// if (!conf || conf->arg0().empty()) {
// return DEFAULT;
// }
return SRS_CONF_PERFER_FALSE(conf->arg0());
}
// return SRS_CONF_PERFER_FALSE(conf->arg0());
// }
bool SrsConfig::get_stream_caster_gb28181_wait_keyframe(SrsConfDirective* conf)
{

2
trunk/src/app/srs_app_config.hpp
View file

@ -507,7 +507,7 @@ public:
virtual std::string get_stream_caster_gb28181_host(SrsConfDirective* conf);
virtual std::string get_stream_caster_gb28181_serial(SrsConfDirective* conf);
virtual std::string get_stream_caster_gb28181_realm(SrsConfDirective* conf);
virtual bool get_stream_caster_gb28181_print_sip_message(SrsConfDirective* conf);
//virtual bool get_stream_caster_gb28181_print_sip_message(SrsConfDirective* conf);
virtual bool get_stream_caster_gb28181_wait_keyframe(SrsConfDirective* conf);
virtual bool get_stream_caster_gb28181_sip_enable(SrsConfDirective* conf);
virtual bool get_stream_caster_gb28181_sip_auto_play(SrsConfDirective* conf);

3
trunk/src/service/srs_service_http_conn.cpp
View file

@ -120,6 +120,7 @@ srs_error_t SrsHttpParser::parse_message_imp(ISrsReader* reader)
if (buffer->size() > 0) {
ssize_t consumed = http_parser_execute(&parser, &settings, buffer->bytes(), buffer->size());
// The error is set in http_errno.
enum http_errno code;
if ((code = HTTP_PARSER_ERRNO(&parser)) != HPE_OK) {
@ -139,6 +140,8 @@ srs_error_t SrsHttpParser::parse_message_imp(ISrsReader* reader)
}
}
}
size_t nparsed;
srs_info("size=%d, nparsed=%d, consumed=%d", buffer->size(), (int)nparsed, consumed);
// Only consume the header bytes.