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

Merge branch 'master' into MAAT_REDIS

Browse Source 
# Conflicts:
#	src/entry/Maat_rule.cpp
This commit is contained in:
zhengchao
2017-08-07 16:30:08 +08:00
parent 84a75c4494 d9af8ba6ff
commit f3a763d9a3
3 changed files with 253 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/entry/Maat_api.cpp
View File

@@ -188,7 +188,7 @@ int exprid2region_id(struct _Maat_group_inner_t* group_rule,int expr_id,int* dis
int i=0,region_id=-1;
struct _Maat_region_inner_t* region_rule=NULL;
assert(group_rule->group_id>=0);
pthread_mutex_lock(&(group_rule->mutex));
pthread_rwlock_rdlock(&(group_rule->rwlock));
for(i=0;i<group_rule->region_boundary;i++)
{
region_rule=(struct _Maat_region_inner_t*)dynamic_array_read(group_rule->regions, i);
@@ -203,7 +203,7 @@ int exprid2region_id(struct _Maat_group_inner_t* group_rule,int expr_id,int* dis
break;
}
}
pthread_mutex_unlock(&(group_rule->mutex));
pthread_rwlock_unlock(&(group_rule->rwlock));
return region_id;
}
int match_district(struct _OUTER_scan_status_t *_mid,scan_result_t *region_hit,int region_hit_num)