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

修复多个相似串/摘要规则加载的bug。

Browse Source
This commit is contained in:
zhengchao
2017-08-16 18:23:09 +08:00
parent caf26c0112
commit 578f36d57c
3 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/entry/Maat_command.cpp
View File

@@ -16,7 +16,7 @@ const char* rm_key_prefix[2]={"OBSOLETE_RULE","EFFECTIVE_RULE"};
const char* rm_status_sset="MAAT_UPDATE_STATUS";
const char* rm_expire_sset="MAAT_EXPIRE_TIMER";
const char* rm_label_sset="MAAT_LABEL_INDEX";
const char* rm_version_sset="MAAT_VERSION_TIMER";
const char* rm_version_sset="/AAT_VERSION_TIMER";
const static int MAAT_REDIS_SYNC_TIME=30*60;
struct serial_rule_t //rm= Redis Maat
@@ -45,10 +45,22 @@ redisReply *_wrap_redisCommand(redisContext *c, const char *format, ...)
{
va_list ap;
void *reply = NULL;
va_start(ap,format);
reply = redisvCommand(c,format,ap);
va_end(ap);
int ret=0,retry=0;
while(reply==NULL&&retry<2)
{
va_start(ap,format);
reply = redisvCommand(c,format,ap);
va_end(ap);
if(reply==NULL)
{
ret=redisReconnect(c);
retry++;
if(ret==REDIS_OK)
{
break;
}
}
}
return (redisReply *)reply;
}
int connect_redis_for_write(_Maat_feather_t * feather)
@@ -161,6 +173,9 @@ void invalidate_line(char* line, enum MAAT_TABLE_TYPE type,int valid_column_seq)
case TABLE_TYPE_DIGEST:
offset=6;
break;
case TABLE_TYPE_SIMILARITY:
offset=5;
break;
case TABLE_TYPE_EXPR_PLUS:
offset=8;
break;
@@ -284,7 +299,7 @@ void serialize_region(const struct Maat_region_t* p,int group_id, char* buff,int
,p->digest_rule.digest_string
,p->digest_rule.confidence_degree);
break;
case REGION_SIMILARITY://not support yet
case REGION_SIMILARITY:
ret=snprintf(buff,size,"%d\t%d\t%s\t%hd\t1"
,p->region_id
,group_id
@@ -322,6 +337,22 @@ void set_serial_rule(struct serial_rule_t* rule,enum MAAT_OPERATION op,int rule_
}
return;
}
int _wrap_redisReconnect(redisContext* c, void*logger)
{
int ret=0;
ret=redisReconnect(c);
if(ret==REDIS_OK)
{
MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,"Reconnect success.");
return 0;
}
else
{
MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,"Reconnect failed.");
return -1;
}
}
int get_rm_key_list(unsigned int version,redisContext *c,struct serial_rule_t** list,void* logger, unsigned int* new_version,int *update_type)
{
redisReply* reply=NULL,*sub_reply=NULL,*tmp_reply=NULL;
@@ -348,15 +379,7 @@ int get_rm_key_list(unsigned int version,redisContext *c,struct serial_rule_t**
__redis_strerror_r(errno,err_buff,sizeof(err_buff));
MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,
"GET MAAT_VERSION failed %s. Reconnecting...",err_buff);
ret=redisReconnect(c);
if(ret==REDIS_OK)
{
MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,"Reconnect success.");
}
else
{
MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,"Reconnect failed.");
}
_wrap_redisReconnect(c,logger);
return 0;
}
version_in_redis=read_redis_integer(reply);
@@ -684,7 +707,7 @@ int build_serial_rule(_Maat_feather_t *feather,struct _Maat_cmd_inner_t* _cmd,st
}
serialize_region(p_region, p_group->group_id, line, sizeof(line));
set_serial_rule(list+rule_num,MAAT_OP_ADD
,p_region->region_id,0,p_region->table_name,line,0);
,p_region->region_id,0,p_region->table_name,line,timeout);
}
else
{
@@ -724,6 +747,7 @@ int exec_serial_rule(redisContext* ctx,struct serial_rule_t* s_rule,int serial_r
data_reply=_wrap_redisCommand(ctx,"MULTI");
freeReplyObject(data_reply);
append_cmd_cnt=0;
assert(server_time>0);
for(i=0;i<serial_rule_num;i++)
{
if(s_rule[i].op==MAAT_OP_ADD)
@@ -1083,7 +1107,7 @@ int Maat_cmd_set_line(Maat_feather_t feather,const struct Maat_line_t* line_rule
_Maat_feather_t* _feather=(_Maat_feather_t*)feather;
int ret=0, table_id=0,retry=0;
struct serial_rule_t s_rule;
long long absolute_expire_time=0;
long long server_time=0,absolute_expire_time=0;
ret=map_str2int(_feather->map_tablename2id, line_rule->table_name, &table_id);
if(ret<0)
{
@@ -1102,16 +1126,17 @@ int Maat_cmd_set_line(Maat_feather_t feather,const struct Maat_line_t* line_rule
, line_rule->table_name);
return -1;
}
server_time=redis_server_time(_feather->redis_write_ctx);
if( line_rule->expire_after>0)
{
absolute_expire_time=redis_server_time(_feather->redis_write_ctx);
absolute_expire_time+=line_rule->expire_after;
absolute_expire_time=server_time+line_rule->expire_after;
}
set_serial_rule(&s_rule, op,line_rule->rule_id,line_rule->label_id,line_rule->table_name,line_rule->table_line, absolute_expire_time);
ret=0;
while(!ret)
{
ret=exec_serial_rule(_feather->redis_write_ctx,&s_rule, 1,_feather->server_time);
ret=exec_serial_rule(_feather->redis_write_ctx,&s_rule, 1,server_time);
retry++;
}
if(retry>10)