diff options
| author | liuxueli <[email protected]> | 2020-11-04 17:06:50 +0600 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2020-11-04 17:06:50 +0600 |
| commit | 39335c954362d21ba32efcfa6181ff0c89970760 (patch) | |
| tree | 46c19430cb2aad979a946d4dc90a9eee784363bd | |
| parent | cb544e9c4f84deaafac57ea5ffb2781399fb4001 (diff) | |
| parent | 24b9ce5ad5bbee18d5ed803126ece0b9d3520be7 (diff) | |
Merge branch 'master' into add-entrance-idv3.3.6
# Conflicts:
# src/tsg_send_log.cpp
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | bin/tsg_log_field.conf | 4 | ||||
| -rw-r--r-- | cmake/Version.cmake | 2 | ||||
| -rw-r--r-- | src/tsg_send_log.cpp | 6 |
5 files changed, 9 insertions, 6 deletions
@@ -1 +1,3 @@ .vscode/* +build/ +cmake-build-* diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88a39ad..ed470f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,7 +67,6 @@ develop_build_release: BUILD_TYPE: RelWithDebInfo PACKAGE: 1 UPLOAD_RPM: 1 - ASAN_OPTION: ADDRESS TESTING_VERSION_BUILD: 1 PULP3_REPO_NAME: tsg-testing-x86_64.el7 PULP3_DIST_NAME: tsg-testing-x86_64.el7 diff --git a/bin/tsg_log_field.conf b/bin/tsg_log_field.conf index b47e4ee..017fa16 100644 --- a/bin/tsg_log_field.conf +++ b/bin/tsg_log_field.conf @@ -43,9 +43,9 @@ STRING http_host 35 STRING ssl_sni 36 LONG common_establish_latency_ms 37 STRING common_sub_action 38 -STRING common_clinet_asn 39 +STRING common_client_asn 39 STRING common_server_asn 40 -STRING common_clinet_location 41 +STRING common_client_location 41 STRING common_server_location 42 STRING quic_sni 43 STRING ssl_ja3_fingerprint 44 diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 9b05d0b..a47944c 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -3,7 +3,7 @@ set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh) set(__AUTORESIVISION ${CMAKE_BINARY_DIR}/autorevision.sh) -set(__VERSION_CACHE ${CMAKE_SOURCE_DIR}/version.txt) +set(__VERSION_CACHE ${CMAKE_BINARY_DIR}/version.txt) set(__VERSION_CONFIG ${CMAKE_BINARY_DIR}/version.cmake) file(COPY ${__SOURCE_AUTORESIVISION} DESTINATION ${CMAKE_BINARY_DIR} diff --git a/src/tsg_send_log.cpp b/src/tsg_send_log.cpp index 1d03a44..e371969 100644 --- a/src/tsg_send_log.cpp +++ b/src/tsg_send_log.cpp @@ -187,7 +187,7 @@ static int set_common_sub_action(struct TLD_handle_t *handle, char *field_name, int set_common_field_from_label(struct tsg_log_instance_t *_instance, struct TLD_handle_t *_handle, struct streaminfo *a_stream) { - char buff[512]={0}; + char buff[1024]={0}; char *l7_protocol=NULL; struct _location_info_t *location=NULL; struct _session_attribute_label_t *internal_label=NULL; @@ -348,7 +348,9 @@ int TLD_append_streaminfo(struct tsg_log_instance_t *instance, struct TLD_handle } stream_id=tsg_get_stream_id(a_stream); - TLD_append(_handle, _instance->id2field[LOG_COMMON_STREAM_TRACE_ID].name, (void *)(long)stream_id, TLD_TYPE_LONG); + char stream_id_buff[128]=""; + snprintf(stream_id_buff, sizeof(stream_id_buff), "%llu", stream_id); + TLD_append(_handle, _instance->id2field[LOG_COMMON_STREAM_TRACE_ID].name, (void *)stream_id_buff, TLD_TYPE_STRING); addr_proto=(char *)layer_addr_prefix_ntop(a_stream); TLD_append(_handle, _instance->id2field[LOG_COMMON_L4_PROTOCOL].name, (void *)addr_proto, TLD_TYPE_STRING); |