修正direction为I2E时MAC填写异常v6.0.29

2 files changed, 8 insertions, 3 deletions

diff --git a/src/tsg_send_log.cpp b/src/tsg_send_log.cpp
index 8421f0f..df458e2 100644
--- a/src/tsg_send_log.cpp
+++ b/src/tsg_send_log.cpp
@@ -813,8 +813,8 @@ int direction_I2E(struct tsg_log_instance_t *_instance, struct TLD_handle_t *_ha
 
 			if((memcmp(mac_addr->mac->dst_addr.h_source, default_mac, 6))==0)
 			{
-				TLD_append(_handle, _instance->id2field[LOG_COMMON_OUTCOMING_SRC_MAC].name, (void *)dst_mac_string, TLD_TYPE_STRING);
-				TLD_append(_handle, _instance->id2field[LOG_COMMON_OUTCOMING_DST_MAC].name, (void *)src_mac_string, TLD_TYPE_STRING);
+				TLD_append(_handle, _instance->id2field[LOG_COMMON_INCOMING_SRC_MAC].name, (void *)dst_mac_string, TLD_TYPE_STRING);
+				TLD_append(_handle, _instance->id2field[LOG_COMMON_INCOMING_DST_MAC].name, (void *)src_mac_string, TLD_TYPE_STRING);
 			}
 			else
 			{
diff --git a/test/src/gtest_common.cpp b/test/src/gtest_common.cpp
index e2ff953..71614f9 100644
--- a/test/src/gtest_common.cpp
+++ b/test/src/gtest_common.cpp
@@ -35,6 +35,11 @@ int get_thread_count(void)
 	return 8;
 }
 
+long long get_timestamp_ms()
+{
+	return 0;
+}
+
 int MESA_rst_tcp(struct streaminfo * stream, struct rst_tcp_para * paras, int para_len)
 {
 	return 0;
@@ -323,7 +328,7 @@ extern "C" bool dtls_identifyStream(struct streaminfo *a_udp)
 	return 0;
 }
 
-extern "C" struct _ssl_ja3_info_t *ssl_get_ja3_fingerprint(struct streaminfo *stream, unsigned char *payload, int payload_len, int thread_seq)
+struct ssl_ja3_info *ssl_get_ja3_fingerprint(struct streaminfo *stream, unsigned char *payload, int payload_len, int thread_seq)
 {
 	return NULL;
 }