de rien

[parefeu.git] / policy_test.y

diff --git a/policy_test.y b/policy_test.y
index c9aac02ead00a49e76e8c8729810a9b3efc08fdf..e2105d4cbb467ebe0f4c9b7eef1d26cf35786689 100644 (file)
--- a/policy_test.y
+++ b/policy_test.y
@@ -9,10 +9,15 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <string.h>
 #include <netdb.h>
 
 extern FILE *yyin;
+extern FILE *yyout;
+extern int yylineno;
+extern int yy_flex_debug;
 
 static size_t errors;
 enum filter_dir {
@@ -37,6 +42,8 @@ struct mqtt_rule {
 };
 
 static size_t parsed_lines;
+static size_t errors;
+static size_t nrule;
 %}
 
 %union {
@@ -45,43 +52,62 @@ static size_t parsed_lines;
 };
 
 %token ACTION IN OUT FROM QUICK LOG SOCKET
-%token TOPIC WORD
+%token TOPIC WORD WORD2
 %token ANY FROM
 %token SLASH HYPHEN
-%token <string> WORD SOCKET
-%token <number> NUMBER
-%type <number> ACTION DIR QUICK LOG
-%type <string> from topic
+%type <number> ACTION QUICK LOG get_dir get_log get_quick
+%type <string> get_from get_topic WORD SOCKET
 
 
 %%
 
 ruleset: /* empty */
-          | 
-          ruleset mqttrule
+          | ruleset mqttrule
+          | ruleset comment
+          | ruleset error { errors++; }
           ;
 
-mqttrule       : ACTION DIR topic from
+comment:       COMMENT '\n'
+          {
+          };
+mqttrule       : get_log ACTION get_quick get_dir get_topic get_from
           {
           parsed_lines++;
           struct mqtt_rule r;
           memset(&r, 0, sizeof(r));
-          r.action = $1;
-          r.dir = $2;
-          if ($3)
-                  strlcpy(r.topic, $3, sizeof r.topic);
-          if ($4)
-                  strlcpy(r.from, $4, sizeof r.from);
-
-               printf("%s %s <from> %s.\n", r.action == GTW_DROP ? "Drop" : "pass", r.topic[0]!=0 ? r.topic :"*", r.from[0]!=0 ? r.from : "<all>");
+          r.action = $2;
+          r.dir = $4;
+          if ($5)
+                  strlcpy(r.topic, $5, sizeof r.topic);
+          if ($6)
+                  strlcpy(r.from, $6, sizeof r.from);
+
+               ++nrule;
+               if ($1==1) {
+               printf("\t#%zu: %c %s %c %s <from> %s;\n", nrule, $3?'!':' ', r.action == GTW_DROP ? "Drop" : "pass", 
+               r.dir==GTW_INOUT ? '=' : r.dir==GTW_IN ? '<' :'>',
+               r.topic[0]!=0 ? r.topic :"*", r.from[0]!=0 ? r.from : "<all>");
+               }
           };
 
-topic  :       ANY {$$=NULL;}
-               |       WORD {$$=$1;}
-               ;
+get_quick      : /*empty*/ {$$=0;}
+                       | QUICK {$$=1;}
+                       ;
+get_log                : /*empty*/ {$$=0;}
+                       | LOG {$$ = 1;}
+                       ;
 
-from   : /* empty */ {$$=NULL;}
-               | FROM SOCKET {$$ = $2;}
+get_topic      :       ANY {$$=NULL;}
+                       |       WORD {$$=$1;}
+                       ;
+
+get_from       : /*empty*/ {$$=NULL;}
+                       | SOCKET {$$ = $1;}
+                       ;
+
+get_dir        :       /*empty*/ {$$=GTW_INOUT;}
+               |       IN      {$$=GTW_IN;}
+               |       OUT     {$$=GTW_OUT;}
                ;
 %%
 
@@ -89,7 +115,8 @@ void
 yyerror(msg)
        char *msg;
 {
-       fprintf(stderr, "while parsing \"%s\"\n",
+       fprintf(stderr, "while parsing line %d: error occured \"%s\"\n",
+       yylineno,
                msg);
 
        return;
@@ -103,7 +130,9 @@ int main( int argc, char **argv )
        else
                yyin = stdin;
 
-       yyparse();
-       printf("\n#%zu.\n", parsed_lines);
+       int devNull = open("/dev/null", O_WRONLY);
+       int dup2Result = dup2(devNull, STDERR_FILENO);
 
+       yyparse();
+       printf("#%zu. R: %zu\tE: %zu\n", parsed_lines, nrule, errors);
 }