Use ? in path matching to avoid /* trap.

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index bdf9261d234360cbac0244a253cc1cd59a5d3bcd..188d53629850f173599e574469038f7b5f45781e 100644 (file)
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -139,7 +139,7 @@ WHITE [ \t]
   return CLI_MARKER;
 }
 
-[={}:;,()+*/%-<>~\[\]] {
+[={}:;,()+*/%-<>~\[\]?] {
   return yytext[0];
 }
 

diff --git a/filter/config.Y b/filter/config.Y
index 0bbc3252d4e9c2bdbdbbe5c23689df20cee8fce8..b81bd6c74d88eeb28bb823088c8ef33a456c3bd1 100644 (file)
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -277,7 +277,7 @@ switch_body: /* EMPTY */ { $$ = NULL; }
 
 bgp_one:
    NUM { $$ = $1; }
- | '*' { $$ = PM_ANY; }
+ | '?' { $$ = PM_ANY; }
  ;
 
 bgp_path: 

diff --git a/filter/test.conf b/filter/test.conf
index c7fe415ffa826aaecaa3d51843b7fcf87bc38404..7e674647563458193b32b86da70ee6373d97c19e 100644 (file)
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -45,8 +45,8 @@ clist l;
        print "4 = ", p2.len;
        p2 = prepend( p2, 5 );
        print "Should be false: ", p2 ~ p;
-       print "Should be true: ", p2 ~ / * 4 3 2 1 /, p2, / * 4 3 2 1 /;
-       print "Should be true: ", p2 ~ / * 4 3 * 1 /, p2, / * 4 3 * 1 /;
+       print "Should be true: ", p2 ~ / ? 4 3 2 1 /, p2, / ? 4 3 2 1 /;
+       print "Should be true: ", p2 ~ / ? 4 3 ? 1 /, p2, / ? 4 3 ? 1 /;
        print "5 = ", p2.len;
 
        l = - empty -;