diff --git a/conf/maat/maat_tableinfo.conf b/conf/maat/maat_tableinfo.conf index e67ea3c..0fa5b6a 100644 --- a/conf/maat/maat_tableinfo.conf +++ b/conf/maat/maat_tableinfo.conf @@ -5,4 +5,5 @@ 3 TSG_OBJ_IP_ADDR ip_plus -- 4 PXY_INTERCEPT_DOMAIN expr utf8 utf8 yes 0 4 TSG_OBJ_FQDN expr utf8 utf8 yes 0 -5 COMPILE_ALIAS compile escape -- \ No newline at end of file +4 TSG_OBJ_FQDN_CAT expr utf8 utf8 yes 0 +5 COMPILE_ALIAS compile escape -- diff --git a/entry/src/kni_entry.cpp b/entry/src/kni_entry.cpp index 3465137..1963fa7 100644 --- a/entry/src/kni_entry.cpp +++ b/entry/src/kni_entry.cpp @@ -119,7 +119,7 @@ struct pme_info{ uint64_t ssl_client_side_latency; char ssl_server_side_version[KNI_SYMBOL_MAX]; char ssl_client_side_version[KNI_SYMBOL_MAX]; - uint64_t ssl_cert_verify; + int64_t ssl_cert_verify; char ssl_error[KNI_STRING_MAX]; //for dup traffic detect @@ -204,7 +204,7 @@ struct traceid2pme_search_cb_args{ static char* stream_errmsg_get(enum stream_error _errno){ switch(_errno){ case STREAM_ERROR_PENDING_NO_SYN: - return (char*)"penging not syn"; + return (char*)"pending not syn"; case STREAM_ERROR_SINGLE_DIR: return (char*)"single dir"; case STREAM_ERROR_PROTOCOL_UNKNOWN: @@ -289,6 +289,7 @@ static struct pme_info* pme_info_new(const struct streaminfo *stream, int thread void *logger = g_kni_handle->local_logger; struct pme_info* pmeinfo = ALLOC(struct pme_info, 1); pmeinfo->addr_type = (enum addr_type_t)stream->addr.addrtype; + pmeinfo->ssl_cert_verify = -1; uuid_t uu; uuid_generate_random(uu); uuid_unparse(uu, pmeinfo->stream_traceid); @@ -319,7 +320,7 @@ static int log_generate(struct pme_info *pmeinfo, void *local_logger){ //create cjson cJSON *log_obj = cJSON_CreateObject(); //stream_traceid - cJSON_AddStringToObject(log_obj, "stream_traceid", pmeinfo->stream_traceid); + cJSON_AddStringToObject(log_obj, "stream_trace_id", pmeinfo->stream_traceid); //policy_id cJSON_AddNumberToObject(log_obj, "policy_id", pmeinfo->policy_id); //action