feature:修改ip location的cmesgv5.1.8feature-modify-sendlog-interface

2 files changed, 20 insertions, 16 deletions

diff --git a/common/include/kni_cmsg.h b/common/include/kni_cmsg.h
index 7958f49..2a23563 100644
--- a/common/include/kni_cmsg.h
+++ b/common/include/kni_cmsg.h
@@ -82,14 +82,16 @@ enum tfe_cmsg_tlv_type
     TFE_CMSG_DST_ASN,                 // string max size 64
     TFE_CMSG_SRC_ORGANIZATION,        // string max size 256
     TFE_CMSG_DST_ORGANIZATION,        // string max size 256
-    TFE_CMSG_SRC_IP_LOCATION_COUNTRY, // string max size 256
-    TFE_CMSG_DST_IP_LOCATION_COUNTRY, // string max size 256
-    TFE_CMSG_SRC_IP_LOCATION_PROVINE, // string max size 256
-    TFE_CMSG_DST_IP_LOCATION_PROVINE, // string max size 256
-    TFE_CMSG_SRC_IP_LOCATION_CITY,    // string max size 256
-    TFE_CMSG_DST_IP_LOCATION_CITY,    // string max size 256
-    TFE_CMSG_SRC_IP_LOCATION_SUBDIVISION,
-    TFE_CMSG_DST_IP_LOCATION_SUBDIVISION,
+    // TFE_CMSG_SRC_IP_LOCATION_COUNTRY, // string max size 256
+    // TFE_CMSG_DST_IP_LOCATION_COUNTRY, // string max size 256
+    // TFE_CMSG_SRC_IP_LOCATION_PROVINE, // string max size 256
+    // TFE_CMSG_DST_IP_LOCATION_PROVINE, // string max size 256
+    // TFE_CMSG_SRC_IP_LOCATION_CITY,    // string max size 256
+    // TFE_CMSG_DST_IP_LOCATION_CITY,    // string max size 256
+    // TFE_CMSG_SRC_IP_LOCATION_SUBDIVISION,
+    // TFE_CMSG_DST_IP_LOCATION_SUBDIVISION,
+    TFE_CMSG_SRC_IP_LOCATION,         //string max size 256 * 4
+    TFE_CMSG_DST_IP_LOCATION,
     //ja3 fingerprint
     TFE_CMSG_SSL_CLIENT_JA3_FINGERPRINT,
     //fqdn cat id 
diff --git a/common/src/kni_cmsg.cpp b/common/src/kni_cmsg.cpp
index 98954c0..67dc868 100644
--- a/common/src/kni_cmsg.cpp
+++ b/common/src/kni_cmsg.cpp
@@ -242,14 +242,16 @@ void tfe_cmsg_enum_to_string()
     tfe_cmsg_tlv_type_to_string[TFE_CMSG_DST_ASN] = "TFE_CMSG_DST_ASN";
     tfe_cmsg_tlv_type_to_string[TFE_CMSG_SRC_ORGANIZATION] = "TFE_CMSG_SRC_ORGANIZATION";
     tfe_cmsg_tlv_type_to_string[TFE_CMSG_DST_ORGANIZATION] = "TFE_CMSG_DST_ORGANIZATION";
-    tfe_cmsg_tlv_type_to_string[TFE_CMSG_SRC_IP_LOCATION_COUNTRY] = "TFE_CMSG_SRC_IP_LOCATION_COUNTRY";
-    tfe_cmsg_tlv_type_to_string[TFE_CMSG_DST_IP_LOCATION_COUNTRY] = "TFE_CMSG_DST_IP_LOCATION_COUNTRY";
-    tfe_cmsg_tlv_type_to_string[TFE_CMSG_SRC_IP_LOCATION_PROVINE] = "TFE_CMSG_SRC_IP_LOCATION_PROVINE";
-    tfe_cmsg_tlv_type_to_string[TFE_CMSG_DST_IP_LOCATION_PROVINE] = "TFE_CMSG_DST_IP_LOCATION_PROVINE";
-    tfe_cmsg_tlv_type_to_string[TFE_CMSG_SRC_IP_LOCATION_CITY] = "TFE_CMSG_SRC_IP_LOCATION_CITY";
-    tfe_cmsg_tlv_type_to_string[TFE_CMSG_DST_IP_LOCATION_CITY] = "TFE_CMSG_DST_IP_LOCATION_CITY";
-	tfe_cmsg_tlv_type_to_string[TFE_CMSG_SRC_IP_LOCATION_SUBDIVISION] = "TFE_CMSG_SRC_IP_LOCATION_SUBDIVISION";
-	tfe_cmsg_tlv_type_to_string[TFE_CMSG_DST_IP_LOCATION_SUBDIVISION] = "TFE_CMSG_DST_IP_LOCATION_SUBDIVISION";
+    // tfe_cmsg_tlv_type_to_string[TFE_CMSG_SRC_IP_LOCATION_COUNTRY] = "TFE_CMSG_SRC_IP_LOCATION_COUNTRY";
+    // tfe_cmsg_tlv_type_to_string[TFE_CMSG_DST_IP_LOCATION_COUNTRY] = "TFE_CMSG_DST_IP_LOCATION_COUNTRY";
+    // tfe_cmsg_tlv_type_to_string[TFE_CMSG_SRC_IP_LOCATION_PROVINE] = "TFE_CMSG_SRC_IP_LOCATION_PROVINE";
+    // tfe_cmsg_tlv_type_to_string[TFE_CMSG_DST_IP_LOCATION_PROVINE] = "TFE_CMSG_DST_IP_LOCATION_PROVINE";
+    // tfe_cmsg_tlv_type_to_string[TFE_CMSG_SRC_IP_LOCATION_CITY] = "TFE_CMSG_SRC_IP_LOCATION_CITY";
+    // tfe_cmsg_tlv_type_to_string[TFE_CMSG_DST_IP_LOCATION_CITY] = "TFE_CMSG_DST_IP_LOCATION_CITY";
+	// tfe_cmsg_tlv_type_to_string[TFE_CMSG_SRC_IP_LOCATION_SUBDIVISION] = "TFE_CMSG_SRC_IP_LOCATION_SUBDIVISION";
+	// tfe_cmsg_tlv_type_to_string[TFE_CMSG_DST_IP_LOCATION_SUBDIVISION] = "TFE_CMSG_DST_IP_LOCATION_SUBDIVISION";
+	tfe_cmsg_tlv_type_to_string[TFE_CMSG_SRC_IP_LOCATION] = "TFE_CMSG_SRC_IP_LOCATION";
+	tfe_cmsg_tlv_type_to_string[TFE_CMSG_DST_IP_LOCATION] = "TFE_CMSG_DST_IP_LOCATION";
 
     tfe_cmsg_tlv_type_to_string[TFE_CMSG_SSL_CLIENT_JA3_FINGERPRINT] = "TFE_CMSG_SSL_CLIENT_JA3_FINGERPRINT";
 	tfe_cmsg_tlv_type_to_string[TFE_CMSG_FQDN_CAT_ID_NUM] = "TFE_CMSG_FQDN_CAT_ID_NUM";