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

同步修改maat_redis_tool支持64位的Maat redis key。

Browse Source
This commit is contained in:
zhengchao
2018-10-26 10:26:48 +08:00
parent 0b237a07a8
commit cbd3cf4ab2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/maat_redis_tool.cpp
View File

@@ -34,8 +34,8 @@ static int compare_serial_rule(const void *a, const void *b)
struct serial_rule_t *rb=(struct serial_rule_t *)b; struct serial_rule_t *rb=(struct serial_rule_t *)b;
char p_str[256],q_str[256]; char p_str[256],q_str[256];
snprintf(p_str,sizeof(p_str),"%s.%d",ra->table_name,ra->rule_id); snprintf(p_str,sizeof(p_str),"%s.%ld",ra->table_name,ra->rule_id);
snprintf(q_str,sizeof(q_str),"%s.%d",rb->table_name,rb->rule_id); snprintf(q_str,sizeof(q_str),"%s.%ld",rb->table_name,rb->rule_id);
return strcmp(p_str,q_str); return strcmp(p_str,q_str);
} }
static redisContext * connect_redis(const char*redis_ip, int redis_port, int redis_db) static redisContext * connect_redis(const char*redis_ip, int redis_port, int redis_db)
@@ -160,7 +160,7 @@ void read_rule_from_redis(redisContext * ctx, long long desire_version, const ch
cur_table=rule_list[i].table_name; cur_table=rule_list[i].table_name;
} }
fprintf(table_fp,"%s\tkey=%d\n",rule_list[i].table_line,rule_list[i].rule_id); fprintf(table_fp,"%s\tkey=%ld\n",rule_list[i].table_line,rule_list[i].rule_id);
line_count++; line_count++;
} }
fclose(table_fp); fclose(table_fp);

4
vendor/CMakeLists.txt vendored
View File

@@ -24,8 +24,8 @@ ExternalProject_Add(hiredis-vip PREFIX hiredis-vip
BUILD_IN_SOURCE 1) BUILD_IN_SOURCE 1)
ExternalProject_Get_Property(hiredis-vip SOURCE_DIR) ExternalProject_Get_Property(hiredis-vip SOURCE_DIR)
set(HTTP_PARSER_INCLUDE_DIRECTORIES ${SOURCE_DIR}) set(HIREDIS_INCLUDE_DIRECTORIES ${SOURCE_DIR})
file(MAKE_DIRECTORY ${HTTP_PARSER_INCLUDE_DIRECTORIES}) file(MAKE_DIRECTORY ${HIREDIS_INCLUDE_DIRECTORIES})
add_library(hiredis-vip-static STATIC IMPORTED GLOBAL) add_library(hiredis-vip-static STATIC IMPORTED GLOBAL)
set_property(TARGET hiredis-vip-static PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/libhiredis_vip.a) set_property(TARGET hiredis-vip-static PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/libhiredis_vip.a)