From 48379bddd3b967657cc410294aee8058c3c3e2a9 Mon Sep 17 00:00:00 2001 From: lishu Date: Mon, 28 Jan 2019 14:39:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81youtube?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/conf/sifter/iqiyi_data.sft | 12 --- bin/conf/sifter/sifter.json | 160 ++++++++++++++--------------- bin/conf/sifter/urloffset_data.sft | 12 --- bin/conf/sifter/youtube_data.sft | 2 +- frag_rssb安装使用手册.docx | Bin 80314 -> 80365 bytes src/AV_interface.h | 2 +- src/frag_av.c | 10 +- src/frag_reassembly.c | 24 ++--- src/main.c | 11 +- 9 files changed, 105 insertions(+), 128 deletions(-) delete mode 100644 bin/conf/sifter/iqiyi_data.sft delete mode 100644 bin/conf/sifter/urloffset_data.sft diff --git a/bin/conf/sifter/iqiyi_data.sft b/bin/conf/sifter/iqiyi_data.sft deleted file mode 100644 index fff3ec4..0000000 --- a/bin/conf/sifter/iqiyi_data.sft +++ /dev/null @@ -1,12 +0,0 @@ -[INFOR] -sft_id = 3122 - -[EXTRACT] -#[expect_type][expect_name] = extract_location$extract_method$start$mid$end$ -#expect_type and expect_name must be one -#sifter_method = Tag | RawText | Boundary | Reposition -#special character : \r\n = 0x0d0x0a, \x30 = no end , \x0 = null -#expect_name = {1}{MEDIA_ID}, {2}{FRAG_UNIT_ID}, {3}{FRAG_UNIT_ABOFFSET}, {4}{FRAG_UNIT_REOFFSET}, {5}{MEDIA_SIZE}, {6}{MEDIA_NAME}, {7}{MEDIA_CONTENT} -#extract_location = {61}{C2S_URL}, {0xD1}{S2C_CONTENT-DISPOSITION},{0xE1}{C2S_CONTENT},{0xF1}{S2C_CONTENT} -{1}{MEDIA_ID}={61}{C2S_URL}$End$\x0$\x0$f4v$ -{4}{FRAG_UNIT_ABOFFSET}={61}{C2S_URL}$Tag$range=$\x0$-$ diff --git a/bin/conf/sifter/sifter.json b/bin/conf/sifter/sifter.json index c78b10b..07ef58f 100644 --- a/bin/conf/sifter/sifter.json +++ b/bin/conf/sifter/sifter.json @@ -5,12 +5,12 @@ [ { "compile_id": 1, - "service": 2221, - "action": 2, + "service": 5222, + "action": 1, "do_blacklist": 1, - "do_log": 1, + "do_log": 0, "effective_rage": 0, - "user_region": "FRAG_UNIT_ID", + "user_region": "MEDIA_ID", "is_valid": "yes", "groups": [ { @@ -20,7 +20,7 @@ "table_name": "SIFTER_START", "table_type": "string", "table_content": { - "keywords": "http://", + "keywords": "/vmind", "expr_type": "none", "match_method": "sub", "format": "uncase plain" @@ -32,12 +32,12 @@ }, { "compile_id": 2, - "service": 2221, - "action": 4, + "service": 5222, + "action": 2, "do_blacklist": 1, - "do_log": 2, + "do_log": 1, "effective_rage": 0, - "user_region": "FRAG_UNIT_REOFFSET", + "user_region": "FRAG_UNIT_ID", "is_valid": "yes", "groups": [ { @@ -47,7 +47,7 @@ "table_name": "SIFTER_START", "table_type": "string", "table_content": { - "keywords": "&ts_seg_no=", + "keywords": "/vmind", "expr_type": "none", "match_method": "sub", "format": "uncase plain" @@ -113,70 +113,16 @@ }, { "compile_id": 5, - "service": 3122, - "action": 4, - "do_blacklist": 4, - "do_log": 1, - "effective_rage": 0, - "user_region": "FRAG_UNIT_ABOFFSET", - "is_valid": "yes", - "groups": [ - { - "group_name": "4_start", - "regions": [ - { - "table_name": "SIFTER_START", - "table_type": "string", - "table_content": { - "keywords": "range=", - "expr_type": "none", - "match_method": "sub", - "format": "uncase plain" - } - } - ] - } - ] - }, -{ - "compile_id": 6, - "service": 1122, - "action": 4, - "do_blacklist": 5, - "do_log": 1, - "effective_rage": 0, - "user_region": "FRAG_UNIT_REOFFSET", - "is_valid": "yes", - "groups": [ - { - "group_name": "5_start", - "regions": [ - { - "table_name": "SIFTER_START", - "table_type": "string", - "table_content": { - "keywords": "Frag", - "expr_type": "none", - "match_method": "sub", - "format": "uncase plain" - } - } - ] - } - ] - }, -{ - "compile_id": 7, "service": 2121, "action": 2, - "do_blacklist": 7, + "do_blacklist": 4, "do_log": 1, "effective_rage": 0, "user_region": "FRAG_UNIT_ID", "is_valid": "yes", "groups": [ { - "group_name": "6_start", + "group_name": "4_start", "regions": [ { "table_name": "SIFTER_START", @@ -193,17 +139,17 @@ ] }, { - "compile_id": 8, + "compile_id": 6, "service": 2121, "action": 4, - "do_blacklist": 7, + "do_blacklist": 4, "do_log": 2, "effective_rage": 0, "user_region": "FRAG_UNIT_REOFFSET", "is_valid": "yes", "groups": [ { - "group_name": "7_start", + "group_name": "5_start", "regions": [ { "table_name": "SIFTER_START", @@ -220,13 +166,67 @@ ] }, { - "compile_id": 9, - "service": 5222, - "action": 1, - "do_blacklist": 8, - "do_log": 0, + "compile_id": 7, + "service": 1122, + "action": 4, + "do_blacklist": 5, + "do_log": 1, "effective_rage": 0, - "user_region": "MEDIA_ID", + "user_region": "FRAG_UNIT_REOFFSET", + "is_valid": "yes", + "groups": [ + { + "group_name": "6_start", + "regions": [ + { + "table_name": "SIFTER_START", + "table_type": "string", + "table_content": { + "keywords": "Frag", + "expr_type": "none", + "match_method": "sub", + "format": "uncase plain" + } + } + ] + } + ] + }, +{ + "compile_id": 8, + "service": 2221, + "action": 2, + "do_blacklist": 7, + "do_log": 1, + "effective_rage": 0, + "user_region": "FRAG_UNIT_ID", + "is_valid": "yes", + "groups": [ + { + "group_name": "7_start", + "regions": [ + { + "table_name": "SIFTER_START", + "table_type": "string", + "table_content": { + "keywords": "http://", + "expr_type": "none", + "match_method": "sub", + "format": "uncase plain" + } + } + ] + } + ] + }, +{ + "compile_id": 9, + "service": 2221, + "action": 4, + "do_blacklist": 7, + "do_log": 2, + "effective_rage": 0, + "user_region": "FRAG_UNIT_REOFFSET", "is_valid": "yes", "groups": [ { @@ -236,7 +236,7 @@ "table_name": "SIFTER_START", "table_type": "string", "table_content": { - "keywords": "/vmind", + "keywords": "&ts_seg_no=", "expr_type": "none", "match_method": "sub", "format": "uncase plain" @@ -248,12 +248,12 @@ }, { "compile_id": 10, - "service": 5222, - "action": 2, + "service": 4122, + "action": 3, "do_blacklist": 8, "do_log": 1, "effective_rage": 0, - "user_region": "FRAG_UNIT_ID", + "user_region": "FRAG_UNIT_ABOFFSET", "is_valid": "yes", "groups": [ { @@ -263,7 +263,7 @@ "table_name": "SIFTER_START", "table_type": "string", "table_content": { - "keywords": "/vmind", + "keywords": "range=", "expr_type": "none", "match_method": "sub", "format": "uncase plain" diff --git a/bin/conf/sifter/urloffset_data.sft b/bin/conf/sifter/urloffset_data.sft deleted file mode 100644 index f18b19b..0000000 --- a/bin/conf/sifter/urloffset_data.sft +++ /dev/null @@ -1,12 +0,0 @@ -[INFOR] -sft_id = 3122 - -[EXTRACT] -#[expect_type][expect_name] = extract_location$extract_method$start$mid$end$ -#expect_type and expect_name must be one -#sifter_method = Tag | RawText | Boundary | Reposition -#special character : \r\n = 0x0d0x0a, \x30 = no end , \x0 = null -#expect_name = {1}{MEDIA_ID}, {2}{FRAG_UNIT_ID}, {3}{FRAG_UNIT_ABOFFSET}, {4}{FRAG_UNIT_REOFFSET}, {5}{MEDIA_SIZE}, {6}{MEDIA_NAME}, {7}{MEDIA_CONTENT} -#extract_location = {61}{C2S_URL}, {0xD1}{S2C_CONTENT-DISPOSITION},{0xE1}{C2S_CONTENT},{0xF1}{S2C_CONTENT} -{1}{MEDIA_ID}={61}{C2S_URL}$End$\x0$\x0$f4v$ -{4}{FRAG_UNIT_REOFFSET}={61}{C2S_URL}$Tag$range=$\x0$-$ diff --git a/bin/conf/sifter/youtube_data.sft b/bin/conf/sifter/youtube_data.sft index 518173b..ce54327 100644 --- a/bin/conf/sifter/youtube_data.sft +++ b/bin/conf/sifter/youtube_data.sft @@ -9,4 +9,4 @@ sft_id = 4122 #expect_name = {1}{MEDIA_ID}, {2}{FRAG_UNIT_ID}, {3}{FRAG_UNIT_ABOFFSET}, {4}{FRAG_UNIT_REOFFSET}, {5}{MEDIA_SIZE}, {6}{MEDIA_NAME}, {7}{MEDIA_CONTENT} #extract_location = {61}{C2S_URL}, {0xD1}{S2C_CONTENT-DISPOSITION},{0xE1}{C2S_CONTENT},{0xF1}{S2C_CONTENT} {1}{MEDIA_ID}={61}{C2S_URL}$End$\x0$\x0$range=$ -{4}{FRAG_UNIT_REOFFSET}={61}{C2S_URL}$Tag$range=$\x0$-$ +{3}{FRAG_UNIT_ABOFFSET}={61}{C2S_URL}$Tag$range=$\x0$-$ diff --git a/frag_rssb安装使用手册.docx b/frag_rssb安装使用手册.docx index 729095f4ca4eef0b64d5a73466e8502db7e65d08..4e34160e03b4fa3e1ef1fe0a1fda3086ed20f70a 100644 GIT binary patch delta 10210 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 diff --git a/src/AV_interface.h b/src/AV_interface.h index 13996a7..74bd8f6 100644 --- a/src/AV_interface.h +++ b/src/AV_interface.h @@ -36,7 +36,7 @@ #define FILE_IOS 0xA3 #define FILE_ANDRIOD 0xA4 #define FILE_APP 0xA5 -#define FILE_FRAG 0xA6 /*ËéƬԤ¸æʶ±ðµÄ,ÀýÈçurlÀïÃæ´øÓÐÆ«ÒÆÁ¿µÄ£¬ÀýÈçiqiyi*/ +#define FILE_REQ_FRAG 0xA6 /*ËéƬԤ¸æʶ±ðµÄ,ÀýÈçurlÀïÃæ´øÓÐÆ«ÒÆÁ¿µÄ£¬ÀýÈçiqiyi*/ #define FILE_MAYBE_FRAG 0xA7 /*Ç°¶Ë»Ø´«µÄ¿ÉÄÜÊÇËéƬµÄÒôÊÓƵ*/ #define FILE_AV 0x00 /*ËéƬԤ¸æʶ±ðµÄýÌåÀàÐÍת»»Îª0x00*/ diff --git a/src/frag_av.c b/src/frag_av.c index 01b68ec..80a0669 100644 --- a/src/frag_av.c +++ b/src/frag_av.c @@ -751,7 +751,7 @@ void media_stat(media_t* mdi, frag_unit_t* frg_unit) atomic_inc(&frag_rssb.data_info[RSSB_OSMF_TO_OTHER][TOTAL_PKTS]); } break; - case FILE_FRAG: + case FILE_REQ_FRAG: if(frg_unit->service_id!=0) { atomic_inc(&frag_rssb.data_info[RSSB_RECV_FRAG_MEDIA][TOTAL_PKTS]); @@ -794,7 +794,7 @@ void media_byte_stat(media_t* mdi, frag_unit_t* frg_unit, frag_in_t* frg) } break; - case FILE_FRAG: + case FILE_REQ_FRAG: if(frg_unit!=NULL && frg_unit->service_id!=0) { atomic_add(&frag_rssb.data_info[RSSB_RECV_FRAG_MEDIA][TOTAL_BYTES],frg->datalen); @@ -900,10 +900,10 @@ int media_removal(media_t* mdi, frag_unit_t* frg_unit, frag_in_t* frg, frag_ivi_ frg->seq = mdi->re_offset; frg->offset_in = frg->offset; frag_stat = 1; - } + } else { - if(FILE_FRAG==mdi->media_type && NULL!=frg_unit) + if(FILE_REQ_FRAG==mdi->media_type && NULL!=frg_unit) { frg->seq = frg_unit->re_offset; frg->offset += frg_unit->ab_offset; @@ -1298,7 +1298,7 @@ long converge_mediainfo_search_cb(void *data, const uint8_t *key, uint size, voi int is_frag(uint8_t media_type) { - if(media_type==FILE_OSMF || media_type==FILE_HLS || media_type==FILE_FRAG || media_type==FILE_MAYBE_FRAG ||media_type==FILE_IOS|| media_type==FILE_ANDRIOD|| media_type==FILE_APP) + if(media_type==FILE_OSMF || media_type==FILE_HLS || media_type==FILE_REQ_FRAG || media_type==FILE_MAYBE_FRAG ||media_type==FILE_IOS|| media_type==FILE_ANDRIOD|| media_type==FILE_APP) { return 1; } diff --git a/src/frag_reassembly.c b/src/frag_reassembly.c index ed0fde7..4c87e60 100644 --- a/src/frag_reassembly.c +++ b/src/frag_reassembly.c @@ -481,7 +481,7 @@ void set_media_service_type(media_t* mdi) mdi->media_service_type = MEDIA_SERVICE_TYPE_FRAG; mdi->media_len = 0; } - else if(FILE_FRAG==mdi->media_type) + else if(FILE_REQ_FRAG==mdi->media_type) { mdi->media_service_type = MEDIA_SERVICE_TYPE_FRAG; } @@ -709,7 +709,7 @@ void free_frag_unit(void* data) { case FILE_HLS: case FILE_OSMF: - case FILE_FRAG: + case FILE_REQ_FRAG: case FILE_MAYBE_FRAG: frag_redis_index_twice(frg_unit); break; @@ -1045,15 +1045,15 @@ long media_preproc_cb(void *data, const uint8_t *key, uint size, void *user_arg) } /*offset==0, log*/ - if(0==frg->offset) - { - if(!FLAG_TEST(mdi->flag, PROG_OFFSET_ZERO)) - { - atomic_inc(&g_frag_stat.media_stat[LOG_MEDIA_OFFSET_ZERO]); - FLAG_SET(mdi->flag, PROG_OFFSET_ZERO); - } - create_media_write_to_log(mdi, MEDIA_OFFSET_ZERO, NULL); - } + if(0==frg->offset) + { + if(!FLAG_TEST(mdi->flag, PROG_OFFSET_ZERO)) + { + atomic_inc(&g_frag_stat.media_stat[LOG_MEDIA_OFFSET_ZERO]); + FLAG_SET(mdi->flag, PROG_OFFSET_ZERO); + } + create_media_write_to_log(mdi, MEDIA_OFFSET_ZERO, NULL); + } /*record maxoffset*/ mdi->maxoffset = MAX(frg->offset, mdi->maxoffset); @@ -1335,7 +1335,7 @@ long get_media(void *data, const uint8_t *key, uint size, void *user_arg) } /*±ãÓÚͳ¼Æfor data*/ /*³ýÁËHLS OSMF£¬ÆäËûËéƬЭÒémedia_typeÉèÖÃΪ´«Í³½ÚÄ¿µÄmediatype*/ - if(mdi->media_type==FILE_FRAG) + if(mdi->media_type==FILE_REQ_FRAG) { media_info->media_type = FILE_AV; media_info->prog_len = 0; diff --git a/src/main.c b/src/main.c index 43052af..b1f77c3 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_20181211 = 0; -const char* frag_rssb_version_time_in = "2018-12-11"; -const char* frag_rssb_version_des_in = "resp_checkresult_search_media_cb add K_PROJECT"; +int FRAG_RSSB_VERSION_1_0_20190121 = 0; +const char* frag_rssb_version_time_in = "2019-01-21"; +const char* frag_rssb_version_des_in = "support youtube"; void frag_rssb_history() { //2015.11.15 v1.0 create the project @@ -218,7 +218,7 @@ void frag_rssb_history() //2018.09.13 v4.0 //1.frag removal //2018.09.20 v4.0//1 voip_fulllog add voice_dir opt //2018.09.27 v4.0 //1. hard balance - //2018.10.08 v4.0//1.add send_voip_full_json_log for K_PROJECT;2.voip_fulllog and voip_surveylog add voice_dir and cap_ip opt + //2018.10.08 v4.0//1.add send_voip_full_json_log for K_PROJECT;2.voip_fulllog and voip_surveylog add voice_dir and cap_ip opt //2018.10.22 v4.0//alter g_sip_opt_type and add enum sip_opt_index //2018.11.02 v4.0//add timer_on //2018.11.05 v4.0//alter voip save_media frg_len>headerlen @@ -226,7 +226,8 @@ void frag_rssb_history() //2018.12.07 v4.0//unixsocket set bufsize timeout in configure //2018.12.10 v4.0//1.recv_msg_fd not unix 2.MsgPort //2018.12.11 v4.0//1.file mediatype - //2018.12.11 v4.0//resp_checkresult_search_media_cb add K_PROJECT,and delete send_json_log + //2018.12.11 v4.0//resp_checkresult_search_media_cb add K_PROJECT,and delete send_json_log + //2019.01.21 v4.0//support youtube; update req_frag and template } frag_rssb_parameter_t g_frag_run;