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

手工修复合并中的错误。

Browse Source
This commit is contained in:
zhengchao
2017-08-07 17:08:52 +08:00
parent fc39c12d65
commit e4341ebea1
3 changed files with 442 additions and 256 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; int i=0,region_id=-1;
struct _Maat_region_inner_t* region_rule=NULL; struct _Maat_region_inner_t* region_rule=NULL;
assert(group_rule->group_id>=0); assert(group_rule->group_id>=0);
pthread_rwlock_rdlock(&(group_rule->rwlock)); pthread_mutex_lock(&(group_rule->mutex));
for(i=0;i<group_rule->region_boundary;i++) for(i=0;i<group_rule->region_boundary;i++)
{ {
region_rule=(struct _Maat_region_inner_t*)dynamic_array_read(group_rule->regions, 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; break;
} }
} }
pthread_rwlock_unlock(&(group_rule->rwlock)); pthread_mutex_unlock(&(group_rule->mutex));
return region_id; return region_id;
} }
int match_district(struct _OUTER_scan_status_t *_mid,scan_result_t *region_hit,int region_hit_num) int match_district(struct _OUTER_scan_status_t *_mid,scan_result_t *region_hit,int region_hit_num)

614
src/entry/Maat_rule.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/entry/Maat_rule_internal.h
View File

@@ -182,7 +182,7 @@ struct _Maat_group_inner_t
char* group_name; char* group_name;
dynamic_array_t *regions; dynamic_array_t *regions;
void* compile_shortcut; void* compile_shortcut;
pthread_rwlock_t rwlock; pthread_mutex_t mutex;
}; };
struct _Maat_compile_inner_t struct _Maat_compile_inner_t
{ {