gfwleak/av-frag-rssb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.mesalab.cn:AV/frag_rssb

Browse Source 
# Conflicts:
#	src/main.c
This commit is contained in:
lishu
2018-12-11 23:08:27 +08:00
parent c22fbc45ba 9ca789ee39
commit 41b2a00de2
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.c
View File

@@ -44,7 +44,7 @@ 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 = "unixsocket recv survey";
const char* frag_rssb_version_des_in = "resp_checkresult_search_media_cb add K_PROJECT";
void frag_rssb_history()
{
//2015.11.15 v1.0 create the project
@@ -226,6 +226,7 @@ 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
}
frag_rssb_parameter_t g_frag_run;

9
src/message.c
View File

@@ -743,7 +743,7 @@ long resp_checkresult_search_media_cb(void *data, const uint8_t *key, uint size,
resp_write_to_log(RESP_REPEAT, check_res, NULL, NULL, 0);
last_black_ts = time(NULL);
return -1;
}
}
/*VOIP<49>ļ<EFBFBD><C4BC>⽨<EFBFBD>飬<EFBFBD>ɴ<EFBFBD>ƴװ<C6B4><D7B0>*/
if(mdi->proto==AV_PROTOCOL_SIP)
@@ -753,7 +753,10 @@ long resp_checkresult_search_media_cb(void *data, const uint8_t *key, uint size,
mdi->sip_survey_type |= SIP_SURVEY_TYPE_JC;
mdi->jc_buf = (char*)malloc(buflen);
memcpy(mdi->jc_buf, buf, buflen);
mdi->jc_buflen = buflen;
#if K_PROJECT
#else
return 0;
#endif
}
else
@@ -763,7 +766,7 @@ long resp_checkresult_search_media_cb(void *data, const uint8_t *key, uint size,
memcpy(mdi->fd_buf, buf, buflen);
mdi->fd_buflen = buflen;
}
}
}
/*monitor service*/
if(check_res->service==SERVICE_AUDIO_LANG)
@@ -939,7 +942,7 @@ long resp_checkresult_search_media_cb(void *data, const uint8_t *key, uint size,
mdi->level = check_res->level;
mdi->survey_time = time(NULL);
memcpy(mdi->log_url, log_url, MIN(log_urllen, sizeof(mdi->log_url)-1));
#if K_PROJECT
#if K_PROJECT
//send_json_log(mdi,check_res);
#else
//send_json_log(mdi,check_res);//for test