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

Fix rule_uuid setting issue in policy metric and adapt TRAFFICS_MIRROR_PROFILE table name change

Browse Source
This commit is contained in:
fengweihao
2024-10-17 14:53:26 +08:00
parent 48cba684fe
commit 9a437cb057
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/tfe_fieldstat.cpp
View File

@@ -216,7 +216,7 @@ struct fieldstat_easy_intercept *tfe_fieldstat_easy_intercept_create(char *app_n
struct filedstat_easy_manipulation *tfe_fieldstat_easy_manipulation_create(char *app_name, char *outpath, int cycle, int max_thread, void *local_logger)
{
const char *counter_field[COLUMN_MAX] = {"hit_count", "in_bytes", "out_bytes", "in_pkts", "out_pkts"};
struct field metric_tags[TAG_MAX - 1] = {{"vsys_id", FIELD_VALUE_INTEGER, -1}, {"rule_id", FIELD_VALUE_INTEGER, -1}, {"action", FIELD_VALUE_INTEGER, -1}, {"sub_action", FIELD_VALUE_CSTRING, -1}};
struct field metric_tags[TAG_MAX - 1] = {{"vsys_id", FIELD_VALUE_INTEGER, -1}, {"rule_uuid", FIELD_VALUE_CSTRING, -1}, {"action", FIELD_VALUE_INTEGER, -1}, {"sub_action", FIELD_VALUE_CSTRING, -1}};
struct filedstat_easy_manipulation *fieldstat = ALLOC(struct filedstat_easy_manipulation, 1);

6
plugin/business/traffic-mirror/src/entry.cpp
View File

@@ -521,13 +521,13 @@ int traffic_mirror_init(struct tfe_proxy * proxy)
goto errout;
}
result = maat_plugin_table_ex_schema_register(instance->maat_feather, "TSG_PROFILE_TRAFFIC_MIRROR",
result = maat_plugin_table_ex_schema_register(instance->maat_feather, "TRAFFICS_MIRROR_PROFILE",
profile_table_ex_data_new_cb, profile_table_ex_data_free_cb, profile_table_ex_data_dup_cb,
0, instance);
if (unlikely(result < 0))
{
TFE_LOG_ERROR(instance->logger, "failed at Maat_plugin_EX_register(TSG_PROFILE_TRAFFIC_MIRROR)");
TFE_LOG_ERROR(instance->logger, "failed at Maat_plugin_EX_register(TRAFFICS_MIRROR_PROFILE)");
goto errout;
}
@@ -610,7 +610,7 @@ int traffic_mirror_on_open_cb(const struct tfe_stream * stream, unsigned int thr
if (policy_ex_data->is_profile_set)
{
uuid_unparse(policy_ex_data->profile_uuid, profile_uuid_str);
profile_ex_data = (struct profile_table_ex_data *)maat_plugin_table_get_ex_data(instance->maat_feather, "TSG_PROFILE_TRAFFIC_MIRROR", (const char *)profile_uuid_str, strlen(profile_uuid_str));
profile_ex_data = (struct profile_table_ex_data *)maat_plugin_table_get_ex_data(instance->maat_feather, "TRAFFICS_MIRROR_PROFILE", (const char *)profile_uuid_str, strlen(profile_uuid_str));
if (!profile_ex_data)
{
TFE_LOG_ERROR(instance->logger, "failed at getting policy %s's profile, profile id = %s, "

2
resource/pangu/doh.json
View File

@@ -61,7 +61,7 @@
],
"plugin_table": [
{
"table_name": "TSG_PROFILE_TRAFFIC_MIRROR",
"table_name": "TRAFFICS_MIRROR_PROFILE",
"table_content": [
{"uuid":"TRAFFIC0-MIRR-0000-0000-000000000001","vlan_ids":[1,2,3,4,5,6,7,8,9],"is_valid":1}
]

2
resource/pangu/pangu_http.json
View File

@@ -141,7 +141,7 @@
],
"plugin_table": [
{
"table_name": "TSG_PROFILE_TRAFFIC_MIRROR",
"table_name": "TRAFFICS_MIRROR_PROFILE",
"table_content": [
{"uuid":"TRAFFIC0-MIRR-0000-0000-000000000001","vlan_ids":[1,2,3,4,5,6,7,8,9],"is_valid":1}
]

2
resource/pangu/table_info.conf
View File

@@ -144,7 +144,7 @@
},
{
"table_id":20,
"table_name":"TSG_PROFILE_TRAFFIC_MIRROR",
"table_name":"TRAFFICS_MIRROR_PROFILE",
"table_type":"plugin",
"custom": {
"key_type":"pointer",

2
resource/pangu/table_info_traffic_mirror.conf
View File

@@ -10,7 +10,7 @@
},
{
"table_id":1,
"table_name":"TSG_PROFILE_TRAFFIC_MIRROR",
"table_name":"TRAFFICS_MIRROR_PROFILE",
"table_type":"plugin",
"custom": {
"key_type":"pointer",