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

# Conflicts:
#	src/main.c

2 files changed, 8 insertions, 4 deletions

diff --git a/src/main.c b/src/main.c
index 7276787..43052af 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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;
diff --git a/src/message.c b/src/message.c
index 89c1ca4..05c113b 100644
--- a/src/message.c
+++ b/src/message.c
@@ -743,7 +743,7 @@ long resp_checkresult_search_media_cb(void *data, const uint8_t *key, uint size,
 		last_black_ts = time(NULL);

 		return -1;

 	}

-

+	

 	/*VOIP�ļ�⽨�飬�ɴ�ƴװ��*/

 	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->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,
 			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->survey_time = time(NULL);

 		memcpy(mdi->log_url, log_url, MIN(log_urllen, sizeof(mdi->log_url)-1));

 #if K_PROJECT

-		send_json_log(mdi,check_res);

+		//send_json_log(mdi,check_res);

 #else

 		//send_json_log(mdi,check_res);//for test