* Rework logic of filters

* Add some documentation to rspamd (about new filters logic and about protocol)

1 files changed, 9 insertions, 8 deletions

diff --git a/cfg_file.l b/cfg_file.l
index fd5f3bc7f..3cb8441bd 100644
--- a/cfg_file.l
+++ b/cfg_file.l
@@ -37,14 +37,15 @@ memcached						return MEMCACHED;
 bind_socket						return BINDSOCK;
 servers							return SERVERS;
 require							return REQUIRE;
-module							return MODULE;
-filter							return FILTER;
+header_filters					return HEADER_FILTERS;
+mime_filters					return MIME_FILTERS;
+message_filters					return MESSAGE_FILTERS;
+url_filters						return URL_FILTERS;
+factors							return FACTORS;
 metric							return METRIC;
-script_header					return SCRIPT_HEADER;
-script_mime						return SCRIPT_MIME;
-script_message					return SCRIPT_MESSAGE;
-script_url						return SCRIPT_URL;
-script_chain					return SCRIPT_CHAIN;
+name							return NAME;
+required_score					return REQUIRED_SCORE;
+function						return FUNCTION;
 
 \{								return OBRACE;
 \}								return EBRACE;
@@ -58,12 +59,12 @@ yes|YES|no|NO|[yY]|[nN]			yylval.flag=parse_flag(yytext); return FLAG;
 \"								return QUOTE;
 \$[a-zA-Z_][a-zA-Z0-9_]+		yylval.string=strdup(yytext + 1); return VARIABLE;
 [0-9]+							yylval.number=strtol(yytext, NULL, 10); return NUMBER;
+-?[0-9]+\.?[0-9]*				yylval.fract=strtod(yytext, NULL); return FRACT;
 [0-9]+[kKmMgG]?					yylval.limit=parse_limit(yytext); return SIZELIMIT;
 [0-9]+[sS]|[0-9]+[mM][sS]		yylval.seconds=parse_seconds(yytext); return SECONDS;
 [0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}	yylval.string=strdup(yytext); return IPADDR;
 [0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\/[0-9]{1,2}	yylval.string=strdup(yytext); return IPNETWORK;
 [a-zA-Z0-9.-]+:[0-9]{1,5}		yylval.string=strdup(yytext); return HOSTPORT;
-[a-zA-Z0-9]+:[a-zA-Z0-9_:]+		yylval.string=strdup(yytext); return SCRIPT_PARAM;		
 [a-zA-Z<][a-zA-Z@+>_-]*         yylval.string=strdup(yytext); return STRING;
 \/[^/\n]+\/						yylval.string=strdup(yytext); return REGEXP;
 [a-zA-Z0-9].[a-zA-Z0-9\/.-]+	yylval.string=strdup(yytext); return DOMAIN;