diff --git a/src/frag_reassembly.c b/src/frag_reassembly.c index 4c87e60..1dffda1 100644 --- a/src/frag_reassembly.c +++ b/src/frag_reassembly.c @@ -1414,9 +1414,9 @@ long get_media(void *data, const uint8_t *key, uint size, void *user_arg) { /*发给内容分析程序,选项*/ media_info->opt_unit = (struct opt_unit_t*)calloc(1, sizeof(struct opt_unit_t)); - media_info->opt_unit->opt_len = sizeof(uint32_t)+sizeof(uint8_t)+sizeof(char*); + media_info->opt_unit->opt_len = sizeof(uint32_t)+sizeof(uint8_t)+sizeof(unsigned int); media_info->opt_unit->opt_type = OPT_SOURCE_IP; - media_info->opt_unit->opt_value = (char*)calloc(1, sizeof(char*)); + media_info->opt_unit->opt_value = (char*)calloc(1, sizeof(unsigned int)); *(unsigned int*)(media_info->opt_unit->opt_value) = g_frag_cfg.local_ip_nr; opt_num++; } diff --git a/src/main.c b/src/main.c index a7156d9..ca13264 100644 --- a/src/main.c +++ b/src/main.c @@ -42,9 +42,9 @@ const char* frag_rssb_version = "2018-08-13T09:00:00"; const char* frag_rssb_version_time = "2018-08-13T09:00:00"; const char* frag_rssb_version_des = "MESA@iie rssb_maskey"; -int FRAG_RSSB_VERSION_1_0_20190315 = 0; -const char* frag_rssb_version_time_in = "2019-03-15"; -const char* frag_rssb_version_des_in = "support udp socket"; +int FRAG_RSSB_VERSION_1_0_20190425 = 0; +const char* frag_rssb_version_time_in = "2019-04-25"; +const char* frag_rssb_version_des_in = "adjust local_eth opt"; void frag_rssb_history() { //2015.11.15 v1.0 create the project @@ -229,7 +229,8 @@ void frag_rssb_history() //2018.12.11 v4.0//resp_checkresult_search_media_cb add K_PROJECT,and delete send_json_log //2018.12.24 v4.0//send_voip_full_json_log add survey judgement for K //2019.01.21 v4.0//support youtube; update req_frag and template - //2019.03.15 v4.0//keepalive; support udp send + //2019.03.15 v4.0//keepalive; support udp send + //2019.04.25 v4.0//media_info:local_nr opt } frag_rssb_parameter_t g_frag_run;