gfwleak/tango-tfe
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TSG-12300 代理日志增加Traffic Vsys id字段

Browse Source
This commit is contained in:
fengweihao
2022-10-26 14:30:45 +08:00
committed by 卢文朋
parent 87adce7cbf
commit 6e4fc2a978
9 changed files with 66 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugin/business/doh/src/doh.cpp
View File

@@ -74,10 +74,15 @@ static int doh_get_answer_ttl(cJSON *object)
return (rand() % (max - min + 1) + min);
}
static cJSON *doh_get_answer_records(cJSON *object, int qtype)
static cJSON *doh_get_answer_records(struct doh_ctx *ctx, cJSON *object, int qtype)
{
int i = 0;
cJSON *vsys_id=cJSON_GetObjectItem(object, "vsys_id");
if(vsys_id && vsys_id->type==cJSON_Number)
{
ctx->vsys_id = vsys_id->valueint;
}
cJSON *resolution = cJSON_GetObjectItem(object, "resolution");
int size = cJSON_GetArraySize(resolution);
for (i = 0; i < size; i++)
@@ -114,7 +119,7 @@ static void doh_get_cheat_data(Maat_rule_t *p_result, int qtype, struct doh_ctx
goto end;
}
answer_array = doh_get_answer_records(object, qtype);
answer_array = doh_get_answer_records(ctx, object, qtype);
if (answer_array != NULL)
{
answer_size = cJSON_GetArraySize(answer_array);

3
plugin/business/doh/src/logger.cpp
View File

@@ -400,7 +400,8 @@ int doh_send_log(struct doh_conf *handle, const struct tfe_http_session *http, c
cJSON_AddNumberToObject(common_obj, "common_link_id", 0);
cJSON_AddNumberToObject(common_obj, "common_stream_dir", 3); //1:c2s, 2:s2c, 3:double
cJSON_AddStringToObject(common_obj, "common_sled_ip", handle->kafka_logger->local_ip_str);
cJSON_AddNumberToObject(common_obj, "common_vsys_id", handle->kafka_logger->vsys_id);
cJSON_AddNumberToObject(common_obj, "common_t_vsys_id", handle->kafka_logger->t_vsys_id);
cJSON_AddNumberToObject(common_obj, "common_vsys_id", ctx->vsys_id);
cJSON_AddNumberToObject(common_obj, "common_entrance_id", handle->entry_id);
cJSON_AddStringToObject(common_obj, "common_device_id", handle->device_id);
cJSON_AddNumberToObject(common_obj, "common_c2s_byte_num", c2s_byte_num);

1
plugin/business/doh/src/pub.h
View File

@@ -80,6 +80,7 @@ struct doh_ctx
int magic_num;
int manipulate;
int opts_num;
int vsys_id;
size_t result_num;
Maat_rule_t *result;
cheat_pkt_opt_t *opts;