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

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	src/entry/Maat_rule.cpp
#	src/entry/Makefile
This commit is contained in:
zhengchao
2015-12-24 18:11:59 +08:00
parent 848a70cb43 81d9a389cc
commit f4ad9d1765
4 changed files with 1895 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
readme.txt
View File

@@ -33,4 +33,12 @@ gb2312;
2) use readdir_r in my_scandir; 2) use readdir_r in my_scandir;
3) fix segmentfault when have no config,again; 3) fix segmentfault when have no config,again;
4) maat_json support plugin table; 4) maat_json support plugin table;
2015-10-19 check table_type in callback register; 2015-07-03 1)print error when Maat_summon_feather with a dir has no valid
indexfile;
2)check AND_EXPR's match method;
3)remove restriction of IP table's protocol;
4)fix invalid write in insert_set_id function;
2015-07-06 1)handle wrong expr format like "aa&&bb" and "aa&bb&";
2)iconv_convert performance optimized;
2015-10-19 check table_type in callback register;
2015-12-24 change plugin table update mechanism to save memory;

1890
src/entry/Maat_rule.cpp
View File

File diff suppressed because it is too large Load Diff

1
src/entry/Maat_rule_internal.h
View File

@@ -208,6 +208,7 @@ struct _plugin_table_info
dynamic_array_t *cache_lines; dynamic_array_t *cache_lines;
int line_num; int line_num;
long cache_size; long cache_size;
pthread_mutex_t plugin_mutex;
}; };
struct _Maat_table_info_t struct _Maat_table_info_t
{ {

4
src/entry/Makefile
View File

@@ -5,7 +5,9 @@ CC = gcc
CCC = g++ CCC = g++
CFLAGS = -Wall -g -fPIC CFLAGS = -Wall -g -fPIC
CFLAGS += $(OPTFLAGS) CFLAGS += $(OPTFLAGS)
LDFLAGS = -lMESA_handle_logger -lMESA_htable -lpthread -lm -lrulescan -lpcre LDDICTATOR = -Wl,-wrap,malloc -Wl,-wrap,calloc -Wl,-wrap,free -Wl,-wrap,realloc
LDFLAGS = -lMESA_handle_logger -lMESA_htable -lpthread
#LDFLAGS += $(LDDICTATOR)
MAILLIB = ../lib MAILLIB = ../lib
G_H_DIR =../inc_internal G_H_DIR =../inc_internal