diff options
| author | liuxueli <[email protected]> | 2020-12-26 16:44:08 +0600 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2020-12-26 16:44:08 +0600 |
| commit | 95dec18f80aff0481bc2ffe5f47f83ccbdec3fe5 (patch) | |
| tree | ba87d2005e8eef66376e964a49fdf8237b9d5edc | |
| parent | a43af8adb7e44c6745e1728415828282cfab425b (diff) | |
修正日志字段，common_ja3_fingerprint改为common_ja3_hashv3.3.14
修正发送user_region字段的配置文件命名方式
| -rw-r--r-- | bin/tsg_log_field.conf | 2 | ||||
| -rw-r--r-- | src/tsg_send_log.cpp | 4 | ||||
| -rw-r--r-- | src/tsg_send_log_internal.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bin/tsg_log_field.conf b/bin/tsg_log_field.conf index 017fa16..57f46ea 100644 --- a/bin/tsg_log_field.conf +++ b/bin/tsg_log_field.conf @@ -48,6 +48,6 @@ STRING common_server_asn 40 STRING common_client_location 41 STRING common_server_location 42 STRING quic_sni 43 -STRING ssl_ja3_fingerprint 44 +STRING ssl_ja3_hash 44 STRING common_data_center 45 STRING common_l7_protocol 46
\ No newline at end of file diff --git a/src/tsg_send_log.cpp b/src/tsg_send_log.cpp index 7bba222..91c5167 100644 --- a/src/tsg_send_log.cpp +++ b/src/tsg_send_log.cpp @@ -605,7 +605,7 @@ struct tsg_log_instance_t *tsg_sendlog_init(const char *conffile) MESA_load_profile_int_def(conffile, "TSG_LOG", "LOG_LEVEL",&(_instance->level), 30); MESA_load_profile_string_def(conffile, "TSG_LOG", "LOG_PATH", _instance->log_path, sizeof(_instance->log_path), "./tsglog/tsglog"); MESA_load_profile_int_def(conffile, "TSG_LOG", "MAIL_PROTOCOL_ID",&(_instance->mail_proto_id), 110); - MESA_load_profile_int_def(conffile, "TSG_LOG", "SEND_USER_AGENT",&(_instance->send_user_agent), 0); + MESA_load_profile_int_def(conffile, "TSG_LOG", "SEND_USER_REGION",&(_instance->send_user_region), 0); _instance->logger=MESA_create_runtime_log_handle(_instance->log_path, _instance->level); if(_instance->logger==NULL) @@ -821,7 +821,7 @@ int tsg_send_log(struct tsg_log_instance_t *instance, struct TLD_handle_t *handl TLD_append(_handle, _instance->id2field[LOG_COMMON_SERVICE].name, (void *)(long)(log_msg->result[i].service_id), TLD_TYPE_LONG); TLD_append(_handle, _instance->id2field[LOG_COMMON_ACTION].name, (void *)(long)((unsigned char)log_msg->result[i].action), TLD_TYPE_LONG); - if(_instance->send_user_agent==1 && log_msg->result[i].action!=TSG_ACTION_NONE && log_msg->result[i].serv_def_len>0) + if(_instance->send_user_region==1 && log_msg->result[i].action!=TSG_ACTION_NONE && log_msg->result[i].serv_def_len>0) { user_agent=(char *)dictator_malloc(thread_id, log_msg->result[i].serv_def_len+1); ret=Maat_read_rule(g_tsg_maat_feather, &(log_msg->result[i]), MAAT_RULE_SERV_DEFINE, user_agent, log_msg->result[i].serv_def_len+1); diff --git a/src/tsg_send_log_internal.h b/src/tsg_send_log_internal.h index a4132f2..8504203 100644 --- a/src/tsg_send_log_internal.h +++ b/src/tsg_send_log_internal.h @@ -94,7 +94,7 @@ struct tsg_log_instance_t int level; int mail_proto_id; int max_service; - int send_user_agent; + int send_user_region; int recovery_interval; int l7_proto_project_id; int internal_project_id; |