summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryw <[email protected]>2018-09-14 15:59:14 +0800
committeryw <[email protected]>2018-09-14 15:59:23 +0800
commit3baaedefc36136148687547ec6f1a8f4989f73d4 (patch)
tree1239cbe055c3f479a42cfd14c9c0cf7ab3905660
parent85c2e69b902a78144f7b7412f89cac6b6b425080 (diff)
UPDATE dpkt_lable_t in #include "soq/identify_v2.h"
-rw-r--r--src/ntc_ssl_collect.c3
-rw-r--r--src/ntc_ssl_collect.h6
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ntc_ssl_collect.c b/src/ntc_ssl_collect.c
index bfe5ecf..d0d3e80 100644
--- a/src/ntc_ssl_collect.c
+++ b/src/ntc_ssl_collect.c
@@ -204,8 +204,7 @@ int ntc_get_dpkt_label(struct streaminfo *a_stream, const char* label_name, char
*label_buflen = 0;
return -1;
}
- snprintf(label_buf, *label_buflen, "SEV_ID=%u;PROTO_ID=%u;APP_ID=%u;OS_ID=%u;BS_ID=%u;WEB_ID=%u;BEHAV_ID=%u;",
- dpkt_info->dpkt_service_type,
+ snprintf(label_buf, *label_buflen, "PROTO_ID=%u;APP_ID=%u;OS_ID=%u;BS_ID=%u;WEB_ID=%u;BEHAV_ID=%u;",
dpkt_info->dpkt_proto_type,
dpkt_info->dpkt_app_type,
dpkt_info->dpkt_op_type,
diff --git a/src/ntc_ssl_collect.h b/src/ntc_ssl_collect.h
index d39fc8c..8b02d28 100644
--- a/src/ntc_ssl_collect.h
+++ b/src/ntc_ssl_collect.h
@@ -8,6 +8,7 @@ extern "C"
#endif
#include "stream.h"
+#include "soq/identify_v2.h"
typedef struct ntc_ssl_collect_global_item
{
@@ -34,6 +35,7 @@ extern "C"
int service;
}ntc_ssl_collect_global_item;
+/*
typedef struct _dpkt_lable_t
{
unsigned char trans_proto;
@@ -47,6 +49,10 @@ typedef struct _dpkt_lable_t
unsigned int dpkt_web_type;
unsigned int dpkt_behavior_type;
}dpkt_lable_t;
+*/
+
+typedef stDntyProInfoV2 dpkt_lable_t;
+
typedef struct _comm_context_t
{