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

增加测试用例： 使用同一个mid扫描时， 更新boolmatcher。

Browse Source
This commit is contained in:
zhengchao
2021-05-24 23:11:54 +08:00
parent a58baa274f
commit df4fad9e8b
3 changed files with 242 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/entry/Maat_command.cpp
View File

@@ -291,7 +291,7 @@ void serialize_region(const struct Maat_cmd_region* p, int group_id, char* buff,
switch(p->region_type)
{
case REGION_IP:
ret=snprintf(buff,sz,"%d\t%d\t%d\t%s\t%s\t%hu\t%hu\t%s\t%s\t%hu\t%hu\t%d\t%d\t1",
ret=snprintf(buff, sz, "%d\t%d\t%d\t%s\t%s\t%hu\t%hu\t%s\t%s\t%hu\t%hu\t%d\t%d\t1",
p->region_id,
group_id,
p->ip_rule.addr_type,
@@ -306,6 +306,26 @@ void serialize_region(const struct Maat_cmd_region* p, int group_id, char* buff,
p->ip_rule.protocol,
p->ip_rule.direction);
break;
case REGION_IP_PLUS:
ret=snprintf(buff, sz, "%d\t%d\t%d\t%s\t%s\t%s\t%s\t%hu\t%hu\t%s\t%s\t%s\t%s\t%hu\t%hu\t%d\t%d\t1",
p->region_id,
group_id,
p->ip_plus_rule.addr_type,
p->ip_plus_rule.saddr_format,
p->ip_plus_rule.src_ip1,
p->ip_plus_rule.src_ip2,
p->ip_plus_rule.sport_format,
p->ip_plus_rule.src_port1,
p->ip_plus_rule.src_port2,
p->ip_plus_rule.daddr_format,
p->ip_plus_rule.dst_ip1,
p->ip_plus_rule.dst_ip2,
p->ip_plus_rule.dport_format,
p->ip_plus_rule.dst_port1,
p->ip_plus_rule.dst_port2,
p->ip_plus_rule.protocol,
p->ip_plus_rule.direction);
break;
case REGION_EXPR:
if(p->expr_rule.district==NULL)
{