在线代码同步

1、同步soq_type头文件
2、链接libcjson
3、同步dpkt_label
4、在user_region输出连接内部信息辅助排查问题
5、kafka输出增加debug级别的日志，mode为none时同样输出

1 files changed, 69 insertions, 6 deletions

diff --git a/inc/soq_types.h b/inc/soq_types.h
index a7dd907..a12a2d3 100644
--- a/inc/soq_types.h
+++ b/inc/soq_types.h
@@ -10,8 +10,6 @@
 #error("This file should be compiled with C++ compiler")
 #endif
 
-#define	NTC_SWITCH
-
 typedef enum _soq_opt
 {
 	//Shared log options
@@ -76,7 +74,7 @@ typedef enum _soq_opt
 	LOG_OPT_SSH_ENCRYPT_MODE,		//size=sizeof(int)
 	LOG_OPT_SSH_MAC,				//string
 	LOG_OPT_SSH_TUNNEL_TYPE,
-	
+
 	LOG_OPT_SSL_VERSION,			//string
 	LOG_OPT_SSL_SNI,				//string
 	LOG_OPT_SSL_INDIVIDUAL_CERT_FILE,
@@ -97,6 +95,8 @@ typedef enum _soq_opt
 	LOG_OPT_HTTP_CONTENT_LEN,
 	LOG_OPT_HTTP_CONTENT_TYPE,
 	LOG_OPT_HTTP_USER_DEFINE,	//key:value+ '\0' ,e.g. "Server:nginx"
+	LOG_OPT_HTTP_USER_DEFINE_KEY,	//key:value+ '\0' ,e.g. "Server:nginx"
+	LOG_OPT_HTTP_USER_DEFINE_VALUE,	//key:value+ '\0' ,e.g. "Server:nginx"
 
 	LOG_OPT_APP_LABEL,
 	LOG_OPT_C2S_PKT_NUM,
@@ -104,13 +104,73 @@ typedef enum _soq_opt
 	LOG_OPT_C2S_BYTE_NUM,
 	LOG_OPT_S2C_BYTE_NUM,
 	LOG_OPT_SSL_SAN,
-	LOG_OPT_SSL_CA,
+	LOG_OPT_SSL_CN,
 	LOG_OPT_DNS_CNAME,
 	LOG_OPT_FTP_CONTENT,
 	LOG_OPT_L2TP_CHAP_NAME,
 
-
 	LOG_OPT_PROTO_TYPE,	//value:soq_protocol_t; FOR NTC
+
+	//RADIUS-LOG
+	LOG_OPT_RADIUS_CODE,
+	LOG_OPT_RADIUS_ACCOUNT,
+	LOG_OPT_NAS_IP,
+	LOG_OPT_FRAMED_IP,
+
+	LOG_OPT_MAIL_TO_CC,
+
+	//P2P-LOG
+	LOG_OPT_P2P_PROTO,
+	LOG_OPT_P2P_FILE_ID,
+	LOG_OPT_P2P_KEYWORD,
+	LOG_OPT_BGP_TYPE,
+	LOG_OPT_BGP_AS,
+	LOG_OPT_BGP_ROUTE,
+
+	//APP-LOG
+	LOG_OPT_LABEL_PROTO_ID,
+	LOG_OPT_LABEL_PROTO_SOURCE,
+	LOG_OPT_LABEL_BEHAV_ID,
+	LOG_OPT_LABEL_BEHAV_SOURCE,
+	LOG_OPT_LABEL_APP_ID,
+	LOG_OPT_LABEL_APP_SOURCE,
+
+	//VOIP
+	LOG_OPT_DUATION,
+	LOG_OPT_VOIP_PROTOCOL,
+	LOG_OPT_CALLING_ACCOUNT,
+	LOG_OPT_CALLED_ACCOUNT,
+	LOG_OPT_CALLING_NUMBER,
+	LOG_OPT_CALLED_NUMBER,
+	LOG_OPT_VOIP_PID,
+	LOG_OPT_RTP_D_IP,
+	LOG_OPT_RTP_S_IP,
+	LOG_OPT_RTP_D_PORT,
+	LOG_OPT_RTP_S_PORT,
+	LOG_OPT_FROM_TO_STORE_IP,
+	LOG_OPT_FROM_TO_STORE_URL,
+	LOG_OPT_TO_FROM_STORE_IP,
+	LOG_OPT_TO_FROM_STORE_URL,
+	LOG_OPT_SIP_D_IP,
+	LOG_OPT_SIP_S_IP,
+	LOG_OPT_SIP_D_PORT,
+	LOG_OPT_SIP_S_PORT,
+	LOG_OPT_CALL_ID,
+	LOG_OPT_VOIP_REQUEST_URI,
+	LOG_OPT_VOIP_CONTACTS,
+	LOG_OPT_VOIP_VIA,
+	LOG_OPT_VOIP_ROUTE,
+	LOG_OPT_VOIP_RECORD_ROUTE,
+	LOG_OPT_VOIP_USER_AGANT,
+	LOG_OPT_VOIP_SERVER,
+
+	//STREAM_MEDIA
+	LOG_OPT_STREAMING_MEDIA_URL,
+	LOG_OPT_STREAMING_MEDIA_PROTOCOL,
+
+	LOG_OPT_DNS_RESPOSE_IP,
+	LOG_OPT_MAIL_SUBJECT_CHARSET,
+
 	LOG_OPT_MAX
 }soq_opt_t;
 
@@ -130,13 +190,16 @@ typedef enum _soq_protocol
    PROTO_SSH,
    PROTO_PPTP,
    PROTO_L2TP,
-   PROTO_OPEN_VPN,//alias of PROTO_VPN   
+   PROTO_OPEN_VPN,//alias of PROTO_VPN
    PROTO_GRE,//PROTO_GRE=15 FOR NTC
    PROTO_SOCKS,//FOR NTC
    PROTO_XMPP,//FOR NTC
    PROTO_SIP,//FOR NTC
    PROTO_RTP,//FOR NTC
    PROTO_BGP,//FOR NTC
+   PROTO_APP,
+   PROTO_VOIP,
+   PROTO_STREAMING_MEDIA,
    PROTO_MAX
 }soq_protocol_t;