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

For #1638, #307, accept srs_string_dumps_hex to app utility.

Browse source
This commit is contained in:
winlin 2020-03-16 18:05:42 +08:00
parent e905fce847
commit 2f0b150588
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
trunk/src/app/srs_app_utility.cpp
View file

@ -1193,22 +1193,21 @@ void srs_api_dump_summaries(SrsJsonObject* obj)
sys->set("conn_srs", SrsJsonAny::integer(nrs->nb_conn_srs)); sys->set("conn_srs", SrsJsonAny::integer(nrs->nb_conn_srs));
} }
string dump_string_hex(const std::string& str, const int& max_len) string srs_string_dumps_hex(const std::string& str, const int& limit)
{ {
return dump_string_hex(str.c_str(), str.size(), max_len); return srs_string_dumps_hex(str.c_str(), str.size(), limit);
} }
string dump_string_hex(const char* buf, const int nb_buf, const int& max_len) string srs_string_dumps_hex(const char* buf, const int length, const int& limit)
{ {
string ret; string ret;
ret.reserve(max_len * 4); ret.reserve(limit * 4);
char tmp_buf[1024*16]; char tmp_buf[1024*16];
tmp_buf[0] = '\n'; tmp_buf[0] = '\n';
int len = 1; int len = 1;
for (int i = 0; i < nb_buf && i < max_len; ++i) { for (int i = 0; i < length && i < limit; ++i) {
//int nb = snprintf(tmp_buf + len, sizeof(tmp_buf) - len - 2, "(%03d)%02X ", i, (uint8_t)buf[i]);
int nb = snprintf(tmp_buf + len, sizeof(tmp_buf) - len - 2, "%02X ", (uint8_t)buf[i]); int nb = snprintf(tmp_buf + len, sizeof(tmp_buf) - len - 2, "%02X ", (uint8_t)buf[i]);
if (nb <= 0) if (nb <= 0)
break; break;

5
trunk/src/app/srs_app_utility.hpp
View file

@ -650,8 +650,9 @@ extern bool srs_is_boolean(std::string str);
// Dump summaries for /api/v1/summaries. // Dump summaries for /api/v1/summaries.
extern void srs_api_dump_summaries(SrsJsonObject* obj); extern void srs_api_dump_summaries(SrsJsonObject* obj);
extern std::string dump_string_hex(const std::string& str, const int& max_len = INT_MAX); // Dump string(str in length) to hex, it will process min(limit, length) chars.
extern std::string dump_string_hex(const char* buf, const int nb_buf, const int& max_len = INT_MAX); extern std::string srs_string_dumps_hex(const std::string& str, const int& limit = INT_MAX);
extern std::string srs_string_dumps_hex(const char* str, const int length, const int& limit = INT_MAX);
// Get ENV variable, which may starts with $. // Get ENV variable, which may starts with $.
// srs_getenv("EIP") === srs_getenv("$EIP") // srs_getenv("EIP") === srs_getenv("$EIP")

1
trunk/src/kernel/srs_kernel_flv.hpp
View file

@ -39,7 +39,6 @@ class ISrsWriter;
class ISrsReader; class ISrsReader;
class SrsFileReader; class SrsFileReader;
class SrsPacket; class SrsPacket;
class SrsSample;
class SrsRtpSharedPacket; class SrsRtpSharedPacket;
#define SRS_FLV_TAG_HEADER_SIZE 11 #define SRS_FLV_TAG_HEADER_SIZE 11