diff options
| -rw-r--r-- | src/frag_block.c | 15 | ||||
| -rw-r--r-- | src/frag_monitor.c | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/frag_block.c b/src/frag_block.c index 63fc23e..5734f6d 100644 --- a/src/frag_block.c +++ b/src/frag_block.c @@ -255,7 +255,7 @@ char frag_check_block(frag_info_t *frag, http_infor* a_http, struct streaminfo * int rulenum = 0; AV_feature_info_t feature_info; char locate_url[MAX_SERVICE_DEFINE_LEN] = {0}; - char maat_define[MAX_SERVICE_DEFINE_LEN] = {0}; + char* maat_define = NULL; char cfg_url[MAX_SERVICE_DEFINE_LEN] = {0}; char* pos = NULL; char* saveptr = NULL; @@ -266,12 +266,14 @@ char frag_check_block(frag_info_t *frag, http_infor* a_http, struct streaminfo * /* "%u|%u|%s|%llu|%u|%s",hit_rule.cfg_id, hit_rule.level, logurl, (unsigned long long)msg->prog_id, hit_rule.service);*/ //rulenum = AV_rule_scan_frag_url(a_http->p_url, a_http->url_len, maat_result, MAAT_RESULT_NUM, &fd_type, thread_seq); rulenum = frag_url_scan(a_http->p_url, a_http->url_len, maat_result, MAAT_RESULT_NUM, &fd_type, thread_seq); + for(int i=0;i<rulenum;i++) - { - memset(maat_define, 0, sizeof(maat_define)); + { memset(cfg_url, 0, sizeof(cfg_url)); - memcpy(&maat_define, &maat_result[i].service_defined, strlen(maat_result[i].service_defined)); - src = maat_result[i].service_defined; + maat_define = (char*)dictator_malloc(thread_seq, sizeof(char)*maat_result[i]->serv_def_len+1); + Maat_read_rule(g_AV_global_feather, &maat_result[i], MAAT_RULE_SERV_DEFINE, maat_define, maat_result->serv_def_len); + maat_define[maat_result[i]->serv_def_len] = '\0'; + src = maat_define; pos = strtok_r(src, "|", &saveptr); for(int i=0;i<6 && pos!=NULL;i++) { @@ -299,7 +301,8 @@ char frag_check_block(frag_info_t *frag, http_infor* a_http, struct streaminfo * break; } pos = strtok_r(NULL, "|", &saveptr); - } + } + dictator_free(thread_seq, maat_define); /*��£��������־*/ frag_kill_connection(feature_info.mid, frag, a_http, a_tcp, a_packet); frag_send_block_log(fd_type, locate_url, &feature_info, frag, a_http, a_tcp); diff --git a/src/frag_monitor.c b/src/frag_monitor.c index f7eb9f2..306ee47 100644 --- a/src/frag_monitor.c +++ b/src/frag_monitor.c @@ -37,7 +37,7 @@ #include "frag_common.h" #include "frag_block.h" -int FRAG_MONITOR_VERSION_2_0_20181112 = 0; +int FRAG_MONITOR_VERSION_2_0_20190802 = 0; void frag_monitor_history() { //2015.09.23 create the project @@ -78,6 +78,7 @@ void frag_monitor_history() //2018.07.10 1. 1. refer send to kafka 2. close frag forecast //2018.07.24 1. 1. create maat feather //2018.11.12 1. 1. set K_PROJECT because different maat table + //2019.08.02 1. 1. maat service_defined } frag_monitor_runtime_parameter_t g_frag_prog_para; |