Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-29 06:12:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复内存失效的问题

Browse Source
This commit is contained in:
xiongziliang
2020-04-24 14:06:28 +08:00
parent 2e74d5c957
commit bda57b57f2
3 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
api/tests/server.c
View File

@@ -47,12 +47,13 @@ void API_CALL on_mk_media_changed(int regist,
void API_CALL on_mk_media_publish(const mk_media_info url_info,
const mk_publish_auth_invoker invoker,
const mk_sock_info sender) {
char ip[64];
log_printf(LOG_LEV,
"client info, local: %s:%d, peer: %s:%d\n"
"%s/%s/%s/%s, url params: %s",
mk_sock_info_local_ip(sender),
mk_sock_info_local_ip(sender,ip),
mk_sock_info_local_port(sender),
mk_sock_info_peer_ip(sender),
mk_sock_info_peer_ip(sender,ip + 32),
mk_sock_info_peer_port(sender),
mk_media_info_get_schema(url_info),
mk_media_info_get_vhost(url_info),
@@ -75,12 +76,13 @@ void API_CALL on_mk_media_play(const mk_media_info url_info,
const mk_auth_invoker invoker,
const mk_sock_info sender) {
char ip[64];
log_printf(LOG_LEV,
"client info, local: %s:%d, peer: %s:%d\n"
"%s/%s/%s/%s, url params: %s",
mk_sock_info_local_ip(sender),
mk_sock_info_local_ip(sender,ip),
mk_sock_info_local_port(sender),
mk_sock_info_peer_ip(sender),
mk_sock_info_peer_ip(sender,ip + 32),
mk_sock_info_peer_port(sender),
mk_media_info_get_schema(url_info),
mk_media_info_get_vhost(url_info),
@@ -99,12 +101,13 @@ void API_CALL on_mk_media_play(const mk_media_info url_info,
*/
void API_CALL on_mk_media_not_found(const mk_media_info url_info,
const mk_sock_info sender) {
char ip[64];
log_printf(LOG_LEV,
"client info, local: %s:%d, peer: %s:%d\n"
"%s/%s/%s/%s, url params: %s",
mk_sock_info_local_ip(sender),
mk_sock_info_local_ip(sender,ip),
mk_sock_info_local_port(sender),
mk_sock_info_peer_ip(sender),
mk_sock_info_peer_ip(sender,ip + 32),
mk_sock_info_peer_port(sender),
mk_media_info_get_schema(url_info),
mk_media_info_get_vhost(url_info),
@@ -139,14 +142,15 @@ void API_CALL on_mk_http_request(const mk_parser parser,
int *consumed,
const mk_sock_info sender) {
char ip[64];
log_printf(LOG_LEV,
"client info, local: %s:%d, peer: %s:%d\n"
"%s %s?%s %s\n"
"User-Agent: %s\n"
"%s",
mk_sock_info_local_ip(sender),
mk_sock_info_local_ip(sender,ip),
mk_sock_info_local_port(sender),
mk_sock_info_peer_ip(sender),
mk_sock_info_peer_ip(sender,ip + 32),
mk_sock_info_peer_port(sender),
mk_parser_get_method(parser),
mk_parser_get_url(parser),
@@ -193,14 +197,15 @@ void API_CALL on_mk_http_access(const mk_parser parser,
const mk_http_access_path_invoker invoker,
const mk_sock_info sender) {
char ip[64];
log_printf(LOG_LEV,
"client info, local: %s:%d, peer: %s:%d, path: %s ,is_dir: %d\n"
"%s %s?%s %s\n"
"User-Agent: %s\n"
"%s",
mk_sock_info_local_ip(sender),
mk_sock_info_local_ip(sender, ip),
mk_sock_info_local_port(sender),
mk_sock_info_peer_ip(sender),
mk_sock_info_peer_ip(sender, ip + 32),
mk_sock_info_peer_port(sender),
path,(int)is_dir,
mk_parser_get_method(parser),
@@ -224,14 +229,16 @@ void API_CALL on_mk_http_access(const mk_parser parser,
void API_CALL on_mk_http_before_access(const mk_parser parser,
char *path,
const mk_sock_info sender) {
char ip[64];
log_printf(LOG_LEV,
"client info, local: %s:%d, peer: %s:%d, path: %s\n"
"%s %s?%s %s\n"
"User-Agent: %s\n"
"%s",
mk_sock_info_local_ip(sender),
mk_sock_info_local_ip(sender,ip),
mk_sock_info_local_port(sender),
mk_sock_info_peer_ip(sender),
mk_sock_info_peer_ip(sender,ip + 32),
mk_sock_info_peer_port(sender),
path,
mk_parser_get_method(parser),
@@ -252,12 +259,13 @@ void API_CALL on_mk_http_before_access(const mk_parser parser,
void API_CALL on_mk_rtsp_get_realm(const mk_media_info url_info,
const mk_rtsp_get_realm_invoker invoker,
const mk_sock_info sender) {
char ip[64];
log_printf(LOG_LEV,
"client info, local: %s:%d, peer: %s:%d\n"
"%s/%s/%s/%s, url params: %s",
mk_sock_info_local_ip(sender),
mk_sock_info_local_ip(sender,ip),
mk_sock_info_local_port(sender),
mk_sock_info_peer_ip(sender),
mk_sock_info_peer_ip(sender,ip + 32),
mk_sock_info_peer_port(sender),
mk_media_info_get_schema(url_info),
mk_media_info_get_vhost(url_info),
@@ -286,13 +294,14 @@ void API_CALL on_mk_rtsp_auth(const mk_media_info url_info,
const mk_rtsp_auth_invoker invoker,
const mk_sock_info sender) {
char ip[64];
log_printf(LOG_LEV,
"client info, local: %s:%d, peer: %s:%d\n"
"%s/%s/%s/%s, url params: %s\n"
"realm: %s, user_name: %s, must_no_encrypt: %d",
mk_sock_info_local_ip(sender),
mk_sock_info_local_ip(sender,ip),
mk_sock_info_local_port(sender),
mk_sock_info_peer_ip(sender),
mk_sock_info_peer_ip(sender,ip + 32),
mk_sock_info_peer_port(sender),
mk_media_info_get_schema(url_info),
mk_media_info_get_vhost(url_info),
@@ -339,11 +348,13 @@ void API_CALL on_mk_shell_login(const char *user_name,
const char *passwd,
const mk_auth_invoker invoker,
const mk_sock_info sender) {
char ip[64];
log_printf(LOG_LEV,"client info, local: %s:%d, peer: %s:%d\n"
"user_name: %s, passwd: %s",
mk_sock_info_local_ip(sender),
mk_sock_info_local_ip(sender,ip),
mk_sock_info_local_port(sender),
mk_sock_info_peer_ip(sender),
mk_sock_info_peer_ip(sender,ip + 32),
mk_sock_info_peer_port(sender),
user_name, passwd);
//允许登录shell
@@ -364,6 +375,7 @@ void API_CALL on_mk_flow_report(const mk_media_info url_info,
uint64_t total_seconds,
int is_player,
const mk_sock_info sender) {
char ip[64];
log_printf(LOG_LEV,"%s/%s/%s/%s, url params: %s,"
"total_bytes: %d, total_seconds: %d, is_player: %d, peer_ip:%s, peer_port:%d",
mk_media_info_get_schema(url_info),
@@ -371,7 +383,11 @@ void API_CALL on_mk_flow_report(const mk_media_info 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,mk_sock_info_peer_ip(sender), (int)mk_sock_info_peer_port(sender));
(int)total_bytes,
(int)total_seconds,
(int)is_player,
mk_sock_info_peer_ip(sender,ip),
(int)mk_sock_info_peer_port(sender));
}
static int flag = 1;