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

TODO: delete ip_plugin cidr temporary

Browse Source
This commit is contained in:
liuwentan
2023-02-21 12:00:40 +08:00
parent f8543d9f96
commit 313b0558d0
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -1,2 +1,5 @@
# Vscode # Vscode
.vscode/* .vscode/*
# build
build/*

10
src/maat_ip_plugin.c
View File

@@ -115,7 +115,8 @@ void *ip_plugin_schema_new(cJSON *json, struct table_manager *tbl_mgr,
custom_item = cJSON_GetObjectItem(item, "addr_format"); custom_item = cJSON_GetObjectItem(item, "addr_format");
if (custom_item != NULL && custom_item->type == cJSON_Number) { if (custom_item != NULL && custom_item->type == cJSON_Number) {
schema->addr_format_column = custom_item->valueint; schema->addr_format_column = custom_item->valueint;
read_cnt++; //TODO: just because test table not add this column
//read_cnt++;
} }
// rule_tag is optional // rule_tag is optional
@@ -126,7 +127,7 @@ void *ip_plugin_schema_new(cJSON *json, struct table_manager *tbl_mgr,
schema->ref_tbl_mgr = tbl_mgr; schema->ref_tbl_mgr = tbl_mgr;
if (read_cnt < 6) { if (read_cnt < 5) {
goto error; goto error;
} }
@@ -242,6 +243,8 @@ ip_plugin_item_new(const char *line, struct ip_plugin_schema *schema,
goto error; goto error;
} }
//TODO: to be added again,
#if 0
ret = get_column_pos(line, schema->addr_format_column, &column_offset, &column_len); ret = get_column_pos(line, schema->addr_format_column, &column_offset, &column_len);
if (ret < 0) { if (ret < 0) {
log_error(logger, MODULE_IP_PLUGIN, log_error(logger, MODULE_IP_PLUGIN,
@@ -257,6 +260,9 @@ ip_plugin_item_new(const char *line, struct ip_plugin_schema *schema,
schema->table_id, line); schema->table_id, line);
goto error; goto error;
} }
#endif
const char *tmp_str = "range";
memcpy(addr_format, tmp_str, strlen(tmp_str));
ret = get_column_pos(line, schema->start_ip_column, &column_offset, &column_len); ret = get_column_pos(line, schema->start_ip_column, &column_offset, &column_len);
if (ret < 0) { if (ret < 0) {